Problem: not checking minimum CZMQ version level

Allows building with old CZMQs, causing weird failures in zproto code. Solution: require at least v 3.0.1 (Also, set Malamute version to 0.1.0)
zeromq · Feb 27, 2015 · 9b754e0 · 9b754e0
1 parent 5eb7111
commit 9b754e0
Show file tree

Hide file tree

Showing 24 changed files with 173 additions and 96 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -69,6 +69,10 @@ if (MINGW)
     set(MORE_LIBRARIES -lws2_32 -lrpcrt4 -liphlpapi)
 endif()
 
+# required libraries for cygwin
+if (CYGWIN)
+    set(MORE_LIBRARIES -luuid)
+endif()
 
 list(APPEND CMAKE_MODULE_PATH ${SOURCE_DIR})
 
@@ -92,13 +96,13 @@ list(APPEND MORE_LIBRARIES ${CZMQ_LIBRARIES})
 set (malamute_headers
     include/mlm_library.h
     include/malamute.h
-    src/zbits.h
     include/mlm_proto.h
     include/mlm_server.h
     include/mlm_client.h
     src/mlm_msg.h
     src/mlm_stream_simple.h
     src/mlm_mailbox_simple.h
+    src/zbits.h
     src/mlm_server_engine.inc
     src/mlm_client_engine.inc
     src/mlm_client_custom.xml
@@ -112,13 +116,13 @@ install(FILES ${malamute_headers} DESTINATION include)
 include_directories(${BINARY_DIR})
 include_directories(${SOURCE_DIR}/include)
 set (malamute_sources
-    src/zbits.c
     src/mlm_proto.c
     src/mlm_server.c
     src/mlm_client.c
     src/mlm_msg.c
     src/mlm_stream_simple.c
     src/mlm_mailbox_simple.c
+    src/zbits.c
 )
 source_group ("Source Files" FILES ${malamute_sources})
 add_library(malamute SHARED ${malamute_sources})

diff --git a/Makefile.am b/Makefile.am
@@ -20,7 +20,10 @@ SUBDIRS += doc
 DIST_SUBDIRS =
 lib_LTLIBRARIES =
 bin_PROGRAMS =
+noinst_PROGRAMS =
 check_PROGRAMS =
+noinst_LTLIBRARIES =
+TESTS =
 
 EXTRA_DIST = \
     mlm_server_engine.inc \

diff --git a/autogen.sh b/autogen.sh
@@ -31,8 +31,9 @@ if [ $? -ne 0 ]; then
 fi
 
 autoreconf --install --force --verbose -I config
-if [ $? -ne 0 ]; then
-    echo "autogen.sh: error: autoreconf exited with status $?" 1>&2
+status=$?
+if [ $status -ne 0 ]; then
+    echo "autogen.sh: error: autoreconf exited with status $status" 1>&2
     exit 1
 fi
 

diff --git a/builds/android/Android.mk b/builds/android/Android.mk
@@ -20,7 +20,7 @@ include $(PREBUILT_SHARED_LIBRARY)
 include $(CLEAR_VARS)
 LOCAL_MODULE := malamute
 LOCAL_C_INCLUDES := ../../include $(LIBZMQ)/include
-LOCAL_SRC_FILES := zbits.c mlm_proto.c mlm_server.c mlm_client.c mlm_msg.c mlm_stream_simple.c mlm_mailbox_simple.c
+LOCAL_SRC_FILES := mlm_proto.c mlm_server.c mlm_client.c mlm_msg.c mlm_stream_simple.c mlm_mailbox_simple.c zbits.c
 LOCAL_SHARED_LIBRARIES := zmq
 include $(BUILD_SHARED_LIBRARY)
 

diff --git a/builds/cygwin/Makefile.cygwin b/builds/cygwin/Makefile.cygwin
@@ -0,0 +1,31 @@
+################################################################################
+#  THIS FILE IS 100% GENERATED BY ZPROJECT; DO NOT EDIT EXCEPT EXPERIMENTALLY  #
+#  Please refer to the README for information about making permanent changes.  #
+################################################################################
+
+CC=gcc
+# replace the following with wherever you have installed libzmq
+PREFIX=/usr/local
+INCDIR=-I$(PREFIX)/include -I.
+LIBDIR=-L$(PREFIX)/lib
+CFLAGS=-Wall -Os -g -DLIBMLM_EXPORTS $(INCDIR)
+
+OBJS = mlm_proto.o mlm_server.o mlm_client.o mlm_msg.o mlm_stream_simple.o mlm_mailbox_simple.o zbits.o
+%.o: ../../src/%.c
+	$(CC) -c -o $@ $< $(CFLAGS)
+
+all: libmlm.dll mlm_selftest.exe
+
+libmlm.dll: $(OBJS)
+	$(CC) -shared -o $@ $(OBJS) -Wl,--out-implib,$@.a $(LIBDIR) -lzmq -luuid
+
+# the test functions are not exported into the DLL
+mlm_selftest.exe: mlm_selftest.o $(OBJS)
+	$(CC) -o $@ $^ $(LIBDIR) -lzmq -luuid
+clean:
+	del *.o *.a *.dll *.exe
+
+################################################################################
+#  THIS FILE IS 100% GENERATED BY ZPROJECT; DO NOT EDIT EXCEPT EXPERIMENTALLY  #
+#  Please refer to the README for information about making permanent changes.  #
+################################################################################
diff --git a/builds/mingw32/Makefile.mingw32 b/builds/mingw32/Makefile.mingw32
@@ -10,7 +10,7 @@ INCDIR=-I$(PREFIX)/include -I.
 LIBDIR=-L$(PREFIX)/lib
 CFLAGS=-Wall -Os -g -DLIBMLM_EXPORTS $(INCDIR)
 
-OBJS = zbits.o mlm_proto.o mlm_server.o mlm_client.o mlm_msg.o mlm_stream_simple.o mlm_mailbox_simple.o
+OBJS = mlm_proto.o mlm_server.o mlm_client.o mlm_msg.o mlm_stream_simple.o mlm_mailbox_simple.o zbits.o
 %.o: ../../src/%.c
 	$(CC) -c -o $@ $< $(CFLAGS)
 

diff --git a/builds/msvc/vs2008/malamute/malamute.sln b/builds/msvc/vs2008/malamute/malamute.sln
@@ -1,8 +1,8 @@
 Microsoft Visual Studio Solution File, Format Version 10.00
 # Visual Studio 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "malamute", "malamute$(project.name).vcproj", "{0C4A2E28-8C9E-4B27-85D9-BB679AD84AC7}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "malamute", "malamute\malamute.vcproj", "{0C4A2E28-8C9E-4B27-85D9-BB679AD84AC7}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "malamute_selftest", "malamute_selftest$(project.name)_selftest.vcproj", "{A5497C4B-1CD1-4779-9458-2CF7908E7E26}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "malamute_selftest", "malamute_selftest\malamute_selftest.vcproj", "{A5497C4B-1CD1-4779-9458-2CF7908E7E26}"
 EndProject
 Global
     GlobalSection(SolutionConfigurationPlatforms) = preSolution

diff --git a/builds/msvc/vs2008/malamute/malamute.vcproj b/builds/msvc/vs2008/malamute/malamute.vcproj
@@ -198,7 +198,7 @@
   <References />
   <Files>
     <Filter Name="Source Files" Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
-      <File RelativePath="..\..\..\..\src\zbits.c">
+      <File RelativePath="..\..\..\..\src\mlm_proto.c">
         <FileConfiguration Name="Release|Win32">
           <Tool Name="VCCLCompilerTool" CompileAs="2" />
         </FileConfiguration>
@@ -230,7 +230,7 @@
           <Tool Name="VCCLCompilerTool" CompileAs="2" />
         </FileConfiguration>
       </File>
-      <File RelativePath="..\..\..\..\src\mlm_proto.c">
+      <File RelativePath="..\..\..\..\src\mlm_server.c">
         <FileConfiguration Name="Release|Win32">
           <Tool Name="VCCLCompilerTool" CompileAs="2" />
         </FileConfiguration>
@@ -262,7 +262,7 @@
           <Tool Name="VCCLCompilerTool" CompileAs="2" />
         </FileConfiguration>
       </File>
-      <File RelativePath="..\..\..\..\src\mlm_server.c">
+      <File RelativePath="..\..\..\..\src\mlm_client.c">
         <FileConfiguration Name="Release|Win32">
           <Tool Name="VCCLCompilerTool" CompileAs="2" />
         </FileConfiguration>
@@ -294,7 +294,7 @@
           <Tool Name="VCCLCompilerTool" CompileAs="2" />
         </FileConfiguration>
       </File>
-      <File RelativePath="..\..\..\..\src\mlm_client.c">
+      <File RelativePath="..\..\..\..\src\mlm_msg.c">
         <FileConfiguration Name="Release|Win32">
           <Tool Name="VCCLCompilerTool" CompileAs="2" />
         </FileConfiguration>
@@ -326,7 +326,7 @@
           <Tool Name="VCCLCompilerTool" CompileAs="2" />
         </FileConfiguration>
       </File>
-      <File RelativePath="..\..\..\..\src\mlm_msg.c">
+      <File RelativePath="..\..\..\..\src\mlm_stream_simple.c">
         <FileConfiguration Name="Release|Win32">
           <Tool Name="VCCLCompilerTool" CompileAs="2" />
         </FileConfiguration>
@@ -358,7 +358,7 @@
           <Tool Name="VCCLCompilerTool" CompileAs="2" />
         </FileConfiguration>
       </File>
-      <File RelativePath="..\..\..\..\src\mlm_stream_simple.c">
+      <File RelativePath="..\..\..\..\src\mlm_mailbox_simple.c">
         <FileConfiguration Name="Release|Win32">
           <Tool Name="VCCLCompilerTool" CompileAs="2" />
         </FileConfiguration>
@@ -390,7 +390,7 @@
           <Tool Name="VCCLCompilerTool" CompileAs="2" />
         </FileConfiguration>
       </File>
-      <File RelativePath="..\..\..\..\src\mlm_mailbox_simple.c">
+      <File RelativePath="..\..\..\..\src\zbits.c">
         <FileConfiguration Name="Release|Win32">
           <Tool Name="VCCLCompilerTool" CompileAs="2" />
         </FileConfiguration>
@@ -425,13 +425,13 @@
     </Filter>
     <Filter Name="Header Files">
       <File RelativePath="..\..\..\..\builds\msvc\platform.h" />
-      <File RelativePath="..\..\..\..\src\zbits.h" />
       <File RelativePath="..\..\..\..\include\mlm_proto.h" />
       <File RelativePath="..\..\..\..\include\mlm_server.h" />
       <File RelativePath="..\..\..\..\include\mlm_client.h" />
       <File RelativePath="..\..\..\..\src\mlm_msg.h" />
       <File RelativePath="..\..\..\..\src\mlm_stream_simple.h" />
       <File RelativePath="..\..\..\..\src\mlm_mailbox_simple.h" />
+      <File RelativePath="..\..\..\..\src\zbits.h" />
       <File RelativePath="..\..\..\..\include\mlm_library.h" />
       <File RelativePath="..\..\..\..\include\malamute.h" />
       <File RelativePath="..\..\..\..\src\mlm_server_engine.inc" />

diff --git a/builds/msvc/vs2010/malamute/malamute.vcxproj b/builds/msvc/vs2010/malamute/malamute.vcxproj
@@ -84,9 +84,6 @@
     <ClInclude Include="..\..\..\..\src\mlm_client_custom.xml" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\..\src\zbits.c">
-      <CompileAs>CompileAsCpp</CompileAs>
-    </ClCompile>
     <ClCompile Include="..\..\..\..\src\mlm_proto.c">
       <CompileAs>CompileAsCpp</CompileAs>
     </ClCompile>
@@ -105,6 +102,9 @@
     <ClCompile Include="..\..\..\..\src\mlm_mailbox_simple.c">
       <CompileAs>CompileAsCpp</CompileAs>
     </ClCompile>
+    <ClCompile Include="..\..\..\..\src\zbits.c">
+      <CompileAs>CompileAsCpp</CompileAs>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\..\malamute.rc" />

diff --git a/builds/msvc/vs2010/malamute/malamute.vcxproj.filters b/builds/msvc/vs2010/malamute/malamute.vcxproj.filters
@@ -7,9 +7,6 @@
 -->
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <ClCompile Include="..\..\..\..\src\zbits.c">
-      <Filter>src</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\..\src\mlm_proto.c">
       <Filter>src</Filter>
     </ClCompile>
@@ -28,6 +25,9 @@
     <ClCompile Include="..\..\..\..\src\mlm_mailbox_simple.c">
       <Filter>src</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\..\src\zbits.c">
+      <Filter>src</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\..\include\mlm_library.h">

diff --git a/builds/msvc/vs2012/malamute/malamute.vcxproj b/builds/msvc/vs2012/malamute/malamute.vcxproj
@@ -84,9 +84,6 @@
     <ClInclude Include="..\..\..\..\src\mlm_client_custom.xml" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\..\src\zbits.c">
-      <CompileAs>CompileAsCpp</CompileAs>
-    </ClCompile>
     <ClCompile Include="..\..\..\..\src\mlm_proto.c">
       <CompileAs>CompileAsCpp</CompileAs>
     </ClCompile>
@@ -105,6 +102,9 @@
     <ClCompile Include="..\..\..\..\src\mlm_mailbox_simple.c">
       <CompileAs>CompileAsCpp</CompileAs>
     </ClCompile>
+    <ClCompile Include="..\..\..\..\src\zbits.c">
+      <CompileAs>CompileAsCpp</CompileAs>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\..\malamute.rc" />

diff --git a/builds/msvc/vs2012/malamute/malamute.vcxproj.filters b/builds/msvc/vs2012/malamute/malamute.vcxproj.filters
@@ -7,9 +7,6 @@
 -->
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <ClCompile Include="..\..\..\..\src\zbits.c">
-      <Filter>src</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\..\src\mlm_proto.c">
       <Filter>src</Filter>
     </ClCompile>
@@ -28,6 +25,9 @@
     <ClCompile Include="..\..\..\..\src\mlm_mailbox_simple.c">
       <Filter>src</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\..\src\zbits.c">
+      <Filter>src</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\..\include\mlm_library.h">

diff --git a/builds/msvc/vs2013/malamute/malamute.vcxproj b/builds/msvc/vs2013/malamute/malamute.vcxproj
@@ -84,9 +84,6 @@
     <ClInclude Include="..\..\..\..\src\mlm_client_custom.xml" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\..\src\zbits.c">
-      <CompileAs>CompileAsCpp</CompileAs>
-    </ClCompile>
     <ClCompile Include="..\..\..\..\src\mlm_proto.c">
       <CompileAs>CompileAsCpp</CompileAs>
     </ClCompile>
@@ -105,6 +102,9 @@
     <ClCompile Include="..\..\..\..\src\mlm_mailbox_simple.c">
       <CompileAs>CompileAsCpp</CompileAs>
     </ClCompile>
+    <ClCompile Include="..\..\..\..\src\zbits.c">
+      <CompileAs>CompileAsCpp</CompileAs>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\..\malamute.rc" />

diff --git a/builds/msvc/vs2013/malamute/malamute.vcxproj.filters b/builds/msvc/vs2013/malamute/malamute.vcxproj.filters
@@ -7,9 +7,6 @@
 -->
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <ClCompile Include="..\..\..\..\src\zbits.c">
-      <Filter>src</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\..\src\mlm_proto.c">
       <Filter>src</Filter>
     </ClCompile>
@@ -28,6 +25,9 @@
     <ClCompile Include="..\..\..\..\src\mlm_mailbox_simple.c">
       <Filter>src</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\..\src\zbits.c">
+      <Filter>src</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\..\include\mlm_library.h">

diff --git a/builds/qt-android/build.sh b/builds/qt-android/build.sh
@@ -20,8 +20,15 @@ android_build_opts
 
 # Use a temporary build directory
 cache="/tmp/android_build/${TOOLCHAIN_NAME}"
+rm -rf "${cache}"
 mkdir -p "${cache}"
 
+# Check for environment variable to clear the prefix and do a clean build
+if [[ $ANDROID_BUILD_CLEAN ]]; then
+    echo "Doing a clean build (removing previous build and depedencies)..."
+    rm -rf "${ANDROID_BUILD_PREFIX}"/*
+fi
+
 ##
 # Make sure zmq is built and copy the prefix
 
@@ -35,7 +42,7 @@ mkdir -p "${cache}"
         exit 1
     fi
 
-    (${ZMQ_ROOT}/builds/qt-android/build.sh) || exit 1
+    (bash ${ZMQ_ROOT}/builds/qt-android/build.sh) || exit 1
     UPSTREAM_PREFIX=${ZMQ_ROOT}/builds/qt-android/prefix/${TOOLCHAIN_NAME}
     cp -r ${UPSTREAM_PREFIX}/* ${ANDROID_BUILD_PREFIX}
 }
@@ -53,7 +60,7 @@ mkdir -p "${cache}"
         exit 1
     fi
 
-    (${CZMQ_ROOT}/builds/qt-android/build.sh) || exit 1
+    (bash ${CZMQ_ROOT}/builds/qt-android/build.sh) || exit 1
     UPSTREAM_PREFIX=${CZMQ_ROOT}/builds/qt-android/prefix/${TOOLCHAIN_NAME}
     cp -r ${UPSTREAM_PREFIX}/* ${ANDROID_BUILD_PREFIX}
 }