Merge pull request #508 from bluca/regen

Problem: we want a new release but API is not compatible

CMakeLists.txt

@@ -26,7 +26,21 @@ if (NOT CMAKE_BUILD_TYPE)
     if (EXISTS "${SOURCE_DIR}/.git")
         set (CMAKE_BUILD_TYPE Debug)
     else ()
-        set (CMAKE_BUILD_TYPE Release)
+# http://xit0.org/2013/04/cmake-use-git-branch-and-commit-details-in-project/
+# http://stackoverflow.com/questions/6797395/cmake-execute-process-always-fails-with-no-such-file-or-directory-when-i-cal
+        execute_process(
+            COMMAND git rev-parse --show-toplevel
+            WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
+            RESULT_VARIABLE git_result
+            OUTPUT_VARIABLE git_root
+            OUTPUT_STRIP_TRAILING_WHITESPACE
+        )
+        message(STATUS "git workspace root [${git_result}]: ${git_root}")
+        if ( "${git_result}" == "0" )
+            set (CMAKE_BUILD_TYPE Debug)
+        else ()
+            set (CMAKE_BUILD_TYPE Release)
+        endif ()
     endif ()
 endif ()
 if (${CMAKE_BUILD_TYPE} STREQUAL "Debug")
@@ -142,6 +156,12 @@ set (zyre_sources
     src/zyre_group.c
     src/zyre_node.c
 )
+IF (ENABLE_DRAFTS)
+    list (APPEND zyre_sources
+        src/zyre_private_selftest.c
+    )
+ENDIF (ENABLE_DRAFTS)
+
 source_group("Source Files" FILES ${zyre_sources})
 if (NOT DEFINED BUILD_SHARED_LIBS)
     SET(BUILD_SHARED_LIBS ON)
@@ -150,11 +170,8 @@ add_library(zyre ${zyre_sources})
 set_target_properties(zyre
     PROPERTIES DEFINE_SYMBOL "ZYRE_EXPORTS"
 )
