Permalink
Browse files

Problem: out of date with project.xml

Solution: regenerate
  • Loading branch information...
bluca committed Jan 20, 2017
1 parent a8df683 commit af8daead50e5b9ab311ef2ee107769df1fe1d82c
View
@@ -171,7 +171,7 @@ set_target_properties(zyre
PROPERTIES DEFINE_SYMBOL "ZYRE_EXPORTS"
)
set_target_properties (zyre
PROPERTIES SOVERSION "2.0.0"
PROPERTIES SOVERSION "2.0.1"
)
target_link_libraries(zyre
${ZEROMQ_LIBRARIES} ${MORE_LIBRARIES}
@@ -188,7 +188,7 @@ include(${CMAKE_CURRENT_SOURCE_DIR}/src/CMakeLists-local.txt) # Optional project
########################################################################
# pkgconfig
########################################################################
set (VERSION "2.0.0")
set (VERSION "2.0.1")
set (prefix "${CMAKE_INSTALL_PREFIX}")
set (exec_prefix "\${prefix}")
set (libdir "\${prefix}/lib${LIB_SUFFIX}")
View
@@ -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-2.0.0.jar in bindings/jni/build/libs
* It compiles the JNI Java classes into a jar file zyre-jni-2.0.1.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.
@@ -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-2.0.0.jar
unzip -q ../../build/libs/zyre-jni-2.0.1.jar
unzip -q -o ../../../../../czmq/bindings/jni/android/czmq-android.jar
# Copy native libraries into lib/armeabi
@@ -12,7 +12,7 @@ plugins {
}
group = "org.zeromq"
version = "2.0.0"
version = "2.0.1"
repositories {
mavenLocal()
@@ -113,8 +113,8 @@ bintray {
vcsUrl = 'http://github.com/zeromq/zyre.git'
githubRepo = System.getenv('BINTRAY_USER_ORG') + '/zyre'
version {
name = '2.0.0'
vcsTag= '2.0.0'
name = '2.0.1'
vcsTag= '2.0.1'
}
}
}
@@ -49,8 +49,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 2,0,0,0
PRODUCTVERSION 2,0,0,0
FILEVERSION 2,0,1,0
PRODUCTVERSION 2,0,1,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", "2.0.0.0"
VALUE "FileVersion", "2.0.1.0"
VALUE "InternalName", "zyre"
VALUE "LegalCopyright", "Copyright (c) the Authors"
VALUE "OriginalFilename", "libzyre.dll"
VALUE "ProductName", "zyre"
VALUE "ProductVersion", "2.0.0.0"
VALUE "ProductVersion", "2.0.1.0"
END
END
BLOCK "VarFileInfo"
@@ -3,7 +3,7 @@
# Read the zproject/README.md for information about making permanent changes. #
################################################################################
TEMPLATE = lib
VERSION = 2.0.0
VERSION = 2.0.1
CONFIG += qt dll qzyre-buildlib
mac:CONFIG += absolute_library_soname
win32|mac:!wince*:!win32-msvc:!macx-xcode:CONFIG += debug_and_release build_all
@@ -5,7 +5,7 @@
module Zyre
module FFI
VERSION = '2.0.0'
VERSION = '2.0.1'
end
end
@@ -8,7 +8,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2013/01/nuspec.xsd">
<metadata minClientVersion="2.5">
<id>zyrevc120</id>
<version>2.0.0.0</version>
<version>2.0.1.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-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" />
<file src="..\..\..\bin\Win32\Release\v120\dynamic\zyre.dll" target="build\native\bin\zyre-x86-v120-mt-2_0_1_0.dll" />
<file src="..\..\..\bin\Win32\Debug\v120\dynamic\zyre.dll" target="build\native\bin\zyre-x86-v120-mt-gd-2_0_1_0.dll" />
<!-- x86 Debugging symbols (.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" />
<!--<file src="..\..\..\bin\Win32\Release\v120\dynamic\zyre.pdb" target="build\native\bin\zyre-x86-v120-mt-2_0_1_0.pdb" />-->
<file src="..\..\..\bin\Win32\Debug\v120\dynamic\zyre.pdb" target="build\native\bin\zyre-x86-v120-mt-gd-2_0_1_0.pdb" />
<!-- x86 Import libraries (.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" />
<file src="..\..\..\bin\Win32\Release\v120\dynamic\zyre.lib" target="build\native\bin\zyre-x86-v120-mt-2_0_1_0.imp.lib" />
<file src="..\..\..\bin\Win32\Debug\v120\dynamic\zyre.lib" target="build\native\bin\zyre-x86-v120-mt-gd-2_0_1_0.imp.lib" />
<!-- x86 Export libraries (.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" />
<file src="..\..\..\bin\Win32\Release\v120\dynamic\zyre.exp" target="build\native\bin\zyre-x86-v120-mt-2_0_1_0.exp" />
<file src="..\..\..\bin\Win32\Debug\v120\dynamic\zyre.exp" target="build\native\bin\zyre-x86-v120-mt-gd-2_0_1_0.exp" />
<!-- x86 Static libraries (.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" />
<file src="..\..\..\bin\Win32\Release\v120\static\zyre.lib" target="build\native\bin\zyre-x86-v120-mt-s-2_0_1_0.lib" />
<file src="..\..\..\bin\Win32\Debug\v120\static\zyre.lib" target="build\native\bin\zyre-x86-v120-mt-sgd-2_0_1_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-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" />
<file src="..\..\..\bin\Win32\Release\v120\ltcg\zyre.lib" target="build\native\bin\zyre-x86-v120-mt-s-2_0_1_0.ltcg.lib" />
<file src="..\..\..\bin\Win32\Debug\v120\ltcg\zyre.lib" target="build\native\bin\zyre-x86-v120-mt-sgd-2_0_1_0.ltcg.lib" />
<!-- x64 Dynamic libraries (.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" />
<file src="..\..\..\bin\x64\Release\v120\dynamic\zyre.dll" target="build\native\bin\zyre-x64-v120-mt-2_0_1_0.dll" />
<file src="..\..\..\bin\x64\Debug\v120\dynamic\zyre.dll" target="build\native\bin\zyre-x64-v120-mt-gd-2_0_1_0.dll" />
<!-- x64 Debugging symbols (.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" />
<!--<file src="..\..\..\bin\x64\Release\v120\dynamic\zyre.pdb" target="build\native\bin\zyre-x64-v120-mt-2_0_1_0.pdb" />-->
<file src="..\..\..\bin\x64\Debug\v120\dynamic\zyre.pdb" target="build\native\bin\zyre-x64-v120-mt-gd-2_0_1_0.pdb" />
<!-- x64 Import libraries (.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" />
<file src="..\..\..\bin\x64\Release\v120\dynamic\zyre.lib" target="build\native\bin\zyre-x64-v120-mt-2_0_1_0.imp.lib" />
<file src="..\..\..\bin\x64\Debug\v120\dynamic\zyre.lib" target="build\native\bin\zyre-x64-v120-mt-gd-2_0_1_0.imp.lib" />
<!-- x64 Export libraries (.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" />
<file src="..\..\..\bin\x64\Release\v120\dynamic\zyre.exp" target="build\native\bin\zyre-x64-v120-mt-2_0_1_0.exp" />
<file src="..\..\..\bin\x64\Debug\v120\dynamic\zyre.exp" target="build\native\bin\zyre-x64-v120-mt-gd-2_0_1_0.exp" />
<!-- x64 Static libraries (.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" />
<file src="..\..\..\bin\x64\Release\v120\static\zyre.lib" target="build\native\bin\zyre-x64-v120-mt-s-2_0_1_0.lib" />
<file src="..\..\..\bin\x64\Debug\v120\static\zyre.lib" target="build\native\bin\zyre-x64-v120-mt-sgd-2_0_1_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-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" />
<file src="..\..\..\bin\Win32\Release\v120\ltcg\zyre.lib" target="build\native\bin\zyre-x64-v120-mt-s-2_0_1_0.ltcg.lib" />
<file src="..\..\..\bin\Win32\Debug\v120\ltcg\zyre.lib" target="build\native\bin\zyre-x64-v120-mt-sgd-2_0_1_0.ltcg.lib" />
</files>
<!--
################################################################################
Oops, something went wrong.

0 comments on commit af8daea

Please sign in to comment.