From af524aed6b364c01bec7e18303673c49f190ea4c Mon Sep 17 00:00:00 2001 From: evoskuil Date: Fri, 13 May 2016 03:22:01 -0700 Subject: [PATCH] Problem: msvc dist has redundancies and missing elements. --- builds/msvc/Makefile.am | 110 +++++++++++++++++++--------------------- 1 file changed, 52 insertions(+), 58 deletions(-) diff --git a/builds/msvc/Makefile.am b/builds/msvc/Makefile.am index 7931d12c..2e3a2111 100644 --- a/builds/msvc/Makefile.am +++ b/builds/msvc/Makefile.am @@ -3,28 +3,24 @@ LIBZMQ_DIST = vs2008/libzmq.sln \ vs2010/libzmq.sln \ vs2010/libzmq/libzmq.vcxproj \ vs2010/libzmq/libzmq.vcxproj.filters \ - vs2010/libzmq/libzmq.xml \ - vs2010/libzmq.import.props \ - vs2010/libzmq.import.xml \ - vs2010/libsodium.import.props \ - vs2010/libsodium.import.xml \ vs2012/libzmq.sln \ vs2012/libzmq/libzmq.vcxproj \ vs2012/libzmq/libzmq.vcxproj.filters \ - vs2012/libzmq/libzmq.xml \ - vs2012/libzmq.import.props \ - vs2012/libzmq.import.xml \ - vs2012/libsodium.import.props \ - vs2012/libsodium.import.xml \ vs2013/libzmq.sln \ vs2013/libzmq/libzmq.vcxproj \ vs2013/libzmq/libzmq.vcxproj.filters \ - vs2013/libzmq/libzmq.xml \ - vs2013/libzmq.import.props \ - vs2013/libzmq.import.xml \ - vs2013/libsodium.import.props \ - vs2013/libsodium.import.xml \ - platform.hpp errno.cpp errno.hpp resource.h resource.rc + vs2015/libzmq.sln \ + vs2015/libzmq/libzmq.vcxproj \ + vs2015/libzmq/libzmq.vcxproj.filters \ + vs2015/libzmq/libzmq.props \ + vs2015/libzmq/libzmq.xml \ + vs2015/libzmq.import.props \ + vs2015/libzmq.import.xml \ + errno.cpp \ + errno.hpp \ + platform.hpp \ + resource.h \ + resource.rc PERF_DIST = vs2008/local_lat/local_lat.vcproj \ vs2008/local_thr/local_thr.vcproj \ @@ -38,18 +34,6 @@ 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.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 \ @@ -62,39 +46,49 @@ PERF_DIST = vs2008/local_lat/local_lat.vcproj \ vs2013/remote_thr/remote_thr.vcxproj \ vs2013/inproc_lat/inproc_lat.vcxproj \ vs2013/inproc_thr/inproc_thr.vcxproj \ - 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 + vs2015/local_lat/local_lat.vcxproj \ + vs2015/local_lat/local_lat.props \ + vs2015/local_thr/local_thr.vcxproj \ + vs2015/local_thr/local_thr.props \ + vs2015/remote_lat/remote_lat.vcxproj \ + vs2015/remote_lat/remote_lat.props \ + vs2015/remote_thr/remote_thr.vcxproj \ + vs2015/remote_thr/remote_thr.props \ + vs2015/inproc_lat/inproc_lat.vcxproj \ + vs2015/inproc_lat/inproc_lat.props \ + vs2015/inproc_thr/inproc_thr.vcxproj \ + vs2015/inproc_thr/inproc_thr.props PROPERTIES_DIST = properties/Common.props \ - properties/DebugDEXE.props \ - properties/DebugDLL.props \ - properties/DebugLEXE.props \ - properties/DebugLIB.props \ - properties/DebugLTCG.props \ - properties/Debug.props \ - properties/DebugSEXE.props \ - properties/DLL.props \ - properties/EXE.props \ - properties/LIB.props \ - properties/Link.props \ - properties/LTCG.props \ - properties/Messages.props \ - properties/Output.props \ - properties/ReleaseDEXE.props \ - properties/ReleaseDLL.props \ - properties/ReleaseLEXE.props \ - properties/ReleaseLIB.props \ - properties/ReleaseLTCG.props \ - properties/Release.props \ - properties/ReleaseSEXE.props \ - properties/Win32.props \ - properties/x64.props + properties/Debug.props \ + properties/DebugDEXE.props \ + properties/DebugDLL.props \ + properties/DebugLEXE.props \ + properties/DebugLIB.props \ + properties/DebugLTCG.props \ + properties/DebugSEXE.props \ + properties/DLL.props \ + properties/EXE.props \ + properties/LIB.props \ + properties/Link.props \ + properties/LTCG.props \ + properties/Messages.props \ + properties/Output.props \ + properties/Release.props \ + properties/ReleaseDEXE.props \ + properties/ReleaseDLL.props \ + properties/ReleaseLEXE.props \ + properties/ReleaseLIB.props \ + properties/ReleaseLTCG.props \ + properties/ReleaseSEXE.props \ + properties/Win32.props \ + properties/x64.props PRECOMPILED_DIST = ../../src/precompiled.hpp \ ../../src/precompiled.cpp -EXTRA_DIST = $(LIBZMQ_DIST) $(PERF_DIST) $(PROPERTIES_DIST) $(PRECOMPILED_DIST) \ No newline at end of file +BUILD_DIST = build/build.bat \ + build/buildall.bat \ + build/buildbase.bat + +EXTRA_DIST = $(LIBZMQ_DIST) $(PERF_DIST) $(PROPERTIES_DIST) $(PRECOMPILED_DIST) $(BUILD_DIST) \ No newline at end of file