-set_target_properties(zyre
-    PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${SOURCE_DIR}/src"
-)
 set_target_properties (zyre
-    PROPERTIES SOVERSION "1.0.3"
+    PROPERTIES SOVERSION "2.0.0"
 )
 target_link_libraries(zyre
     ${ZEROMQ_LIBRARIES} ${MORE_LIBRARIES}
@@ -171,7 +188,7 @@ include(${CMAKE_CURRENT_SOURCE_DIR}/src/CMakeLists-local.txt) # Optional project
 ########################################################################
 # pkgconfig
 ########################################################################
-set (VERSION "1.3.0")
+set (VERSION "2.0.0")
 set (prefix "${CMAKE_INSTALL_PREFIX}")
 set (exec_prefix "\${prefix}")
 set (libdir "\${prefix}/lib${LIB_SUFFIX}")
@@ -306,6 +323,12 @@ set(TEST_CLASSES
     zyre_event
 )
 
+IF (ENABLE_DRAFTS)
+    list (APPEND TEST_CLASSES
+    private_classes
+    )
+ENDIF (ENABLE_DRAFTS)
+
 foreach(TEST_CLASS ${TEST_CLASSES})
     add_test(
         NAME ${TEST_CLASS}

Makefile.am

@@ -24,7 +24,11 @@ noinst_PROGRAMS =
 check_PROGRAMS =
 noinst_LTLIBRARIES =
 TESTS =
+# Prepare variables that can be populated (appended) in generated Makefiles or
+# manually maintained src/Makemodules-local.am
 EXTRA_DIST =
+CLEANFILES =
+DISTCLEANFILES =
 
 if ENABLE_DIST_CMAKEFILES
 EXTRA_DIST += \

bindings/jni/README.md

@@ -49,7 +49,7 @@ Then in the android directory, run:
 This does the following:
 
 * It compiles the zyre C sources for Android, into a native library libzyre.so in builds/android/
-* It compiles the JNI Java classes into a jar file zyre-jni-1.3.0.jar in bindings/jni/build/libs
+* It compiles the JNI Java classes into a jar file zyre-jni-2.0.0.jar in bindings/jni/build/libs
 * It compiles the JNI C sources for Android, into a native library libzyrejni.so.
 * It takes czmq-jni-*.jar, which must already be built in ../czmq/bindings/jni/build/libs/
 * It combines all these into zyre-android.jar, which you can use in your Android projects.

bindings/jni/android/build.sh

@@ -53,7 +53,7 @@ make $MAKE_OPTIONS
 
 echo "********  Building zyre.jar for Android"
 #   Copy class files into org/zeromq/etc.
-unzip -q ../../build/libs/zyre-jni-1.3.0.jar
+unzip -q ../../build/libs/zyre-jni-2.0.0.jar
 unzip -q -o ../../../../../czmq/bindings/jni/android/czmq-android.jar
 
 #   Copy native libraries into lib/armeabi

bindings/jni/build.gradle

@@ -12,7 +12,7 @@ plugins {
 }
 
 group = "org.zeromq"
-version = "1.3.0"
+version = "2.0.0"
 
 repositories {
     mavenLocal()
@@ -113,8 +113,8 @@ bintray {
         vcsUrl = 'http://github.com/zeromq/zyre.git'
         githubRepo = System.getenv('BINTRAY_USER_ORG') + '/zyre'
         version {
-            name = '1.3.0'
-            vcsTag= '1.3.0'
+            name = '2.0.0'
+            vcsTag= '2.0.0'
         }
     }
 }

bindings/jni/ci_build.sh

@@ -34,7 +34,9 @@ CONFIG_OPTS+=("LDFLAGS=-L${BUILD_PREFIX}/lib")
 CONFIG_OPTS+=("PKG_CONFIG_PATH=${BUILD_PREFIX}/lib/pkgconfig")
 CONFIG_OPTS+=("--prefix=${BUILD_PREFIX}")
 CONFIG_OPTS+=("--with-docs=no")
-CONFIG_OPTS+=("--quiet")
+if [ -z "${CI_CONFIG_QUIET-}" ] || [ "${CI_CONFIG_QUIET-}" = yes ] || [ "${CI_CONFIG_QUIET-}" = true ]; then
+    CONFIG_OPTS+=("--quiet")
+fi
 
 pushd ../../..
 

bindings/jni/msvc/resource.rc

@@ -49,8 +49,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,3,0,0
- PRODUCTVERSION 1,3,0,0
+ FILEVERSION 2,0,0,0
+ PRODUCTVERSION 2,0,0,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -67,12 +67,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "The AUTHORS"
             VALUE "FileDescription", "an open-source framework for proximity-based P2P apps"
-            VALUE "FileVersion", "1.3.0.0"
+            VALUE "FileVersion", "2.0.0.0"
             VALUE "InternalName", "zyre"
             VALUE "LegalCopyright", "Copyright (c) the Authors"
             VALUE "OriginalFilename", "libzyre.dll"
             VALUE "ProductName", "zyre"
-            VALUE "ProductVersion", "1.3.0.0"
+            VALUE "ProductVersion", "2.0.0.0"
         END
     END
     BLOCK "VarFileInfo"

bindings/python/zyre/_zyre_ctypes.py

@@ -44,9 +44,9 @@ def return_fresh_string(char_p):
         # load the library.  If we use find_library below, we get the wrong result.
         if os.name == 'posix':
             if sys.platform == 'darwin':
-                lib = cdll.LoadLibrary('libzyre.1.dylib')
+                lib = cdll.LoadLibrary('libzyre.2.dylib')
             else:
-                lib = cdll.LoadLibrary("libzyre.so.1")
+                lib = cdll.LoadLibrary("libzyre.so.2")
         elif os.name == 'nt':
             lib = cdll.LoadLibrary('libzyre.dll')
     except OSError:

bindings/python_cffi/zyre_cffi.py

@@ -15,9 +15,9 @@
     # load the library.  If we use find_library below, we get the wrong result.
     if os.name == 'posix':
         if sys.platform == 'darwin':
-            libpath = 'libzyre.1.dylib'
+            libpath = 'libzyre.2.dylib'
         else:
-            libpath = 'libzyre.so.1'
+            libpath = 'libzyre.so.2'
     elif os.name == 'nt':
         libpath = 'libzyre.dll'
     lib = ffi.dlopen(libpath)

bindings/qt/buildlib/buildlib.pro

@@ -3,7 +3,7 @@
 #  Read the zproject/README.md for information about making permanent changes. #
 ################################################################################
 TEMPLATE = lib
-VERSION = 1.3.0
+VERSION = 2.0.0
 CONFIG += qt dll qzyre-buildlib
 mac:CONFIG += absolute_library_soname
 win32|mac:!wince*:!win32-msvc:!macx-xcode:CONFIG += debug_and_release build_all

bindings/ruby/lib/zyre/ffi/version.rb

@@ -5,7 +5,7 @@
 
 module Zyre
   module FFI
-    VERSION = '1.3.0'
+    VERSION = '2.0.0'
   end
 end
 

builds/check_zproject/ci_build.sh

@@ -1,33 +1,40 @@
 #!/usr/bin/env bash
 set -ex
 
-cd $REPO_DIR/..
+# NOTE: This script is not standalone, it is included from project root
+# ci_build.sh script, which sets some envvars (like REPO_DIR below).
+[ -n "${REPO_DIR-}" ] || exit 1
+
+# Verify all required dependencies with repos can be checked out
+cd "$REPO_DIR/.."
 git clone --quiet --depth 1 https://github.com/zeromq/libzmq.git libzmq
 git clone --quiet --depth 1 https://github.com/zeromq/czmq.git czmq
 cd -
 
 if ! ((command -v dpkg-query >/dev/null 2>&1 && dpkg-query --list zproject >/dev/null 2>&1) || \
        (command -v brew >/dev/null 2>&1 && brew ls --versions zproject >/dev/null 2>&1)); then
-    cd $REPO_DIR/..
+    cd "$REPO_DIR/.."
     git clone --quiet --depth 1 https://github.com/zeromq/zproject zproject
     cd zproject
-    export PATH=$PATH:`pwd`
+    PATH="`pwd`:$PATH"
 fi
 
 if ! ((command -v dpkg-query >/dev/null 2>&1 && dpkg-query --list generator-scripting-language >/dev/null 2>&1) || \
        (command -v brew >/dev/null 2>&1 && brew ls --versions gsl >/dev/null 2>&1)); then
-    cd $REPO_DIR/..
+    cd "$REPO_DIR/.."
     git clone https://github.com/imatix/gsl.git gsl
     cd gsl/src
     make
-    export PATH=$PATH:`pwd`
+    PATH="`pwd`:$PATH"
 fi
+export PATH
 
+# Verify that zproject template is up-to-date with files it can overwrite
 # As we will overwrite this script file make sure bash loads the
 # next lines into memory before executing
 # http://stackoverflow.com/questions/21096478/overwrite-executing-bash-script-files
 {
-    cd $REPO_DIR
+    cd "$REPO_DIR"
     gsl project.xml
 
     # keep an eye on git version used by CI

builds/check_zproto/ci_build.sh

@@ -1,6 +1,10 @@
 #!/usr/bin/env bash
 set -ex
 
+# NOTE: This script is not standalone, it is included from project root
+# ci_build.sh script, which sets some envvars (like REPO_DIR below).
+[ -n "${REPO_DIR-}" ] || exit 1
+
 docker run -e GSL_BUILD_DIR=/code/src -v "$REPO_DIR":/code zeromqorg/zproto -zproject:1 -q zre_msg.xml
 
 # keep an eye on git version used by CI

builds/cmake/ci_build.sh

@@ -37,7 +37,9 @@ CONFIG_OPTS+=("LDFLAGS=-L${BUILD_PREFIX}/lib")
 CONFIG_OPTS+=("PKG_CONFIG_PATH=${BUILD_PREFIX}/lib/pkgconfig")
 CONFIG_OPTS+=("--prefix=${BUILD_PREFIX}")
 CONFIG_OPTS+=("--with-docs=no")
-CONFIG_OPTS+=("--quiet")
+if [ -z "${CI_CONFIG_QUIET-}" ] || [ "${CI_CONFIG_QUIET-}" = yes ] || [ "${CI_CONFIG_QUIET-}" = true ]; then
+    CONFIG_OPTS+=("--quiet")
+fi
 
 CMAKE_OPTS=()
 CMAKE_OPTS+=("-DCMAKE_INSTALL_PREFIX:PATH=${BUILD_PREFIX}")

builds/cygwin/Makefile.cygwin

@@ -10,7 +10,8 @@ INCDIR=-I$(PREFIX)/include -I.
 LIBDIR=-L$(PREFIX)/lib
 CFLAGS=-Wall -Os -g -DZYRE_EXPORTS $(INCDIR)
 
-OBJS = zyre.o zyre_event.o zre_msg.o zyre_peer.o zyre_group.o zyre_node.o
+OBJS = zyre.o zyre_event.o zre_msg.o zyre_peer.o zyre_group.o zyre_node.o zyre_private_selftest.o
+
 %.o: ../../src/%.c
 	$(CC) -c -o $@ $< $(CFLAGS)
 

builds/gyp/project.gyp

@@ -71,6 +71,7 @@
         '../../src/zyre_peer.h',
         '../../include/zyre_library.h',
         '../../src/zyre_selftest.c',
+        '../../src/zyre_private_selftest.c',
         '../../src/zyre_classes.h'
       ],
       'dependencies': [

builds/mingw32/Makefile.mingw32

@@ -10,7 +10,8 @@ INCDIR=-I$(PREFIX)/include -I.
 LIBDIR=-L$(PREFIX)/lib
 CFLAGS=-Wall -Os -g -DZYRE_EXPORTS $(INCDIR)
 
-OBJS = zyre.o zyre_event.o zre_msg.o zyre_peer.o zyre_group.o zyre_node.o
+OBJS = zyre.o zyre_event.o zre_msg.o zyre_peer.o zyre_group.o zyre_node.o zyre_private_selftest.o
+
 %.o: ../../src/%.c
 	$(CC) -c -o $@ $< $(CFLAGS)
 

builds/msvc/nuget/package.nuspec

@@ -8,7 +8,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2013/01/nuspec.xsd">
     <metadata minClientVersion="2.5">
         <id>zyrevc120</id>
-        <version>1.3.0.0</version>
+        <version>2.0.0.0</version>
         <title>zyrevc120</title>
         <authors>See AUTHORS</authors>
         <owners>Eric Voskuil</owners>
@@ -35,52 +35,52 @@
 
         <!-- libraries -->
         <!-- x86 Dynamic libraries (.dll) -->
-        <file src="..\..\..\bin\Win32\Release\v120\dynamic\zyre.dll" target="build\native\bin\zyre-x86-v120-mt-1_3_0_0.dll" />
-        <file src="..\..\..\bin\Win32\Debug\v120\dynamic\zyre.dll" target="build\native\bin\zyre-x86-v120-mt-gd-1_3_0_0.dll" />
+        <file src="..\..\..\bin\Win32\Release\v120\dynamic\zyre.dll" target="build\native\bin\zyre-x86-v120-mt-2_0_0_0.dll" />
+        <file src="..\..\..\bin\Win32\Debug\v120\dynamic\zyre.dll" target="build\native\bin\zyre-x86-v120-mt-gd-2_0_0_0.dll" />
 
         <!-- x86 Debugging symbols (.pdb) -->
-        <!--<file src="..\..\..\bin\Win32\Release\v120\dynamic\zyre.pdb" target="build\native\bin\zyre-x86-v120-mt-1_3_0_0.pdb" />-->
-        <file src="..\..\..\bin\Win32\Debug\v120\dynamic\zyre.pdb" target="build\native\bin\zyre-x86-v120-mt-gd-1_3_0_0.pdb" />
+        <!--<file src="..\..\..\bin\Win32\Release\v120\dynamic\zyre.pdb" target="build\native\bin\zyre-x86-v120-mt-2_0_0_0.pdb" />-->
+        <file src="..\..\..\bin\Win32\Debug\v120\dynamic\zyre.pdb" target="build\native\bin\zyre-x86-v120-mt-gd-2_0_0_0.pdb" />
 
         <!-- x86 Import libraries (.imp.lib) -->
-        <file src="..\..\..\bin\Win32\Release\v120\dynamic\zyre.lib" target="build\native\bin\zyre-x86-v120-mt-1_3_0_0.imp.lib" />
-        <file src="..\..\..\bin\Win32\Debug\v120\dynamic\zyre.lib" target="build\native\bin\zyre-x86-v120-mt-gd-1_3_0_0.imp.lib" />
+        <file src="..\..\..\bin\Win32\Release\v120\dynamic\zyre.lib" target="build\native\bin\zyre-x86-v120-mt-2_0_0_0.imp.lib" />
+        <file src="..\..\..\bin\Win32\Debug\v120\dynamic\zyre.lib" target="build\native\bin\zyre-x86-v120-mt-gd-2_0_0_0.imp.lib" />
 
         <!-- x86 Export libraries (.exp) -->
-        <file src="..\..\..\bin\Win32\Release\v120\dynamic\zyre.exp" target="build\native\bin\zyre-x86-v120-mt-1_3_0_0.exp" />
-        <file src="..\..\..\bin\Win32\Debug\v120\dynamic\zyre.exp" target="build\native\bin\zyre-x86-v120-mt-gd-1_3_0_0.exp" />
+        <file src="..\..\..\bin\Win32\Release\v120\dynamic\zyre.exp" target="build\native\bin\zyre-x86-v120-mt-2_0_0_0.exp" />
+        <file src="..\..\..\bin\Win32\Debug\v120\dynamic\zyre.exp" target="build\native\bin\zyre-x86-v120-mt-gd-2_0_0_0.exp" />
 
         <!-- x86 Static libraries (.lib) -->
-        <file src="..\..\..\bin\Win32\Release\v120\static\zyre.lib" target="build\native\bin\zyre-x86-v120-mt-s-1_3_0_0.lib" />
-        <file src="..\..\..\bin\Win32\Debug\v120\static\zyre.lib" target="build\native\bin\zyre-x86-v120-mt-sgd-1_3_0_0.lib" />
+        <file src="..\..\..\bin\Win32\Release\v120\static\zyre.lib" target="build\native\bin\zyre-x86-v120-mt-s-2_0_0_0.lib" />
+        <file src="..\..\..\bin\Win32\Debug\v120\static\zyre.lib" target="build\native\bin\zyre-x86-v120-mt-sgd-2_0_0_0.lib" />
 
         <!-- x86 Static link time code generation libraries (.ltcg.lib) -->
-        <file src="..\..\..\bin\Win32\Release\v120\ltcg\zyre.lib" target="build\native\bin\zyre-x86-v120-mt-s-1_3_0_0.ltcg.lib" />
-        <file src="..\..\..\bin\Win32\Debug\v120\ltcg\zyre.lib" target="build\native\bin\zyre-x86-v120-mt-sgd-1_3_0_0.ltcg.lib" />
+        <file src="..\..\..\bin\Win32\Release\v120\ltcg\zyre.lib" target="build\native\bin\zyre-x86-v120-mt-s-2_0_0_0.ltcg.lib" />
+        <file src="..\..\..\bin\Win32\Debug\v120\ltcg\zyre.lib" target="build\native\bin\zyre-x86-v120-mt-sgd-2_0_0_0.ltcg.lib" />
 
         <!-- x64 Dynamic libraries (.dll) -->
-        <file src="..\..\..\bin\x64\Release\v120\dynamic\zyre.dll" target="build\native\bin\zyre-x64-v120-mt-1_3_0_0.dll" />
-        <file src="..\..\..\bin\x64\Debug\v120\dynamic\zyre.dll" target="build\native\bin\zyre-x64-v120-mt-gd-1_3_0_0.dll" />
+        <file src="..\..\..\bin\x64\Release\v120\dynamic\zyre.dll" target="build\native\bin\zyre-x64-v120-mt-2_0_0_0.dll" />
+        <file src="..\..\..\bin\x64\Debug\v120\dynamic\zyre.dll" target="build\native\bin\zyre-x64-v120-mt-gd-2_0_0_0.dll" />
 
         <!-- x64 Debugging symbols (.pdb) -->
-        <!--<file src="..\..\..\bin\x64\Release\v120\dynamic\zyre.pdb" target="build\native\bin\zyre-x64-v120-mt-1_3_0_0.pdb" />-->
-        <file src="..\..\..\bin\x64\Debug\v120\dynamic\zyre.pdb" target="build\native\bin\zyre-x64-v120-mt-gd-1_3_0_0.pdb" />
+        <!--<file src="..\..\..\bin\x64\Release\v120\dynamic\zyre.pdb" target="build\native\bin\zyre-x64-v120-mt-2_0_0_0.pdb" />-->
+        <file src="..\..\..\bin\x64\Debug\v120\dynamic\zyre.pdb" target="build\native\bin\zyre-x64-v120-mt-gd-2_0_0_0.pdb" />
 
         <!-- x64 Import libraries (.imp.lib) -->
-        <file src="..\..\..\bin\x64\Release\v120\dynamic\zyre.lib" target="build\native\bin\zyre-x64-v120-mt-1_3_0_0.imp.lib" />
-        <file src="..\..\..\bin\x64\Debug\v120\dynamic\zyre.lib" target="build\native\bin\zyre-x64-v120-mt-gd-1_3_0_0.imp.lib" />
+        <file src="..\..\..\bin\x64\Release\v120\dynamic\zyre.lib" target="build\native\bin\zyre-x64-v120-mt-2_0_0_0.imp.lib" />
+        <file src="..\..\..\bin\x64\Debug\v120\dynamic\zyre.lib" target="build\native\bin\zyre-x64-v120-mt-gd-2_0_0_0.imp.lib" />
 
         <!-- x64 Export libraries (.exp) -->
-        <file src="..\..\..\bin\x64\Release\v120\dynamic\zyre.exp" target="build\native\bin\zyre-x64-v120-mt-1_3_0_0.exp" />
-        <file src="..\..\..\bin\x64\Debug\v120\dynamic\zyre.exp" target="build\native\bin\zyre-x64-v120-mt-gd-1_3_0_0.exp" />
+        <file src="..\..\..\bin\x64\Release\v120\dynamic\zyre.exp" target="build\native\bin\zyre-x64-v120-mt-2_0_0_0.exp" />
+        <file src="..\..\..\bin\x64\Debug\v120\dynamic\zyre.exp" target="build\native\bin\zyre-x64-v120-mt-gd-2_0_0_0.exp" />
 
         <!-- x64 Static libraries (.lib) -->
-        <file src="..\..\..\bin\x64\Release\v120\static\zyre.lib" target="build\native\bin\zyre-x64-v120-mt-s-1_3_0_0.lib" />
-        <file src="..\..\..\bin\x64\Debug\v120\static\zyre.lib" target="build\native\bin\zyre-x64-v120-mt-sgd-1_3_0_0.lib" />
+        <file src="..\..\..\bin\x64\Release\v120\static\zyre.lib" target="build\native\bin\zyre-x64-v120-mt-s-2_0_0_0.lib" />
+        <file src="..\..\..\bin\x64\Debug\v120\static\zyre.lib" target="build\native\bin\zyre-x64-v120-mt-sgd-2_0_0_0.lib" />
 
         <!-- x64 Static link time code generation libraries (.ltcg.lib) -->
-        <file src="..\..\..\bin\Win32\Release\v120\ltcg\zyre.lib" target="build\native\bin\zyre-x64-v120-mt-s-1_3_0_0.ltcg.lib" />
-        <file src="..\..\..\bin\Win32\Debug\v120\ltcg\zyre.lib" target="build\native\bin\zyre-x64-v120-mt-sgd-1_3_0_0.ltcg.lib" />
+        <file src="..\..\..\bin\Win32\Release\v120\ltcg\zyre.lib" target="build\native\bin\zyre-x64-v120-mt-s-2_0_0_0.ltcg.lib" />
+        <file src="..\..\..\bin\Win32\Debug\v120\ltcg\zyre.lib" target="build\native\bin\zyre-x64-v120-mt-sgd-2_0_0_0.ltcg.lib" />
     </files>
 <!--
 ################################################################################