From 8d811474d44d5af02650125fda7a34cb5b4abb2f Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Mon, 22 Feb 2016 11:57:07 +0000 Subject: [PATCH 1/4] Problem: make dist broken due to builds/cmake Solution: remove references to builds/cmake/Makefile* since they no longer exist. --- builds/Makefile.am | 3 --- 1 file changed, 3 deletions(-) diff --git a/builds/Makefile.am b/builds/Makefile.am index 5d72d275..8460bd4b 100644 --- a/builds/Makefile.am +++ b/builds/Makefile.am @@ -21,10 +21,7 @@ EXTRA_DIST = \ cmake/Modules/ZMQSourceRunChecks.cmake \ cmake/NSIS.template32.in \ cmake/platform.hpp.in \ - cmake/Makefile.am \ - cmake/Makefile \ cmake/NSIS.template64.in \ - cmake/Makefile.in \ valgrind/valgrind.supp \ valgrind/vg \ nuget/readme.nuget \ From 391397571b443a8dee6228af346d7809df0899fc Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Mon, 22 Feb 2016 11:57:56 +0000 Subject: [PATCH 2/4] Problem: make dist broken due to builds/android Solution: change builds/Makefile.am to reference builds/android instead of builds/qt-android. --- builds/Makefile.am | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/builds/Makefile.am b/builds/Makefile.am index 8460bd4b..76205b79 100644 --- a/builds/Makefile.am +++ b/builds/Makefile.am @@ -26,6 +26,6 @@ EXTRA_DIST = \ valgrind/vg \ nuget/readme.nuget \ nuget/libzmq.autopkg \ - qt-android/android_build_helper.sh \ - qt-android/ci_build.sh \ - qt-android/build.sh + android/android_build_helper.sh \ + android/ci_build.sh \ + android/build.sh From f3686e34ff31f0fe1825500fa387729cea6288d0 Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Mon, 22 Feb 2016 11:58:36 +0000 Subject: [PATCH 3/4] Problem: make dist broken due to builds/msvc Solution: change builds/msvc/Makefile.am to reference vcxproj files instead of props files. --- builds/msvc/Makefile.am | 39 ++++++++++++++++++--------------------- 1 file changed, 18 insertions(+), 21 deletions(-) diff --git a/builds/msvc/Makefile.am b/builds/msvc/Makefile.am index 078c1eb7..7931d12c 100644 --- a/builds/msvc/Makefile.am +++ b/builds/msvc/Makefile.am @@ -3,7 +3,6 @@ LIBZMQ_DIST = vs2008/libzmq.sln \ vs2010/libzmq.sln \ vs2010/libzmq/libzmq.vcxproj \ vs2010/libzmq/libzmq.vcxproj.filters \ - vs2010/libzmq/libzmq.props \ vs2010/libzmq/libzmq.xml \ vs2010/libzmq.import.props \ vs2010/libzmq.import.xml \ @@ -12,7 +11,6 @@ LIBZMQ_DIST = vs2008/libzmq.sln \ vs2012/libzmq.sln \ vs2012/libzmq/libzmq.vcxproj \ vs2012/libzmq/libzmq.vcxproj.filters \ - vs2012/libzmq/libzmq.props \ vs2012/libzmq/libzmq.xml \ vs2012/libzmq.import.props \ vs2012/libzmq.import.xml \ @@ -21,7 +19,6 @@ LIBZMQ_DIST = vs2008/libzmq.sln \ vs2013/libzmq.sln \ vs2013/libzmq/libzmq.vcxproj \ vs2013/libzmq/libzmq.vcxproj.filters \ - vs2013/libzmq/libzmq.props \ vs2013/libzmq/libzmq.xml \ vs2013/libzmq.import.props \ vs2013/libzmq.import.xml \ @@ -41,36 +38,36 @@ PERF_DIST = vs2008/local_lat/local_lat.vcproj \ vs2010/remote_thr/remote_thr.vcxproj \ vs2010/inproc_lat/inproc_lat.vcxproj \ vs2010/inproc_thr/inproc_thr.vcxproj \ - vs2010/local_lat/local_lat.props \ - vs2010/local_thr/local_thr.props \ - vs2010/remote_lat/remote_lat.props \ - vs2010/remote_thr/remote_thr.props \ - vs2010/inproc_lat/inproc_lat.props \ - vs2010/inproc_thr/inproc_thr.props \ + vs2010/local_lat/local_lat.vcxproj \ + vs2010/local_thr/local_thr.vcxproj \ + vs2010/remote_lat/remote_lat.vcxproj \ + vs2010/remote_thr/remote_thr.vcxproj \ + vs2010/inproc_lat/inproc_lat.vcxproj \ + vs2010/inproc_thr/inproc_thr.vcxproj \ + vs2012/local_lat/local_lat.vcxproj \ + vs2012/local_thr/local_thr.vcxproj \ + vs2012/remote_lat/remote_lat.vcxproj \ + vs2012/remote_thr/remote_thr.vcxproj \ + vs2012/inproc_lat/inproc_lat.vcxproj \ + vs2012/inproc_thr/inproc_thr.vcxproj \ vs2012/local_lat/local_lat.vcxproj \ vs2012/local_thr/local_thr.vcxproj \ vs2012/remote_lat/remote_lat.vcxproj \ vs2012/remote_thr/remote_thr.vcxproj \ vs2012/inproc_lat/inproc_lat.vcxproj \ vs2012/inproc_thr/inproc_thr.vcxproj \ - vs2012/local_lat/local_lat.props \ - vs2012/local_thr/local_thr.props \ - vs2012/remote_lat/remote_lat.props \ - vs2012/remote_thr/remote_thr.props \ - vs2012/inproc_lat/inproc_lat.props \ - vs2012/inproc_thr/inproc_thr.props \ vs2013/local_lat/local_lat.vcxproj \ vs2013/local_thr/local_thr.vcxproj \ vs2013/remote_lat/remote_lat.vcxproj \ vs2013/remote_thr/remote_thr.vcxproj \ vs2013/inproc_lat/inproc_lat.vcxproj \ vs2013/inproc_thr/inproc_thr.vcxproj \ - vs2013/local_lat/local_lat.props \ - vs2013/local_thr/local_thr.props \ - vs2013/remote_lat/remote_lat.props \ - vs2013/remote_thr/remote_thr.props \ - vs2013/inproc_lat/inproc_lat.props \ - vs2013/inproc_thr/inproc_thr.props + vs2013/local_lat/local_lat.vcxproj \ + vs2013/local_thr/local_thr.vcxproj \ + vs2013/remote_lat/remote_lat.vcxproj \ + vs2013/remote_thr/remote_thr.vcxproj \ + vs2013/inproc_lat/inproc_lat.vcxproj \ + vs2013/inproc_thr/inproc_thr.vcxproj PROPERTIES_DIST = properties/Common.props \ properties/DebugDEXE.props \ From b3b9cfd92e3cf93358e547812249c2f124e7693d Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Mon, 22 Feb 2016 11:59:48 +0000 Subject: [PATCH 4/4] Problem: packaging/redhat/zeromq.spec not ignored Solution: add it to .gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 23c62096..61749c51 100644 --- a/.gitignore +++ b/.gitignore @@ -163,6 +163,7 @@ builds/msvc/**/*Release builds/redhat/zeromq.spec builds/android/prefix/ packaging/nuget/*.nupkg +packaging/redhat/zeromq.spec foreign/openpgm/* !foreign/openpgm/*.tar.bz2 !foreign/openpgm/*.tar.gz