Skip to content

Commit f2ed458

Browse files
sapposappo
authored
Merge pull request #1552 from bluca/bump_version
Problem: 4.0.0 is out, time to bump version for development
2 parents d9750c0 + ab99393 commit f2ed458

File tree

18 files changed

+74
-70
lines changed

18 files changed

+74
-70
lines changed

‎CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@ include(${CMAKE_CURRENT_SOURCE_DIR}/src/CMakeLists-local.txt) # Optional project
257257
########################################################################
258258
# pkgconfig
259259
########################################################################
260-
set (VERSION "4.0.0")
260+
set (VERSION "4.0.1")
261261
set (prefix "${CMAKE_INSTALL_PREFIX}")
262262
set (exec_prefix "\${prefix}")
263263
set (libdir "\${prefix}/lib${LIB_SUFFIX}")

‎NEWS

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
CZMQ version 4.0.1 stable, released on 201x/xx/xx
2+
=================================================
3+
4+
15
CZMQ version 4.0.0 stable, released on 2016/11/04
26
=================================================
37

‎bindings/jni/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ Then in the android directory, run:
4949
This does the following:
5050

5151
* It compiles the CZMQ C sources for Android, into a native library libczmq.so in builds/android/
52-
* It compiles the JNI Java classes into a jar file czmq-jni-4.0.0.jar in bindings/jni/build/libs
52+
* It compiles the JNI Java classes into a jar file czmq-jni-4.0.1.jar in bindings/jni/build/libs
5353
* It compiles the JNI C sources for Android, into a native library libczmqjni.so.
5454
* It combines all these into czmq-android.jar, which you can use in your Android projects.
5555

‎bindings/jni/android/build.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ make $MAKE_OPTIONS
5252

5353
echo "******** Building czmq.jar for Android"
5454
# Copy class files into org/zeromq/etc.
55-
unzip -q ../../build/libs/czmq-jni-4.0.0.jar
55+
unzip -q ../../build/libs/czmq-jni-4.0.1.jar
5656

5757
# Copy native libraries into lib/armeabi
5858
mkdir -p lib/armeabi

‎bindings/jni/build.gradle

+4-4
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@
88
plugins {
99
id 'java'
1010
id 'maven-publish'
11-
id "com.jfrog.bintray" version "1.6"
11+
id "com.jfrog.bintray" version "1.7.2"
1212
}
1313

1414
group = "org.zeromq"
15-
version = "4.0.0"
15+
version = "4.0.1"
1616

1717
repositories {
1818
mavenLocal()
@@ -135,8 +135,8 @@ bintray {
135135
vcsUrl = 'https://github.com/zeromq/czmq.git'
136136
githubRepo = System.getenv('BINTRAY_USER_ORG') + '/czmq'
137137
version {
138-
name = '4.0.0'
139-
vcsTag= '4.0.0'
138+
name = '4.0.1'
139+
vcsTag= '4.0.1'
140140
}
141141
}
142142
}

‎bindings/jni/msvc/resource.rc

+4-4
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ END
4949
//
5050

5151
VS_VERSION_INFO VERSIONINFO
52-
FILEVERSION 4,0,0,0
53-
PRODUCTVERSION 4,0,0,0
52+
FILEVERSION 4,0,1,0
53+
PRODUCTVERSION 4,0,1,0
5454
FILEFLAGSMASK 0x3fL
5555
#ifdef _DEBUG
5656
FILEFLAGS 0x1L
@@ -67,12 +67,12 @@ BEGIN
6767
BEGIN
6868
VALUE "CompanyName", "The AUTHORS"
6969
VALUE "FileDescription", "The high-level C binding for 0MQ"
70-
VALUE "FileVersion", "4.0.0.0"
70+
VALUE "FileVersion", "4.0.1.0"
7171
VALUE "InternalName", "CZMQ"
7272
VALUE "LegalCopyright", "Copyright (c) the Authors"
7373
VALUE "OriginalFilename", "libczmq.dll"
7474
VALUE "ProductName", "CZMQ"
75-
VALUE "ProductVersion", "4.0.0.0"
75+
VALUE "ProductVersion", "4.0.1.0"
7676
END
7777
END
7878
BLOCK "VarFileInfo"

