From fa3d22de76e3a09ab01a41b0dbba1c1fdb53846e Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Tue, 8 Nov 2016 11:59:24 +0000 Subject: [PATCH 1/2] Problem: 4.0.0 is out, time to bump version for development Solution: update NEWS and project.xml --- NEWS | 4 ++++ project.xml | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index 1d5085f70..2144cd040 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,7 @@ +CZMQ version 4.0.1 stable, released on 201x/xx/xx +================================================= + + CZMQ version 4.0.0 stable, released on 2016/11/04 ================================================= diff --git a/project.xml b/project.xml index d4b142e85..14abac354 100644 --- a/project.xml +++ b/project.xml @@ -8,7 +8,7 @@ repository = "https://github.com/zeromq/czmq" > - + From ab9939346c3fd36b3b82a4361500241731ab56ef Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Tue, 8 Nov 2016 12:00:39 +0000 Subject: [PATCH 2/2] Problem: out of date with zproject and project.xml Solution: regenerate --- CMakeLists.txt | 2 +- bindings/jni/README.md | 2 +- bindings/jni/android/build.sh | 2 +- bindings/jni/build.gradle | 8 ++--- bindings/jni/msvc/resource.rc | 8 ++--- bindings/qt/buildlib/buildlib.pro | 2 +- bindings/ruby/lib/czmq/ffi/version.rb | 2 +- builds/msvc/nuget/package.nuspec | 50 +++++++++++++-------------- builds/msvc/nuget/package.targets | 40 ++++++++++----------- builds/msvc/resource.rc | 8 ++--- ci_deploy.sh | 4 +-- configure.ac | 2 +- include/czmq_library.h | 2 +- packaging/debian/changelog | 2 +- packaging/debian/czmq.dsc.obs | 2 +- packaging/redhat/czmq.spec | 2 +- 16 files changed, 69 insertions(+), 69 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ca1f90770..ba477ded8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -257,7 +257,7 @@ include(${CMAKE_CURRENT_SOURCE_DIR}/src/CMakeLists-local.txt) # Optional project ######################################################################## # pkgconfig ######################################################################## -set (VERSION "4.0.0") +set (VERSION "4.0.1") set (prefix "${CMAKE_INSTALL_PREFIX}") set (exec_prefix "\${prefix}") set (libdir "\${prefix}/lib${LIB_SUFFIX}") diff --git a/bindings/jni/README.md b/bindings/jni/README.md index cfb8c8fe8..d41969436 100644 --- a/bindings/jni/README.md +++ b/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-4.0.0.jar in bindings/jni/build/libs +* It compiles the JNI Java classes into a jar file czmq-jni-4.0.1.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. diff --git a/bindings/jni/android/build.sh b/bindings/jni/android/build.sh index 837e47c95..8177a021f 100755 --- a/bindings/jni/android/build.sh +++ b/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-4.0.0.jar +unzip -q ../../build/libs/czmq-jni-4.0.1.jar # Copy native libraries into lib/armeabi mkdir -p lib/armeabi diff --git a/bindings/jni/build.gradle b/bindings/jni/build.gradle index 8315d165e..3f0aed878 100644 --- a/bindings/jni/build.gradle +++ b/bindings/jni/build.gradle @@ -8,11 +8,11 @@ plugins { id 'java' id 'maven-publish' - id "com.jfrog.bintray" version "1.6" + id "com.jfrog.bintray" version "1.7.2" } group = "org.zeromq" -version = "4.0.0" +version = "4.0.1" repositories { mavenLocal() @@ -135,8 +135,8 @@ bintray { vcsUrl = 'https://github.com/zeromq/czmq.git' githubRepo = System.getenv('BINTRAY_USER_ORG') + '/czmq' version { - name = '4.0.0' - vcsTag= '4.0.0' + name = '4.0.1' + vcsTag= '4.0.1' } } } diff --git a/bindings/jni/msvc/resource.rc b/bindings/jni/msvc/resource.rc index 29dbfa0ef..59e2972cc 100644 --- a/bindings/jni/msvc/resource.rc +++ b/bindings/jni/msvc/resource.rc @@ -49,8 +49,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 4,0,0,0 - PRODUCTVERSION 4,0,0,0 + FILEVERSION 4,0,1,0 + PRODUCTVERSION 4,0,1,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", "4.0.0.0" + VALUE "FileVersion", "4.0.1.0" VALUE "InternalName", "CZMQ" VALUE "LegalCopyright", "Copyright (c) the Authors" VALUE "OriginalFilename", "libczmq.dll" VALUE "ProductName", "CZMQ" - VALUE "ProductVersion", "4.0.0.0" + VALUE "ProductVersion", "4.0.1.0" END END BLOCK "VarFileInfo" diff --git a/bindings/qt/buildlib/buildlib.pro b/bindings/qt/buildlib/buildlib.pro index 23e765fc8..932717d8d 100644 --- a/bindings/qt/buildlib/buildlib.pro +++ b/bindings/qt/buildlib/buildlib.pro @@ -3,7 +3,7 @@ # Read the zproject/README.md for information about making permanent changes. # ################################################################################ TEMPLATE = lib -VERSION = 4.0.0 +VERSION = 4.0.1 CONFIG += qt dll qczmq-buildlib mac:CONFIG += absolute_library_soname win32|mac:!wince*:!win32-msvc:!macx-xcode:CONFIG += debug_and_release build_all diff --git a/bindings/ruby/lib/czmq/ffi/version.rb b/bindings/ruby/lib/czmq/ffi/version.rb index fe6ae8953..76477e607 100644 --- a/bindings/ruby/lib/czmq/ffi/version.rb +++ b/bindings/ruby/lib/czmq/ffi/version.rb @@ -5,7 +5,7 @@ module CZMQ module FFI - VERSION = '4.0.0' + VERSION = '4.0.1' end end diff --git a/builds/msvc/nuget/package.nuspec b/builds/msvc/nuget/package.nuspec index 48b63de45..0e9c441a9 100644 --- a/builds/msvc/nuget/package.nuspec +++ b/builds/msvc/nuget/package.nuspec @@ -8,7 +8,7 @@ czmq_vc120 - 4.0.0.0 + 4.0.1.0 czmq_vc120 See AUTHORS Eric Voskuil @@ -36,52 +36,52 @@ - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - czmq-x86-v120-mt-s-4_0_0_0.lib;%(AdditionalDependencies) + czmq-x86-v120-mt-s-4_0_1_0.lib;%(AdditionalDependencies) - czmq-x86-v120-mt-sgd-4_0_0_0.lib;%(AdditionalDependencies) + czmq-x86-v120-mt-sgd-4_0_1_0.lib;%(AdditionalDependencies) - czmq-x64-v120-mt-s-4_0_0_0.lib;%(AdditionalDependencies) + czmq-x64-v120-mt-s-4_0_1_0.lib;%(AdditionalDependencies) - czmq-x64-v120-mt-sgd-4_0_0_0.lib;%(AdditionalDependencies) + czmq-x64-v120-mt-sgd-4_0_1_0.lib;%(AdditionalDependencies) - czmq-x86-v120-mt-s-4_0_0_0.ltcg.lib;%(AdditionalDependencies) + czmq-x86-v120-mt-s-4_0_1_0.ltcg.lib;%(AdditionalDependencies) - czmq-x86-v120-mt-sgd-4_0_0_0.ltcg.lib;%(AdditionalDependencies) + czmq-x86-v120-mt-sgd-4_0_1_0.ltcg.lib;%(AdditionalDependencies) - czmq-x64-v120-mt-s-4_0_0_0.ltcg.lib;%(AdditionalDependencies) + czmq-x64-v120-mt-s-4_0_1_0.ltcg.lib;%(AdditionalDependencies) - czmq-x64-v120-mt-sgd-4_0_0_0.ltcg.lib;%(AdditionalDependencies) + czmq-x64-v120-mt-sgd-4_0_1_0.ltcg.lib;%(AdditionalDependencies) - czmq-x86-v120-mt-4_0_0_0.imp.lib;%(AdditionalDependencies) + czmq-x86-v120-mt-4_0_1_0.imp.lib;%(AdditionalDependencies) - czmq-x86-v120-mt-gd-4_0_0_0.imp.lib;%(AdditionalDependencies) + czmq-x86-v120-mt-gd-4_0_1_0.imp.lib;%(AdditionalDependencies) - czmq-x64-v120-mt-4_0_0_0.imp.lib;%(AdditionalDependencies) + czmq-x64-v120-mt-4_0_1_0.imp.lib;%(AdditionalDependencies) - czmq-x64-v120-mt-gd-4_0_0_0.imp.lib;%(AdditionalDependencies) + czmq-x64-v120-mt-gd-4_0_1_0.imp.lib;%(AdditionalDependencies) @@ -98,26 +98,26 @@ - - + + - - + + - - + + - - + +