Problem: out of date with zproject

Solution: regenerate
zeromq · Dec 28, 2016 · 45de4d3 · 45de4d3
1 parent dcb001c
commit 45de4d3
Show file tree

Hide file tree

Showing 27 changed files with 740 additions and 159 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -11,26 +11,26 @@ RUN chmod 0440 /etc/sudoers.d/zmq
 USER zmq
 
 WORKDIR /home/zmq
-RUN git clone --quiet https://github.com/zeromq/libzmq.git libzmq.git
-WORKDIR /home/zmq/libzmq.git
+RUN git clone --quiet https://github.com/zeromq/libzmq.git libzmq
+WORKDIR /home/zmq/libzmq
 RUN ./autogen.sh 2> /dev/null
 RUN ./configure --quiet --without-docs
 RUN make
 RUN sudo make install
 RUN sudo ldconfig
 
 WORKDIR /home/zmq
-RUN git clone --quiet https://github.com/zeromq/czmq.git czmq.git
-WORKDIR /home/zmq/czmq.git
+RUN git clone --quiet https://github.com/zeromq/czmq.git czmq
+WORKDIR /home/zmq/czmq
 RUN ./autogen.sh 2> /dev/null
 RUN ./configure --quiet --without-docs
 RUN make
 RUN sudo make install
 RUN sudo ldconfig
 
 WORKDIR /home/zmq
-RUN git clone --quiet git://github.com/zeromq/zyre.git zyre.git
-WORKDIR /home/zmq/zyre zyre.git
+RUN git clone --quiet git://github.com/zeromq/zyre.git zyre
+WORKDIR /home/zmq/zyre zyre
 RUN ./autogen.sh 2> /dev/null
 RUN ./configure --quiet --without-docs
 RUN make

diff --git a/Makefile.am b/Makefile.am
@@ -24,11 +24,16 @@ noinst_PROGRAMS =
 check_PROGRAMS =
 noinst_LTLIBRARIES =
 TESTS =
+EXTRA_DIST =
 
-EXTRA_DIST = \
-    CMakeLists.txt \
+if ENABLE_DIST_CMAKEFILES
+EXTRA_DIST += \
     Findlibzmq.cmake \
     Findczmq.cmake \
+    CMakeLists.txt
+endif
+
+EXTRA_DIST += \
     src/zre_msg.h \
     src/zyre_peer.h \
     src/zyre_group.h \

diff --git a/Vagrantfile b/Vagrantfile
@@ -14,17 +14,17 @@ libffi-dev
 # sudo apt-get install -y asciidoc
 
 cd /home/vagrant
-git clone --quiet https://github.com/zeromq/libzmq.git libzmq.git
-cd /home/vagrant/libzmq.git
+git clone --quiet https://github.com/zeromq/libzmq.git libzmq
+cd /home/vagrant/libzmq
 ./autogen.sh
 ./configure
 make
 make install
 ldconfig
 
 cd /home/vagrant
-git clone --quiet https://github.com/zeromq/czmq.git czmq.git
-cd /home/vagrant/czmq.git
+git clone --quiet https://github.com/zeromq/czmq.git czmq
+cd /home/vagrant/czmq
 ./autogen.sh
 ./configure
 make

diff --git a/bindings/jni/ci_build.sh b/bindings/jni/ci_build.sh
@@ -22,7 +22,7 @@ CONFIG_OPTS+=("--quiet")
 pushd ../../..
 
 # Clone and build dependencies
-git clone --quiet --depth 1 https://github.com/zeromq/libzmq libzmq
+git clone --quiet --depth 1 https://github.com/zeromq/libzmq.git libzmq
 cd libzmq
 git --no-pager log --oneline -n1
 if [ -e autogen.sh ]; then
@@ -31,12 +31,20 @@ fi
 if [ -e buildconf ]; then
     ./buildconf 2> /dev/null
 fi
+if [ ! -e autogen.sh ] && [ ! -e buildconf ] && [ ! -e ./configure ] && [ -s ./configure.ac ]; then
+    libtoolize --copy --force && \
+    aclocal -I . && \
+    autoheader && \
+    automake --add-missing --copy && \
+    autoconf || \
+    autoreconf -fiv
+fi
 ./configure "${CONFIG_OPTS[@]}"
 make -j4
 make install
 cd ..
 
-git clone --quiet --depth 1 https://github.com/zeromq/czmq czmq
+git clone --quiet --depth 1 https://github.com/zeromq/czmq.git czmq
 cd czmq
 git --no-pager log --oneline -n1
 if [ -e autogen.sh ]; then
@@ -45,6 +53,14 @@ fi
 if [ -e buildconf ]; then
     ./buildconf 2> /dev/null
 fi
+if [ ! -e autogen.sh ] && [ ! -e buildconf ] && [ ! -e ./configure ] && [ -s ./configure.ac ]; then
+    libtoolize --copy --force && \
+    aclocal -I . && \
+    autoheader && \
+    automake --add-missing --copy && \
+    autoconf || \
+    autoreconf -fiv
+fi
 ./configure "${CONFIG_OPTS[@]}"
 make -j4
 make install

diff --git a/bindings/jni/msvc/configure.bat b/bindings/jni/msvc/configure.bat
@@ -39,7 +39,7 @@ IF EXIST "..\..\..\libzmq" (
 ) ELSE (
     ECHO Building without libzmq
     ECHO zyre cannot build without libzmq
-    ECHO Please clone https://github.com/zeromq/libzmq, and then configure ^& build
+    ECHO Please clone https://github.com/zeromq/libzmq.git, and then configure ^& build
     ECHO TODO: resolve this problem automatically.
     GOTO error
 )
@@ -49,7 +49,7 @@ IF EXIST "..\..\..\czmq" (
 ) ELSE (
     ECHO Building without czmq
     ECHO zyre cannot build without czmq
-    ECHO Please clone https://github.com/zeromq/czmq, and then configure ^& build
+    ECHO Please clone https://github.com/zeromq/czmq.git, and then configure ^& build
     ECHO TODO: resolve this problem automatically.
     GOTO error
 )