‎bindings/qt/buildlib/buildlib.pro

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Read the zproject/README.md for information about making permanent changes. #
44
################################################################################
55
TEMPLATE = lib
6-
VERSION = 4.0.0
6+
VERSION = 4.0.1
77
CONFIG += qt dll qczmq-buildlib
88
mac:CONFIG += absolute_library_soname
99
win32|mac:!wince*:!win32-msvc:!macx-xcode:CONFIG += debug_and_release build_all

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
module CZMQ
77
module FFI
8-
VERSION = '4.0.0'
8+
VERSION = '4.0.1'
99
end
1010
end
1111

‎builds/msvc/nuget/package.nuspec

+25-25
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<package xmlns="http://schemas.microsoft.com/packaging/2013/01/nuspec.xsd">
99
<metadata minClientVersion="2.5">
1010
<id>czmq_vc120</id>
11-
<version>4.0.0.0</version>
11+
<version>4.0.1.0</version>
1212
<title>czmq_vc120</title>
1313
<authors>See AUTHORS</authors>
1414
<owners>Eric Voskuil</owners>
@@ -36,52 +36,52 @@
3636

3737
<!-- libraries -->
3838
<!-- x86 Dynamic libraries (.dll) -->
39-
<file src="..\..\..\bin\Win32\Release\v120\dynamic\czmq.dll" target="build\native\bin\czmq-x86-v120-mt-4_0_0_0.dll" />
40-
<file src="..\..\..\bin\Win32\Debug\v120\dynamic\czmq.dll" target="build\native\bin\czmq-x86-v120-mt-gd-4_0_0_0.dll" />
39+
<file src="..\..\..\bin\Win32\Release\v120\dynamic\czmq.dll" target="build\native\bin\czmq-x86-v120-mt-4_0_1_0.dll" />
40+
<file src="..\..\..\bin\Win32\Debug\v120\dynamic\czmq.dll" target="build\native\bin\czmq-x86-v120-mt-gd-4_0_1_0.dll" />
4141

4242
<!-- x86 Debugging symbols (.pdb) -->
43-
<!--<file src="..\..\..\bin\Win32\Release\v120\dynamic\czmq.pdb" target="build\native\bin\czmq-x86-v120-mt-4_0_0_0.pdb" />-->
44-
<file src="..\..\..\bin\Win32\Debug\v120\dynamic\czmq.pdb" target="build\native\bin\czmq-x86-v120-mt-gd-4_0_0_0.pdb" />
43+
<!--<file src="..\..\..\bin\Win32\Release\v120\dynamic\czmq.pdb" target="build\native\bin\czmq-x86-v120-mt-4_0_1_0.pdb" />-->
44+
<file src="..\..\..\bin\Win32\Debug\v120\dynamic\czmq.pdb" target="build\native\bin\czmq-x86-v120-mt-gd-4_0_1_0.pdb" />
4545

4646
<!-- x86 Import libraries (.imp.lib) -->
47-
<file src="..\..\..\bin\Win32\Release\v120\dynamic\czmq.lib" target="build\native\bin\czmq-x86-v120-mt-4_0_0_0.imp.lib" />
48-
<file src="..\..\..\bin\Win32\Debug\v120\dynamic\czmq.lib" target="build\native\bin\czmq-x86-v120-mt-gd-4_0_0_0.imp.lib" />
47+
<file src="..\..\..\bin\Win32\Release\v120\dynamic\czmq.lib" target="build\native\bin\czmq-x86-v120-mt-4_0_1_0.imp.lib" />
48+
<file src="..\..\..\bin\Win32\Debug\v120\dynamic\czmq.lib" target="build\native\bin\czmq-x86-v120-mt-gd-4_0_1_0.imp.lib" />
4949

