[cpp-msbuild] branch master updated: Auto build - remove a whole bunch of stuff for massaging makefiles into place - add more tool-independence into the batch files
Rod Widdowson
rdw at steadingsoftware.com
Wed Dec 7 09:24:38 EST 2016
This is an automated email from the git hooks/post-receive script.
rdw pushed a commit to branch master
in repository cpp-msbuild.
View the commit online:
http://git.shibboleth.net/view/?p=cpp-msbuild.git;a=commit;h=4cbecc2ad8a534479844e28eaada5f0fdd2205c0
The following commit(s) were added to refs/heads/master by this push:
new 4cbecc2 Auto build - remove a whole bunch of stuff for massaging makefiles into place - add more tool-independence into the batch files
4cbecc2 is described below
commit 4cbecc2ad8a534479844e28eaada5f0fdd2205c0
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Wed Dec 7 14:23:42 2016 +0000
Auto build
- remove a whole bunch of stuff for massaging makefiles into place
- add more tool-independence into the batch files
---
dependencies/OpenSSL-compile32.bat | 17 ----------
dependencies/OpenSSL-compile64.bat | 21 -------------
dependencies/OpenSSL.bat | 64 --------------------------------------
dependencies/curl.32.d.r1 | 1 -
dependencies/curl.32.d.r2 | 1 -
dependencies/curl.32.d.r3 | 1 -
dependencies/curl.32.r1 | 1 -
dependencies/curl.64.d.r1 | 1 -
dependencies/curl.64.d.r2 | 1 -
dependencies/curl.64.d.r3 | 1 -
dependencies/curl.64.d.r4 | 1 -
dependencies/curl.64.d.r5 | 1 -
dependencies/curl.64.d.r6 | 1 -
dependencies/curl.64.r1 | 1 -
dependencies/curl.64.r2 | 1 -
dependencies/curl.64.r3 | 1 -
dependencies/curl.64.r4 | 1 -
dependencies/curl.64.r5 | 1 -
dependencies/execurl-compile32.bat | 11 -------
dependencies/execurl-compile64.bat | 13 --------
dependencies/execurl.32.d.r2 | 1 -
dependencies/execurl.32.d.r3 | 1 -
dependencies/execurl.32.d.r4 | 1 -
dependencies/execurl.32.d.r5 | 1 -
dependencies/execurl.32.d.r6 | 1 -
dependencies/execurl.32.r2 | 1 -
dependencies/execurl.32.r3 | 1 -
dependencies/execurl.64.d.r2 | 1 -
dependencies/execurl.64.d.r3 | 1 -
dependencies/execurl.64.d.r4 | 1 -
dependencies/execurl.64.d.r5 | 1 -
dependencies/execurl.64.d.r6 | 1 -
dependencies/execurl.64.d.r7 | 2 --
dependencies/execurl.64.r2 | 1 -
dependencies/execurl.64.r3 | 1 -
dependencies/execurl.64.r4 | 1 -
dependencies/execurl.64.r5 | 1 -
dependencies/execurl.64.r6 | 1 -
dependencies/execurl.64.r7 | 2 --
dependencies/execurl.bat | 44 --------------------------
dependencies/libcurl-compile32.bat | 10 ------
dependencies/libcurl-compile64.bat | 9 ------
dependencies/libcurl.bat | 41 ------------------------
dependencies/log4shib-compile.bat | 8 ++---
dependencies/openssl1.1-x64.bat | 40 ------------------------
dependencies/openssl1.1-x86.bat | 10 ------
dependencies/openssl_I_crypto.sed | 2 --
dependencies/openssl_I_ssl.sed | 2 --
dependencies/openssl_l_cryptoD.sed | 1 -
dependencies/openssl_l_sslD.sed | 1 -
dependencies/xerces-compile.bat | 8 ++---
dependencies/zlib.bat | 2 +-
52 files changed, 9 insertions(+), 331 deletions(-)
diff --git a/dependencies/OpenSSL-compile32.bat b/dependencies/OpenSSL-compile32.bat
deleted file mode 100644
index 6ad1b5b..0000000
--- a/dependencies/OpenSSL-compile32.bat
+++ /dev/null
@@ -1,17 +0,0 @@
-del ms\uptable.obj
-
-nmake -f 32-dll.mak reallyclean
-copy /y ms\libeay32.win32.def.nodebug ms\libeay32.def
-copy /y ms\ssleay32.win32.def.nodebug ms\ssleay32.def
- at if errorlevel 1 goto end
-nmake -f 32-dll.mak
- at if errorlevel 1 goto end
-
-nmake -f 32-dll-debug.mak reallyclean
-copy /y ms\libeay32.win32.def.debug ms\libeay32.def
-copy /y ms\ssleay32.win32.def.debug ms\ssleay32.def
- at if errorlevel 1 goto end
-nmake -f 32-dll-debug.mak
- at if errorlevel 1 goto end
-
-:end
\ No newline at end of file
diff --git a/dependencies/OpenSSL-compile64.bat b/dependencies/OpenSSL-compile64.bat
deleted file mode 100644
index 5f5f861..0000000
--- a/dependencies/OpenSSL-compile64.bat
+++ /dev/null
@@ -1,21 +0,0 @@
-perl ms\uplink-x86_64.pl nasm > ms\uptable.asm
-nasm -f win64 -o ms\uptable.obj ms\uptable.asm
- at if errorlevel 1 goto end
-
-nmake -f 64-dll.mak reallyclean
- at if errorlevel 1 goto end
-copy /y ms\libeay32.x64.def.nodebug ms\libeay32.def
-copy /y ms\ssleay32.x64.def.nodebug ms\ssleay32.def
-
-nmake -f 64-dll.mak
- at if errorlevel 1 goto end
-
-nmake -f 64-dll-debug.mak reallyclean
- at if errorlevel 1 goto end
-copy /y ms\libeay32.x64.def.debug ms\libeay32.def
-copy /y ms\ssleay32.x64.def.debug ms\ssleay32.def
-
-nmake -f 64-dll-debug.mak
- at if errorlevel 1 goto end
-
-:end
diff --git a/dependencies/OpenSSL.bat b/dependencies/OpenSSL.bat
deleted file mode 100644
index 558be10..0000000
--- a/dependencies/OpenSSL.bat
+++ /dev/null
@@ -1,64 +0,0 @@
-rem https://wiki.shibboleth.net/confluence/display/OpenSAML/OpenSSL
-
-perl Configure VC-WIN32
-perl util\mkfiles.pl >MINFO
-perl util\mk1mf.pl INC=inc32 OUT=out32dll TMP=tmp32dll nasm dll VC-WIN32 >32-dll.mak.in
-perl util\mk1mf.pl INC=inc32.dbg OUT=out32dll.dbg TMP=tmp32dll.dbg debug nasm dll VC-WIN32 >32-dll-debug.mak.in
-
-rem Release: Append version to dll name
-
-echo s/^O_SSL.*dll$/O_SSL= $(LIB_D)\\\$(SSL)_%OPENSSL_NAME%.dll/ > openssl_o_ssl.sed
-echo s/^O_CRYPTO.*dll$/O_CRYPTO= $(LIB_D)\\\$(CRYPTO)_%OPENSSL_NAME%.dll/ > openssl_o_crypto.sed
-copy /y %SCRIPTS_DIR%\openssl_I_ssl.sed
-copy /y %SCRIPTS_DIR%\openssl_I_crypto.sed
-
-sed 32-dll.mak.in -f openssl_o_ssl.sed -f openssl_o_crypto.sed -f openssl_I_ssl.sed -f openssl_I_crypto.sed > 32-dll.mak
-
-rem Debug: Append versionD to dll name, D to Lib name
-
-echo s/^O_SSL.*dll$/O_SSL= $(LIB_D)\\\$(SSL)_%OPENSSL_NAME%D.dll/ > openssl_o_sslD.sed
-echo s/^O_CRYPTO.*dll$/O_CRYPTO= $(LIB_D)\\\$(CRYPTO)_%OPENSSL_NAME%D.dll/ > openssl_o_cryptoD.sed
-copy/y %SCRIPTS_DIR%\openssl_l_sslD.sed
-copy /y %SCRIPTS_DIR%\openssl_l_cryptoD.sed
-
-sed 32-dll-debug.mak.in -f openssl_o_sslD.sed -f openssl_o_cryptoD.sed -f openssl_I_ssl.sed -f openssl_I_crypto.sed -f openssl_l_sslD.sed -f openssl_l_cryptoD.sed > 32-dll-debug.mak
-
-
-perl util\mkdef.pl 32 libeay > ms\libeay32.def.master
-
-rem Release: Append version to library name, Debug: Append versionD to library name
-
-echo s/^LIBRARY .*$/LIBRARY LIBEAY32_%OPENSSL_NAME%/ > openssl.lib
-echo s/^LIBRARY .*$/LIBRARY LIBEAY32_%OPENSSL_NAME%D/ > openssl.libd
-sed ms\libeay32.def.master -f openssl.lib > ms\libeay32.win32.def.nodebug
-sed ms\libeay32.def.master -f openssl.libd > ms\libeay32.win32.def.debug
-
-
-perl util\mkdef.pl 32 ssleay > ms\ssleay32.def.master
-echo s/^LIBRARY .*$/LIBRARY SSLEAY32_%OPENSSL_NAME%/ > openssl.ssl
-echo s/^LIBRARY .*$/LIBRARY SSLEAY32_%OPENSSL_NAME%D/ > openssl.ssld
-sed ms\ssleay32.def.master -f openssl.ssl > ms\ssleay32.win32.def.nodebug
-sed ms\ssleay32.def.master -f openssl.ssld > ms\ssleay32.win32.def.debug
-
-Rem now do it all again for 64
-
-perl Configure VC-WIN64A
-perl util\mkfiles.pl >MINFO
-perl util\mk1mf.pl INC=inc64 OUT=out64dll TMP=tmp64dll dll VC-WIN64A >64-dll.mak.in
-sed 64-dll.mak.in -f openssl_o_ssl.sed -f openssl_o_crypto.sed -f openssl_I_ssl.sed -f openssl_I_crypto.sed > 64-dll.mak
-
-perl util\mk1mf.pl INC=inc64.dbg OUT=out64dll.dbg TMP=tmp64dll.dbg debug dll VC-WIN64A >64-dll-debug.mak.in
-sed 64-dll-debug.mak.in -f openssl_o_sslD.sed -f openssl_o_cryptoD.sed -f openssl_I_ssl.sed -f openssl_I_crypto.sed -f openssl_l_sslD.sed -f openssl_l_cryptoD.sed > 64-dll-debug.mak
-
-nasm -f win64 -o ms\uptable.obj.64 ms\uptable.asm
-
-perl util\mkdef.pl 64 libeay > ms\libeay32.def.master
-
-sed ms\libeay32.def.master -f openssl.lib > ms\libeay32.x64.def.nodebug
-sed ms\libeay32.def.master -f openssl.libd > ms\libeay32.x64.def.debug
-
-rem perl util\mkdef.pl 32 ssleay > ms\ssleay32.def.master
-
-sed ms\ssleay32.def.master -f openssl.ssl > ms\ssleay32.x64.def.nodebug
-sed ms\ssleay32.def.master -f openssl.ssld > ms\ssleay32.x64.def.debug
-
diff --git a/dependencies/curl.32.d.r1 b/dependencies/curl.32.d.r1
deleted file mode 100644
index dc6b67e..0000000
--- a/dependencies/curl.32.d.r1
+++ /dev/null
@@ -1 +0,0 @@
-s/ZLIBLIBSDLL .*$/ZLIBLIBSDLL = Debug\\D.lib/
diff --git a/dependencies/curl.32.d.r2 b/dependencies/curl.32.d.r2
deleted file mode 100644
index eb83729..0000000
--- a/dependencies/curl.32.d.r2
+++ /dev/null
@@ -1 +0,0 @@
-s/SSLLIBS .*$/SSLLIBS= libeay32d.lib ssleay32d.lib/
diff --git a/dependencies/curl.32.d.r3 b/dependencies/curl.32.d.r3
deleted file mode 100644
index e6192b7..0000000
--- a/dependencies/curl.32.d.r3
+++ /dev/null
@@ -1 +0,0 @@
-s/\\out32dll/\\out32dll.dbg/g
diff --git a/dependencies/curl.32.r1 b/dependencies/curl.32.r1
deleted file mode 100644
index 57c63aa..0000000
--- a/dependencies/curl.32.r1
+++ /dev/null
@@ -1 +0,0 @@
-s/ZLIBLIBSDLL .*$/ZLIBLIBSDLL = Release\\.lib/
diff --git a/dependencies/curl.64.d.r1 b/dependencies/curl.64.d.r1
deleted file mode 100644
index 92e8abf..0000000
--- a/dependencies/curl.64.d.r1
+++ /dev/null
@@ -1 +0,0 @@
-s/ZLIBLIBSDLL .*$/ZLIBLIBSDLL = x64\\Debug\\.lib/
diff --git a/dependencies/curl.64.d.r2 b/dependencies/curl.64.d.r2
deleted file mode 100644
index f2355c2..0000000
--- a/dependencies/curl.64.d.r2
+++ /dev/null
@@ -1 +0,0 @@
-s/\/inc32/\/inc64/g
diff --git a/dependencies/curl.64.d.r3 b/dependencies/curl.64.d.r3
deleted file mode 100644
index 7c68101..0000000
--- a/dependencies/curl.64.d.r3
+++ /dev/null
@@ -1 +0,0 @@
-s/\\out32dll/\\out64dll.dbg/g
diff --git a/dependencies/curl.64.d.r4 b/dependencies/curl.64.d.r4
deleted file mode 100644
index 52314bd..0000000
--- a/dependencies/curl.64.d.r4
+++ /dev/null
@@ -1 +0,0 @@
-s/^DIROBJ .*$/&.x64/
diff --git a/dependencies/curl.64.d.r5 b/dependencies/curl.64.d.r5
deleted file mode 100644
index eb83729..0000000
--- a/dependencies/curl.64.d.r5
+++ /dev/null
@@ -1 +0,0 @@
-s/SSLLIBS .*$/SSLLIBS= libeay32d.lib ssleay32d.lib/
diff --git a/dependencies/curl.64.d.r6 b/dependencies/curl.64.d.r6
deleted file mode 100644
index 7cfcc18..0000000
--- a/dependencies/curl.64.d.r6
+++ /dev/null
@@ -1 +0,0 @@
-s/^RESOURCE .*$/RESOURCE = \$(CFG)\\libcurl.res/
diff --git a/dependencies/curl.64.r1 b/dependencies/curl.64.r1
deleted file mode 100644
index 28e764d..0000000
--- a/dependencies/curl.64.r1
+++ /dev/null
@@ -1 +0,0 @@
-s/ZLIBLIBSDLL .*$/ZLIBLIBSDLL = x64\\Release\\.lib/
diff --git a/dependencies/curl.64.r2 b/dependencies/curl.64.r2
deleted file mode 100644
index f2355c2..0000000
--- a/dependencies/curl.64.r2
+++ /dev/null
@@ -1 +0,0 @@
-s/\/inc32/\/inc64/g
diff --git a/dependencies/curl.64.r3 b/dependencies/curl.64.r3
deleted file mode 100644
index bc948ce..0000000
--- a/dependencies/curl.64.r3
+++ /dev/null
@@ -1 +0,0 @@
-s/\\out32dll/\\out64dll/g
diff --git a/dependencies/curl.64.r4 b/dependencies/curl.64.r4
deleted file mode 100644
index 0413220..0000000
--- a/dependencies/curl.64.r4
+++ /dev/null
@@ -1 +0,0 @@
-s/^DIROBJ .*$/&\.x64/
diff --git a/dependencies/curl.64.r5 b/dependencies/curl.64.r5
deleted file mode 100644
index 7cfcc18..0000000
--- a/dependencies/curl.64.r5
+++ /dev/null
@@ -1 +0,0 @@
-s/^RESOURCE .*$/RESOURCE = \$(CFG)\\libcurl.res/
diff --git a/dependencies/execurl-compile32.bat b/dependencies/execurl-compile32.bat
deleted file mode 100644
index aa5b1cb..0000000
--- a/dependencies/execurl-compile32.bat
+++ /dev/null
@@ -1,11 +0,0 @@
-cd src
-del *.obj
-nmake -f Makefile.shib.32 release CFG=release-dll-ssl-dll-zlib-dll LIB_NAME=%LIBCURL_NAME% OPENSSL_PATH=..\..\%OPENSSL_DIR% ZLIB_DIR=..\..\%ZLIB_DIR%
- at if errorlevel 1 goto end
-
-del *.obj
-nmake -f Makefile.shib.32.d debug CFG=debug-dll-ssl-dll-zlib-dll LIB_NAME=%LIBCURL_NAME% OPENSSL_PATH=..\..\%OPENSSL_DIR% ZLIB_DIR=..\..\%ZLIB_DIR%
- at if errorlevel 1 goto end
-cd ..
-
-:end
\ No newline at end of file
diff --git a/dependencies/execurl-compile64.bat b/dependencies/execurl-compile64.bat
deleted file mode 100644
index 0664f53..0000000
--- a/dependencies/execurl-compile64.bat
+++ /dev/null
@@ -1,13 +0,0 @@
-cd src
-
-del *.obj
-nmake -f Makefile.shib.64 release CFG=release-dll-ssl-dll-zlib-dll.x64 LIB_NAME=%LIBCURL_NAME% OPENSSL_PATH=..\..\%OPENSSL_DIR% ZLIB_DIR=..\..\%ZLIB_DIR% MACHINE=x64
- at if errorlevel 1 goto end
-
-del *.obj
-nmake -f Makefile.shib.64.d release CFG=debug-dll-ssl-dll-zlib-dll.x64 LIB_NAME=%LIBCURL_NAME% OPENSSL_PATH=..\..\%OPENSSL_DIR% ZLIB_DIR=..\..\%ZLIB_DIR% MACHINE=x64
- at if errorlevel 1 goto end
-
-cd ..
-
-:end
\ No newline at end of file
diff --git a/dependencies/execurl.32.d.r2 b/dependencies/execurl.32.d.r2
deleted file mode 100644
index 71daa9b..0000000
--- a/dependencies/execurl.32.d.r2
+++ /dev/null
@@ -1 +0,0 @@
-s/^LINKD\( .*\)libpath.*$/LINKD \1libpath:\"..\/lib\/debug-dll-ssl-dll-zlib-dll\"/
diff --git a/dependencies/execurl.32.d.r3 b/dependencies/execurl.32.d.r3
deleted file mode 100644
index 117a5b7..0000000
--- a/dependencies/execurl.32.d.r3
+++ /dev/null
@@ -1 +0,0 @@
-s/SSL_LIBS .*$/SSL_LIBS= libeay32d.lib ssleay32d.lib/
diff --git a/dependencies/execurl.32.d.r4 b/dependencies/execurl.32.d.r4
deleted file mode 100644
index 32bea6e..0000000
--- a/dependencies/execurl.32.d.r4
+++ /dev/null
@@ -1 +0,0 @@
-s/\/out32dll/\/out32dll.dbg/g
diff --git a/dependencies/execurl.32.d.r5 b/dependencies/execurl.32.d.r5
deleted file mode 100644
index eb8ca19..0000000
--- a/dependencies/execurl.32.d.r5
+++ /dev/null
@@ -1 +0,0 @@
-s/curl\.exe/Debug\\curl\.exe/
diff --git a/dependencies/execurl.32.d.r6 b/dependencies/execurl.32.d.r6
deleted file mode 100644
index 4286422..0000000
--- a/dependencies/execurl.32.d.r6
+++ /dev/null
@@ -1 +0,0 @@
-s/release-dll-ssl-dll-zlib-dll/debug-dll-ssl-dll-zlib-dll/g
diff --git a/dependencies/execurl.32.r2 b/dependencies/execurl.32.r2
deleted file mode 100644
index 8e1cb49..0000000
--- a/dependencies/execurl.32.r2
+++ /dev/null
@@ -1 +0,0 @@
-s/^LINKR\( .*\)libpath.*$/LINKR \1libpath:\"..\/lib\/release-dll-ssl-dll-zlib-dll\"/
diff --git a/dependencies/execurl.32.r3 b/dependencies/execurl.32.r3
deleted file mode 100644
index 3f5219d..0000000
--- a/dependencies/execurl.32.r3
+++ /dev/null
@@ -1 +0,0 @@
-s/curl\.exe/Release\\curl\.exe/g
diff --git a/dependencies/execurl.64.d.r2 b/dependencies/execurl.64.d.r2
deleted file mode 100644
index ebe2114..0000000
--- a/dependencies/execurl.64.d.r2
+++ /dev/null
@@ -1 +0,0 @@
-s/^LINKD\( .*\)libpath.*$/LINKD \1libpath:\"..\/lib\/debug-dll-ssl-dll-zlib-dll.x64\"/
diff --git a/dependencies/execurl.64.d.r3 b/dependencies/execurl.64.d.r3
deleted file mode 100644
index 117a5b7..0000000
--- a/dependencies/execurl.64.d.r3
+++ /dev/null
@@ -1 +0,0 @@
-s/SSL_LIBS .*$/SSL_LIBS= libeay32d.lib ssleay32d.lib/
diff --git a/dependencies/execurl.64.d.r4 b/dependencies/execurl.64.d.r4
deleted file mode 100644
index 7ef5920..0000000
--- a/dependencies/execurl.64.d.r4
+++ /dev/null
@@ -1 +0,0 @@
-s/\/out32dll/\/out64dll.dbg/g
diff --git a/dependencies/execurl.64.d.r5 b/dependencies/execurl.64.d.r5
deleted file mode 100644
index f2355c2..0000000
--- a/dependencies/execurl.64.d.r5
+++ /dev/null
@@ -1 +0,0 @@
-s/\/inc32/\/inc64/g
diff --git a/dependencies/execurl.64.d.r6 b/dependencies/execurl.64.d.r6
deleted file mode 100644
index 4cca58d..0000000
--- a/dependencies/execurl.64.d.r6
+++ /dev/null
@@ -1 +0,0 @@
-s/release-dll-ssl-dll-zlib-dll/debug-dll-ssl-dll-zlib-dll.x64/g
diff --git a/dependencies/execurl.64.d.r7 b/dependencies/execurl.64.d.r7
deleted file mode 100644
index 24c585d..0000000
--- a/dependencies/execurl.64.d.r7
+++ /dev/null
@@ -1,2 +0,0 @@
-s/curl\.exe/Debug.x64\\curl\.exe/g
-
diff --git a/dependencies/execurl.64.r2 b/dependencies/execurl.64.r2
deleted file mode 100644
index c5a1f76..0000000
--- a/dependencies/execurl.64.r2
+++ /dev/null
@@ -1 +0,0 @@
-s/^LINKR\( .*\)libpath.*$/LINKR \1libpath:\"..\/lib\/release-dll-ssl-dll-zlib-dll"/
diff --git a/dependencies/execurl.64.r3 b/dependencies/execurl.64.r3
deleted file mode 100644
index f2355c2..0000000
--- a/dependencies/execurl.64.r3
+++ /dev/null
@@ -1 +0,0 @@
-s/\/inc32/\/inc64/g
diff --git a/dependencies/execurl.64.r4 b/dependencies/execurl.64.r4
deleted file mode 100644
index bc948ce..0000000
--- a/dependencies/execurl.64.r4
+++ /dev/null
@@ -1 +0,0 @@
-s/\\out32dll/\\out64dll/g
diff --git a/dependencies/execurl.64.r5 b/dependencies/execurl.64.r5
deleted file mode 100644
index 0413220..0000000
--- a/dependencies/execurl.64.r5
+++ /dev/null
@@ -1 +0,0 @@
-s/^DIROBJ .*$/&\.x64/
diff --git a/dependencies/execurl.64.r6 b/dependencies/execurl.64.r6
deleted file mode 100644
index fbb8f28..0000000
--- a/dependencies/execurl.64.r6
+++ /dev/null
@@ -1 +0,0 @@
-s/release-dll-ssl-dll-zlib-dll/release-dll-ssl-dll-zlib-dll\.x64/g
diff --git a/dependencies/execurl.64.r7 b/dependencies/execurl.64.r7
deleted file mode 100644
index e3162d7..0000000
--- a/dependencies/execurl.64.r7
+++ /dev/null
@@ -1,2 +0,0 @@
-s/curl\.exe/Release.x64\\curl\.exe/g
-
diff --git a/dependencies/execurl.bat b/dependencies/execurl.bat
deleted file mode 100644
index 1257c61..0000000
--- a/dependencies/execurl.bat
+++ /dev/null
@@ -1,44 +0,0 @@
-
-REM Clean
-
-rd/s/q src\Release src\Release.x64 src\Debug src\Debug.x64
-mkdir src\Release src\Release.x64 src\Debug src\Debug.x64
-
-
-REM 32/Release
-echo s/^ZLIB_IMP_LIBS .*$/ZLIB_IMP_LIBS = Release\\%ZLIB_IMPLIB%.lib/ > execurl.32.r1
-copy /y %SCRIPTS_DIR%\execurl.32.r2
-copy /y %SCRIPTS_DIR%\execurl.32.r3
-sed src\makefile.vc14 -f execurl.32.r1 -f execurl.32.r2 -f execurl.32.r3 > src\makefile.shib.32
-
-
-REM 32/Debug
-
-echo s/^ZLIB_IMP_LIBS .*$/ZLIB_IMP_LIBS = Debug\\%ZLIB_IMPLIB%D.lib/ > execurl.32.d.r1
-copy /y %SCRIPTS_DIR%\execurl.32.d.r2
-copy /y %SCRIPTS_DIR%\execurl.32.d.r3
-copy /y %SCRIPTS_DIR%\execurl.32.d.r4
-copy /y %SCRIPTS_DIR%\execurl.32.d.r5
-copy /y %SCRIPTS_DIR%\execurl.32.d.r6
-sed src\makefile.vc14 -f execurl.32.d.r1 -f execurl.32.d.r2 -f execurl.32.d.r3 -f execurl.32.d.r4 -f execurl.32.d.r5 -f execurl.32.d.r6 > src\makefile.shib.32.d
-
-
-REM 64/Release
-echo s/^ZLIB_IMP_LIBS .*$/ZLIB_IMP_LIBS = x64\\Release\\%ZLIB_IMPLIB%.lib/ > execurl.64.r1
-copy /y %SCRIPTS_DIR%\execurl.64.r2
-copy /y %SCRIPTS_DIR%\execurl.64.r3
-copy /y %SCRIPTS_DIR%\execurl.64.r4
-rem copy /y %SCRIPTS_DIR%\execurl.64.r5
-copy /y %SCRIPTS_DIR%\execurl.64.r6
-copy /y %SCRIPTS_DIR%\execurl.64.r7
-sed src\makefile.vc14 -f execurl.64.r1 -f execurl.64.r2 -f execurl.64.r3 -f execurl.64.r4 -f execurl.64.r6 -f execurl.64.r7 > src\makefile.shib.64
-
-REM 64/DEBUG
-echo s/^ZLIB_IMP_LIBS .*$/ZLIB_IMP_LIBS = x64\\Debug\\%ZLIB_IMPLIB%D.lib/ > execurl.64.d.r1
-copy /y %SCRIPTS_DIR%\execurl.64.d.r2
-copy /y %SCRIPTS_DIR%\execurl.64.d.r3
-copy /y %SCRIPTS_DIR%\execurl.64.d.r4
-copy /y %SCRIPTS_DIR%\execurl.64.d.r5
-copy /y %SCRIPTS_DIR%\execurl.64.d.r6
-copy /y %SCRIPTS_DIR%\execurl.64.d.r7
-sed src\makefile.vc14 -f execurl.64.d.r1 -f execurl.64.d.r2 -f execurl.64.d.r3 -f execurl.64.d.r4 -f execurl.64.d.r5 -f execurl.64.d.r6 -f execurl.64.d.r7 > src\makefile.shib.64.d
diff --git a/dependencies/libcurl-compile32.bat b/dependencies/libcurl-compile32.bat
deleted file mode 100644
index dc106a1..0000000
--- a/dependencies/libcurl-compile32.bat
+++ /dev/null
@@ -1,10 +0,0 @@
-
-cd lib\
-nmake -f Makefile.shib.32 CFG=release-dll-ssl-dll-zlib-dll LIB_NAME_DYN_REL=%LIBCURL_NAME% OPENSSL_PATH=..\..\%OPENSSL_DIR% ZLIB_DIR=..\..\%ZLIB_DIR%
- at if errorlevel 1 goto end
-
-nmake -f Makefile.shib.32.d CFG=debug-dll-ssl-dll-zlib-dll LIB_NAME_DYN_REL=%LIBCURL_NAME% OPENSSL_PATH=..\..\%OPENSSL_DIR% ZLIB_DIR=..\..\%ZLIB_DIR%
- at if errorlevel 1 goto end
-
-cd ..
-:end
diff --git a/dependencies/libcurl-compile64.bat b/dependencies/libcurl-compile64.bat
deleted file mode 100644
index 662f5cf..0000000
--- a/dependencies/libcurl-compile64.bat
+++ /dev/null
@@ -1,9 +0,0 @@
-
-cd lib\
-nmake -f Makefile.shib.64 CFG=release-dll-ssl-dll-zlib-dll LIB_NAME_DYN_REL=%LIBCURL_NAME% OPENSSL_PATH=..\..\%OPENSSL_DIR% MACHINE=x64
- at if errorlevel 1 goto end
-
-nmake -f Makefile.shib.64.d CFG=debug-dll-ssl-dll-zlib-dll LIB_NAME_DYN_REL=%LIBCURL_NAME% OPENSSL_PATH=..\..\%OPENSSL_DIR% ZLIB_DIR=..\..\%ZLIB_DIR% MACHINE=x64
- at if errorlevel 1 goto end
-cd ..
-:end
diff --git a/dependencies/libcurl.bat b/dependencies/libcurl.bat
deleted file mode 100644
index 1e3cc74..0000000
--- a/dependencies/libcurl.bat
+++ /dev/null
@@ -1,41 +0,0 @@
-REM https://wiki.shibboleth.net/confluence/display/OpenSAML/libcurl/
-
-REM Clean
-
-rd/s/q lib\debug-dll-ssl-dll-zlib-dll lib\debug-dll-ssl-dll-zlib-dll.x64 lib\release-dll-ssl-dll-zlib-dll lib\release-dll-ssl-dll-zlib-dll.x64
-
-mkdir lib\debug-dll-ssl-dll-zlib-dll lib\debug-dll-ssl-dll-zlib-dll.x64 lib\release-dll-ssl-dll-zlib-dll lib\release-dll-ssl-dll-zlib-dll.x64
-
-
-REM 32/Release
-
-echo s/^ZLIBLIBSDLL .*$/ZLIBLIBSDLL = Release\\%ZLIB_IMPLIB%.lib/ > curl.32.r1
-sed lib\makefile.vc14 -f curl.32.r1 > lib\makefile.shib.32
-
-REM 32/Debug
-
-echo s/^ZLIBLIBSDLL .*$/ZLIBLIBSDLL = Debug\\%ZLIB_IMPLIB%D.lib/ > curl.32.d.r1
-copy /y %SCRIPTS_DIR%\curl.32.d.r2
-copy /y %SCRIPTS_DIR%\curl.32.d.r3
-sed lib\makefile.vc14 -f curl.32.d.r1 -f curl.32.d.r2 -f curl.32.d.r3 > lib\makefile.shib.32.d
-
-REM 64/Release
-
-echo s/^ZLIBLIBSDLL .*$/ZLIBLIBSDLL = x64\\Release\\%ZLIB_IMPLIB%.lib/ > curl.64.r1
-copy /y %SCRIPTS_DIR%\curl.64.r2
-copy /y %SCRIPTS_DIR%\curl.64.r3
-copy /y %SCRIPTS_DIR%\curl.64.r4
-copy /y %SCRIPTS_DIR%\curl.64.r5
-sed lib\makefile.vc14 -f curl.64.r1 -f curl.64.r2 -f curl.64.r3 -f curl.64.r4 -f curl.64.r5 > lib\makefile.shib.64
-
-REM 64/Debug
-
-echo s/^ZLIBLIBSDLL .*$/ZLIBLIBSDLL = x64\\Debug\\%ZLIB_IMPLIB%D.lib/ > curl.64.d.r1
-copy /y %SCRIPTS_DIR%\curl.64.d.r2
-copy /y %SCRIPTS_DIR%\curl.64.d.r3
-copy /y %SCRIPTS_DIR%\curl.64.d.r4
-copy /y %SCRIPTS_DIR%\curl.64.d.r5
-copy /y %SCRIPTS_DIR%\curl.64.d.r6
-sed lib\makefile.vc14 -f curl.64.d.r1 -f curl.64.d.r2 -f curl.64.d.r3 -f curl.64.d.r4 -f curl.64.d.r5 -f curl.64.d.r6 > lib\makefile.shib.64.d
-
-
diff --git a/dependencies/log4shib-compile.bat b/dependencies/log4shib-compile.bat
index d13f611..af49276 100644
--- a/dependencies/log4shib-compile.bat
+++ b/dependencies/log4shib-compile.bat
@@ -1,11 +1,11 @@
-msbuild /m msvc14\msvc14.sln /p:Configuration=Debug /t:clean /p:Platform=%1%
+msbuild /m msvc%MsVCVersionNum%\msvc%MsVCVersionNum%.sln /p:Configuration=Debug /t:clean /p:Platform=%1%
@if errorlevel 1 goto end
-msbuild /m msvc14\msvc14.sln /p:Configuration=Release /t:clean /p:Platform=%1%
+msbuild /m msvc%MsVCVersionNum%\msvc%MsVCVersionNum%.sln /p:Configuration=Release /t:clean /p:Platform=%1%
@if errorlevel 1 goto end
-msbuild /m msvc14\msvc14.sln /t:Rebuild /p:Configuration=Release /p:Platform=%1%
+msbuild /m msvc%MsVCVersionNum%\msvc%MsVCVersionNum%.sln /t:Rebuild /p:Configuration=Release /p:Platform=%1%
@if errorlevel 1 goto end
-msbuild /m msvc14\msvc14.sln /t:Rebuild /p:Configuration=Debug /p:Platform=%1%
+msbuild /m msvc%MsVCVersionNum%\msvc%MsVCVersionNum%.sln /t:Rebuild /p:Configuration=Debug /p:Platform=%1%
@if errorlevel 1 goto end
:end
\ No newline at end of file
diff --git a/dependencies/openssl1.1-x64.bat b/dependencies/openssl1.1-x64.bat
deleted file mode 100644
index a82fe10..0000000
--- a/dependencies/openssl1.1-x64.bat
+++ /dev/null
@@ -1,40 +0,0 @@
-perl ConfigureD debug-VC-WIN64A --prefix=h:\perforce\devel\x64-dbg\
-nmake distclean
-rd/s/q h:\perforce\devel\x64-dbg h:\perforce\devel\x64
-
-perl ConfigureD debug-VC-WIN64A --prefix=h:\perforce\devel\x64-dbg
-nmake install_sw
-
-nmake distclean
-perl Configure VC-WIN64A --prefix=h:\perforce\devel\x64
-nmake install_sw
-
-goto end
-
-
-rd /s /q out64dll
-rd /s /q out64dll.dbg
-rd /s /q inc64
-rd /s /q inc64.dbg
-perl Configure VC-WIN64A
-nmake
-mkdir out64dll
-copy lib*dll out64dll
-copy lib*lib out64dll
-copy lib*pdb out64dll
-copy apps\openssl.exe out64dll
-copy apps\openssl.pdb out64dll
-xcopy /s include inc64\
-nmake distclean
-perl ConfigureD debug-VC-WIN64A
-nmake
-mkdir out64dll.dbg
-copy lib*dll out64dll.dbg
-copy lib*lib out64dll.dbg
-copy lib*pdb out64dll.dbg
-copy apps\openssl.exe out64dll.dbg
-copy apps\openssl.pdb out64dll.dbg
-xcopy /s include inc64.dbg\
-nmake distclean
-
-:end
\ No newline at end of file
diff --git a/dependencies/openssl1.1-x86.bat b/dependencies/openssl1.1-x86.bat
deleted file mode 100644
index f0840d0..0000000
--- a/dependencies/openssl1.1-x86.bat
+++ /dev/null
@@ -1,10 +0,0 @@
-perl ConfigureD debug-VC-WIN32 --prefix=h:\perforce\devel\x86-dbg\
-nmake distclean
-rd/s/q h:\perforce\devel\x86-dbg h:\perforce\devel\x86
-
-perl ConfigureD debug-VC-WIN32 --prefix=h:\perforce\devel\x86-dbg
-nmake install_sw
-
-nmake distclean
-perl Configure VC-WIN32 --prefix=h:\perforce\devel\x86
-nmake install_sw
diff --git a/dependencies/openssl_I_crypto.sed b/dependencies/openssl_I_crypto.sed
deleted file mode 100644
index a546fd9..0000000
--- a/dependencies/openssl_I_crypto.sed
+++ /dev/null
@@ -1,2 +0,0 @@
-s/out:\$(O_CRYPTO)/out:\$(O_CRYPTO) \/implib:\$(L_CRYPTO)/
-
diff --git a/dependencies/openssl_I_ssl.sed b/dependencies/openssl_I_ssl.sed
deleted file mode 100644
index 48dce10..0000000
--- a/dependencies/openssl_I_ssl.sed
+++ /dev/null
@@ -1,2 +0,0 @@
-s/out:\$(O_SSL)/out:\$(O_SSL) \/implib:\$(L_SSL)/
-
diff --git a/dependencies/openssl_l_cryptoD.sed b/dependencies/openssl_l_cryptoD.sed
deleted file mode 100644
index 305dedd..0000000
--- a/dependencies/openssl_l_cryptoD.sed
+++ /dev/null
@@ -1 +0,0 @@
-s/L_CRYPTO.*lib$/L_CRYPTO= \$(LIB_D)\\\$(CRYPTO)D.lib/
diff --git a/dependencies/openssl_l_sslD.sed b/dependencies/openssl_l_sslD.sed
deleted file mode 100644
index d72f96c..0000000
--- a/dependencies/openssl_l_sslD.sed
+++ /dev/null
@@ -1 +0,0 @@
-s/L_SSL.*lib$/L_SSL= \$(LIB_D)\\\$(SSL)D.lib/
diff --git a/dependencies/xerces-compile.bat b/dependencies/xerces-compile.bat
index 64d570f..01de924 100644
--- a/dependencies/xerces-compile.bat
+++ b/dependencies/xerces-compile.bat
@@ -1,11 +1,11 @@
-msbuild /m projects\Win32\VC14\xerces-all\xerces-all.sln /p:Configuration=Debug /t:all:clean /p:Platform=%1%
+msbuild /m projects\Win32\VC%MsVCVersionNum%\xerces-all\xerces-all.sln /p:Configuration=Debug /t:all:clean /p:Platform=%1%
@if errorlevel 1 goto end
-msbuild /m projects\Win32\VC14\xerces-all\xerces-all.sln /p:Configuration=Release /t:all:clean /p:Platform=%1%
+msbuild /m projects\Win32\VC%MsVCVersionNum%\xerces-all\xerces-all.sln /p:Configuration=Release /t:all:clean /p:Platform=%1%
@if errorlevel 1 goto end
-msbuild /m projects\Win32\VC14\xerces-all\xerces-all.sln /t:all:Rebuild /p:Configuration=Release /p:Platform=%1%
+msbuild /m projects\Win32\VC%MsVCVersionNum%\xerces-all\xerces-all.sln /t:all:Rebuild /p:Configuration=Release /p:Platform=%1%
@if errorlevel 1 goto end
-msbuild /m projects\Win32\VC14\xerces-all\xerces-all.sln /t:all:Rebuild /p:Configuration=Debug /p:Platform=%1%
+msbuild /m projects\Win32\VC%MsVCVersionNum%\xerces-all\xerces-all.sln /t:all:Rebuild /p:Configuration=Debug /p:Platform=%1%
@if errorlevel 1 goto end
:end
\ No newline at end of file
diff --git a/dependencies/zlib.bat b/dependencies/zlib.bat
index d50e68a..fcd1f3b 100644
--- a/dependencies/zlib.bat
+++ b/dependencies/zlib.bat
@@ -9,5 +9,5 @@ echo s/IMPLIB .*$/IMPLIB=%ZLIB_IMPLIB%D.lib/>zlib2.sed
copy /y %SCRIPTS_DIR%\zlib3.sed
copy /y %SCRIPTS_DIR%\zlib4.sed
-sed win32\makefile.msc -f zlib1.sed -f zlib2.sed -f zlib3.sed -f zlib4.sed > win32\makefile.shib > win32\makefile.shib.debug
+sed win32\makefile.msc -f zlib1.sed -f zlib2.sed -f zlib3.sed -f zlib4.sed > win32\makefile.shib.debug
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list