Skip to content

Commit

Permalink
Merge pull request #1552 from bluca/bump_version
Browse files Browse the repository at this point in the history
Problem: 4.0.0 is out, time to bump version for development
  • Loading branch information
sappo authored Nov 8, 2016
2 parents d9750c0 + ab99393 commit f2ed458
Show file tree
Hide file tree
Showing 18 changed files with 74 additions and 70 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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}")
Expand Down
4 changes: 4 additions & 0 deletions NEWS
Original file line number Diff line number Diff line change
@@ -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
=================================================

Expand Down
2 changes: 1 addition & 1 deletion bindings/jni/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
2 changes: 1 addition & 1 deletion bindings/jni/android/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions bindings/jni/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down Expand Up @@ -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'
}
}
}
Expand Down
8 changes: 4 additions & 4 deletions bindings/jni/msvc/resource.rc
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion bindings/qt/buildlib/buildlib.pro
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion bindings/ruby/lib/czmq/ffi/version.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

module CZMQ
module FFI
VERSION = '4.0.0'
VERSION = '4.0.1'
end
end

Expand Down
50 changes: 25 additions & 25 deletions builds/msvc/nuget/package.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2013/01/nuspec.xsd">
<metadata minClientVersion="2.5">
<id>czmq_vc120</id>
<version>4.0.0.0</version>
<version>4.0.1.0</version>
<title>czmq_vc120</title>
<authors>See AUTHORS</authors>
<owners>Eric Voskuil</owners>
Expand Down Expand Up @@ -36,52 +36,52 @@

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

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

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

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

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

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

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

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

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

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

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

<!-- x64 Static link time code generation libraries (.ltcg.lib) -->
<file src="..\..\..\bin\Win32\Release\v120\ltcg\czmq.lib" target="build\native\bin\czmq-x64-v120-mt-s-4_0_0_0.ltcg.lib" />
<file src="..\..\..\bin\Win32\Debug\v120\ltcg\czmq.lib" target="build\native\bin\czmq-x64-v120-mt-sgd-4_0_0_0.ltcg.lib" />
<file src="..\..\..\bin\Win32\Release\v120\ltcg\czmq.lib" target="build\native\bin\czmq-x64-v120-mt-s-4_0_1_0.ltcg.lib" />
<file src="..\..\..\bin\Win32\Debug\v120\ltcg\czmq.lib" target="build\native\bin\czmq-x64-v120-mt-sgd-4_0_1_0.ltcg.lib" />
</files>
<!--
################################################################################
Expand Down
Loading

0 comments on commit f2ed458

Please sign in to comment.