5050
<!-- x86 Export libraries (.exp) -->
51-
<file src="..\..\..\bin\Win32\Release\v120\dynamic\czmq.exp" target="build\native\bin\czmq-x86-v120-mt-4_0_0_0.exp" />
52-
<file src="..\..\..\bin\Win32\Debug\v120\dynamic\czmq.exp" target="build\native\bin\czmq-x86-v120-mt-gd-4_0_0_0.exp" />
51+
<file src="..\..\..\bin\Win32\Release\v120\dynamic\czmq.exp" target="build\native\bin\czmq-x86-v120-mt-4_0_1_0.exp" />
52+
<file src="..\..\..\bin\Win32\Debug\v120\dynamic\czmq.exp" target="build\native\bin\czmq-x86-v120-mt-gd-4_0_1_0.exp" />
5353

5454
<!-- x86 Static libraries (.lib) -->
55-
<file src="..\..\..\bin\Win32\Release\v120\static\czmq.lib" target="build\native\bin\czmq-x86-v120-mt-s-4_0_0_0.lib" />
56-
<file src="..\..\..\bin\Win32\Debug\v120\static\czmq.lib" target="build\native\bin\czmq-x86-v120-mt-sgd-4_0_0_0.lib" />
55+
<file src="..\..\..\bin\Win32\Release\v120\static\czmq.lib" target="build\native\bin\czmq-x86-v120-mt-s-4_0_1_0.lib" />
56+
<file src="..\..\..\bin\Win32\Debug\v120\static\czmq.lib" target="build\native\bin\czmq-x86-v120-mt-sgd-4_0_1_0.lib" />
5757

5858
<!-- x86 Static link time code generation libraries (.ltcg.lib) -->
59-
<file src="..\..\..\bin\Win32\Release\v120\ltcg\czmq.lib" target="build\native\bin\czmq-x86-v120-mt-s-4_0_0_0.ltcg.lib" />
60-
<file src="..\..\..\bin\Win32\Debug\v120\ltcg\czmq.lib" target="build\native\bin\czmq-x86-v120-mt-sgd-4_0_0_0.ltcg.lib" />
59+
<file src="..\..\..\bin\Win32\Release\v120\ltcg\czmq.lib" target="build\native\bin\czmq-x86-v120-mt-s-4_0_1_0.ltcg.lib" />
60+
<file src="..\..\..\bin\Win32\Debug\v120\ltcg\czmq.lib" target="build\native\bin\czmq-x86-v120-mt-sgd-4_0_1_0.ltcg.lib" />
6161

6262
<!-- x64 Dynamic libraries (.dll) -->
63-
<file src="..\..\..\bin\x64\Release\v120\dynamic\czmq.dll" target="build\native\bin\czmq-x64-v120-mt-4_0_0_0.dll" />
64-
<file src="..\..\..\bin\x64\Debug\v120\dynamic\czmq.dll" target="build\native\bin\czmq-x64-v120-mt-gd-4_0_0_0.dll" />
63+
<file src="..\..\..\bin\x64\Release\v120\dynamic\czmq.dll" target="build\native\bin\czmq-x64-v120-mt-4_0_1_0.dll" />
64+
<file src="..\..\..\bin\x64\Debug\v120\dynamic\czmq.dll" target="build\native\bin\czmq-x64-v120-mt-gd-4_0_1_0.dll" />
6565

