Merge pull request #1533 from bluca/rc

Problem: many API/ABI breakages for a patch version bump

Author: sappo

CMakeLists.txt

@@ -257,7 +257,7 @@ include(${CMAKE_CURRENT_SOURCE_DIR}/src/CMakeLists-local.txt) # Optional project
 ########################################################################
 # pkgconfig
 ########################################################################
-set (VERSION "3.0.3")
+set (VERSION "4.0.0")
 set (prefix "${CMAKE_INSTALL_PREFIX}")
 set (exec_prefix "\${prefix}")
 set (libdir "\${prefix}/lib${LIB_SUFFIX}")

NEWS

@@ -1,3 +1,9 @@
+CZMQ version 4.0.0 (rc1), released on 2016/11/01
+=================================================
+
+Release candidate 1 for 4.0.0. Changelog TBD.
+
+
 CZMQ version 3.0.2 stable, released on 2015/06/08
 =================================================
 

bindings/jni/README.md

@@ -49,7 +49,7 @@ Then in the android directory, run:
 This does the following:
 
 * It compiles the CZMQ C sources for Android, into a native library libczmq.so in builds/android/
-* It compiles the JNI Java classes into a jar file czmq-jni-3.0.3.jar in bindings/jni/build/libs
+* It compiles the JNI Java classes into a jar file czmq-jni-4.0.0.jar in bindings/jni/build/libs
 * It compiles the JNI C sources for Android, into a native library libczmqjni.so.
 * It combines all these into czmq-android.jar, which you can use in your Android projects.
 

bindings/jni/android/build.sh

@@ -52,7 +52,7 @@ make $MAKE_OPTIONS
 
 echo "********  Building czmq.jar for Android"
 #   Copy class files into org/zeromq/etc.
-unzip -q ../../build/libs/czmq-jni-3.0.3.jar
+unzip -q ../../build/libs/czmq-jni-4.0.0.jar
 
 #   Copy native libraries into lib/armeabi
 mkdir -p lib/armeabi

bindings/jni/build.gradle

@@ -12,7 +12,7 @@ plugins {
 }
 
 group = "org.zeromq"
-version = "3.0.3"
+version = "4.0.0"
 
 repositories {
     mavenLocal()
@@ -134,8 +134,8 @@ bintray {
         vcsUrl = 'https://github.com/zeromq/czmq.git'
         githubRepo = System.getenv('BINTRAY_USER_ORG') + '/czmq'
         version {
-            name = '3.0.3'
-            vcsTag= '3.0.3'
+            name = '4.0.0'
+            vcsTag= '4.0.0'
         }
     }
 }

bindings/jni/msvc/resource.rc

@@ -49,8 +49,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,0,3,0
- PRODUCTVERSION 3,0,3,0
+ FILEVERSION 4,0,0,0
+ PRODUCTVERSION 4,0,0,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -67,12 +67,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "The AUTHORS"
             VALUE "FileDescription", "The high-level C binding for 0MQ"
-            VALUE "FileVersion", "3.0.3.0"
+            VALUE "FileVersion", "4.0.0.0"
             VALUE "InternalName", "CZMQ"
             VALUE "LegalCopyright", "Copyright (c) the Authors"
             VALUE "OriginalFilename", "libczmq.dll"
             VALUE "ProductName", "CZMQ"
-            VALUE "ProductVersion", "3.0.3.0"
+            VALUE "ProductVersion", "4.0.0.0"
         END
     END
     BLOCK "VarFileInfo"

bindings/python/czmq/_czmq_ctypes.py

@@ -43,9 +43,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('libczmq.3.dylib')
+                lib = cdll.LoadLibrary('libczmq.4.dylib')
             else:
-                lib = cdll.LoadLibrary("libczmq.so.3")
+                lib = cdll.LoadLibrary("libczmq.so.4")
         elif os.name == 'nt':
             lib = cdll.LoadLibrary('libczmq.dll')
     except OSError:

bindings/python_cffi/czmq_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 = 'libczmq.3.dylib'
+            libpath = 'libczmq.4.dylib'
         else:
-            libpath = 'libczmq.so.3'
+            libpath = 'libczmq.so.4'
     elif os.name == 'nt':
         libpath = 'libczmq.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 = 3.0.3
+VERSION = 4.0.0
 CONFIG += qt dll qczmq-buildlib
 mac:CONFIG += absolute_library_soname
 win32|mac:!wince*:!win32-msvc:!macx-xcode:CONFIG += debug_and_release build_all

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

@@ -5,7 +5,7 @@
 
 module CZMQ
   module FFI
-    VERSION = '3.0.3'
+    VERSION = '4.0.0'
   end
 end