6666
<!-- x64 Debugging symbols (.pdb) -->
67-
<!--<file src="..\..\..\bin\x64\Release\v120\dynamic\czmq.pdb" target="build\native\bin\czmq-x64-v120-mt-4_0_0_0.pdb" />-->
68-
<file src="..\..\..\bin\x64\Debug\v120\dynamic\czmq.pdb" target="build\native\bin\czmq-x64-v120-mt-gd-4_0_0_0.pdb" />
67+
<!--<file src="..\..\..\bin\x64\Release\v120\dynamic\czmq.pdb" target="build\native\bin\czmq-x64-v120-mt-4_0_1_0.pdb" />-->
68+
<file src="..\..\..\bin\x64\Debug\v120\dynamic\czmq.pdb" target="build\native\bin\czmq-x64-v120-mt-gd-4_0_1_0.pdb" />
6969

7070
<!-- x64 Import libraries (.imp.lib) -->
71-
<file src="..\..\..\bin\x64\Release\v120\dynamic\czmq.lib" target="build\native\bin\czmq-x64-v120-mt-4_0_0_0.imp.lib" />
72-
<file src="..\..\..\bin\x64\Debug\v120\dynamic\czmq.lib" target="build\native\bin\czmq-x64-v120-mt-gd-4_0_0_0.imp.lib" />
71+
<file src="..\..\..\bin\x64\Release\v120\dynamic\czmq.lib" target="build\native\bin\czmq-x64-v120-mt-4_0_1_0.imp.lib" />
72+
<file src="..\..\..\bin\x64\Debug\v120\dynamic\czmq.lib" target="build\native\bin\czmq-x64-v120-mt-gd-4_0_1_0.imp.lib" />
7373

7474
<!-- x64 Export libraries (.exp) -->
75-
<file src="..\..\..\bin\x64\Release\v120\dynamic\czmq.exp" target="build\native\bin\czmq-x64-v120-mt-4_0_0_0.exp" />
76-
<file src="..\..\..\bin\x64\Debug\v120\dynamic\czmq.exp" target="build\native\bin\czmq-x64-v120-mt-gd-4_0_0_0.exp" />
75+
<file src="..\..\..\bin\x64\Release\v120\dynamic\czmq.exp" target="build\native\bin\czmq-x64-v120-mt-4_0_1_0.exp" />
76+
<file src="..\..\..\bin\x64\Debug\v120\dynamic\czmq.exp" target="build\native\bin\czmq-x64-v120-mt-gd-4_0_1_0.exp" />
7777

7878
<!-- x64 Static libraries (.lib) -->
79-
<file src="..\..\..\bin\x64\Release\v120\static\czmq.lib" target="build\native\bin\czmq-x64-v120-mt-s-4_0_0_0.lib" />
80-
<file src="..\..\..\bin\x64\Debug\v120\static\czmq.lib" target="build\native\bin\czmq-x64-v120-mt-sgd-4_0_0_0.lib" />
79+
<file src="..\..\..\bin\x64\Release\v120\static\czmq.lib" target="build\native\bin\czmq-x64-v120-mt-s-4_0_1_0.lib" />
80+
<file src="..\..\..\bin\x64\Debug\v120\static\czmq.lib" target="build\native\bin\czmq-x64-v120-mt-sgd-4_0_1_0.lib" />
8181

8282
<!-- x64 Static link time code generation libraries (.ltcg.lib) -->
83-
<file src="..\..\..\bin\Win32\Release\v120\ltcg\czmq.lib" target="build\native\bin\czmq-x64-v120-mt-s-4_0_0_0.ltcg.lib" />
84-
<file src="..\..\..\bin\Win32\Debug\v120\ltcg\czmq.lib" target="build\native\bin\czmq-x64-v120-mt-sgd-4_0_0_0.ltcg.lib" />
83+
<file src="..\..\..\bin\Win32\Release\v120\ltcg\czmq.lib" target="build\native\bin\czmq-x64-v120-mt-s-4_0_1_0.ltcg.lib" />
84+
<file src="..\..\..\bin\Win32\Debug\v120\ltcg\czmq.lib" target="build\native\bin\czmq-x64-v120-mt-sgd-4_0_1_0.ltcg.lib" />
8585
</files>
8686
<!--
8787
################################################################################

0 commit comments

Comments
 (0)