[cpp-msbuild] branch master updated: https://issues.shibboleth.net/jira/browse/SSPCPP-765
Rod Widdowson
rdw at steadingsoftware.com
Thu Jan 18 09:43:11 EST 2018
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=6aab9e0d82e28b612a336ba008867b20f4acf5a4
The following commit(s) were added to refs/heads/master by this push:
new 6aab9e0 https://issues.shibboleth.net/jira/browse/SSPCPP-765
6aab9e0 is described below
commit 6aab9e0d82e28b612a336ba008867b20f4acf5a4
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Thu Jan 18 14:19:25 2018 +0000
https://issues.shibboleth.net/jira/browse/SSPCPP-765
SSPCPP-765 Remove old style buld files.
---
dependencies/doall.bat | 126 -------------------------------------
dependencies/libcurl-new-x64.bat | 7 ---
dependencies/libcurl-new.bat | 9 ---
dependencies/libcurl.bat | 2 -
dependencies/log4shib-compile.bat | 11 ----
dependencies/log4shib.bat | 1 -
dependencies/openssl-compile32.bat | 13 ----
dependencies/openssl-compile64.bat | 12 ----
dependencies/openssl.bat | 16 -----
dependencies/xerces-compile.bat | 14 -----
dependencies/xerces.bat | 12 ----
dependencies/xmlsec-compile.bat | 18 ------
dependencies/xmlsec.bat | 2 -
dependencies/zlib-compile.bat | 31 ---------
dependencies/zlib.bat | 13 ----
15 files changed, 287 deletions(-)
diff --git a/dependencies/doall.bat b/dependencies/doall.bat
deleted file mode 100644
index f1a75b8..0000000
--- a/dependencies/doall.bat
+++ /dev/null
@@ -1,126 +0,0 @@
-cls
-call config.bat
-
-date /t > %ROOT_DIR%build.log
-Time /t >> %ROOT_DIR%build.log
-
-
-cd %ROOT_DIR%\%ZLIB_DIR%
-call %ROOT_DIR%cpp-msbuild\dependencies\zlib.bat
-echo Zlib Config Status: %errorLevel% >> %ROOT_DIR%build.log
- at if errorlevel 1 goto end
-
-CD ..\%LOGSHIB_DIR%
-call %ROOT_DIR%cpp-msbuild\dependencies\log4shib.bat
-echo Log4Shib Config Status: %errorLevel% >> %ROOT_DIR%build.log
- at if errorlevel 1 goto end
-
-cd %ROOT_DIR%\%XERCES_DIR%
-call %ROOT_DIR%cpp-msbuild\dependencies\xerces.bat
-echo Xerces Config Status: %errorLevel% >> %ROOT_DIR%build.log
- at if errorlevel 1 goto end
-
-cd %ROOT_DIR%\%LIBCURL_DIR%
-call %ROOT_DIR%cpp-msbuild\dependencies\libcurl.bat
-echo libcurl Config Status: %errorLevel% >> %ROOT_DIR%build.log
- at if errorlevel 1 goto end
-
-cd %ROOT_DIR%\%OPENSSL_DIR%
-call %ROOT_DIR%cpp-msbuild\dependencies\openssl.bat
-echo OpenSSL Config Status: %errorLevel% >> %ROOT_DIR%build.log
- at if errorlevel 1 goto end
-
-cd %ROOT_DIR%\%XSEC_DIR%
-call %ROOT_DIR%cpp-msbuild\dependencies\xmlsec.bat
-echo XML Security (c) Config Status: %errorLevel% >> %ROOT_DIR%build.log
- at if errorlevel 1 goto end
-
-cd ..
-
-REM
-REM Compile 32 and MsBuild
-REM
-
-call "%VS_DIR%vcvarsall.bat" x86
- at echo on
-
-REM 32 bit compiles and MSBUILD compiles
-
-cd %ROOT_DIR%\%ZLIB_DIR%
-call %ROOT_DIR%cpp-msbuild\dependencies\zlib-compile.bat .
-echo Zlib Compile 32 Status: %errorLevel% >> %ROOT_DIR%build.log
- at if errorlevel 1 goto end
-
-CD %ROOT_DIR%\%LOGSHIB_DIR%
-call %ROOT_DIR%cpp-msbuild\dependencies\log4shib-compile.bat Win32
-echo Log4Shib Compile 32 Status: %errorLevel% >> %ROOT_DIR%build.log
- at if errorlevel 1 goto end
-call %ROOT_DIR%cpp-msbuild\dependencies\log4shib-compile.bat x64
-echo Log4Shib Compile 64 Status: %errorLevel% >> %ROOT_DIR%build.log
- at if errorlevel 1 goto end
-
-cd %ROOT_DIR%\%XERCES_DIR%
-call %ROOT_DIR%cpp-msbuild\dependencies\xerces-compile.bat
-echo Xerces Compile 32 Status: %errorLevel% >> %ROOT_DIR%build.log
- at if errorlevel 1 goto end
-
-cd %ROOT_DIR%\%OPENSSL_DIR%
-call %ROOT_DIR%cpp-msbuild\dependencies\openssl-compile32.bat
-echo OpenSSL Compile 32 Status: %errorLevel% >> %ROOT_DIR%build.log
- at if errorlevel 1 goto end
-
-cd %ROOT_DIR%\%LIBCURL_DIR%
-call %ROOT_DIR%cpp-msbuild\dependencies\libcurl-new.bat
-echo LibCurl Compile 32 Status: %errorLevel% >> %ROOT_DIR%build.log
- at if errorlevel 1 goto end
-
-cd %ROOT_DIR%\%XSEC_DIR%
-call %ROOT_DIR%cpp-msbuild\dependencies\xmlsec-compile.bat Win32
-echo XML Security Compile 32 Status: %errorLevel% >> %ROOT_DIR%build.log
- at if errorlevel 1 goto end
-
-cd ..
-
-REM
-REM Compile X64
-REM
-
-call "%VS_DIR%\vcvarsall.bat" x64
- at echo on
-
- at if errorlevel 1 goto end
-cd %ROOT_DIR%\%ZLIB_DIR%
-
-call %ROOT_DIR%cpp-msbuild\dependencies\zlib-compile.bat x64
-echo Zlib Compile 64 Status: %errorLevel% >> %ROOT_DIR%build.log
- at if errorlevel 1 goto end
-
-cd %ROOT_DIR%\%LOGSHIB_DIR%
-REM Done in x86
-
-cd %ROOT_DIR%\%XERCES_DIR%
-REM Done in x86
-
-cd %ROOT_DIR%\%OPENSSL_DIR%
-call %ROOT_DIR%cpp-msbuild\dependencies\openssl-compile64.bat
-echo Open SSL (64) Compile Status: %errorLevel% >> %ROOT_DIR%build.log
- at if errorlevel 1 goto end
-
-cd %ROOT_DIR%\%LIBCURL_DIR%
-call %ROOT_DIR%cpp-msbuild\dependencies\libcurl-new-x64.bat
-echo Libcurl (64) Compile Status: %errorLevel% >> %ROOT_DIR%build.log
- at if errorlevel 1 goto end
-
-cd %ROOT_DIR%\%XSEC_DIR%
-REM back to 32 bit tools. Who knows why.
-call "%VS_DIR%\vcvarsall.bat" x86
- at echo on
-call %ROOT_DIR%cpp-msbuild\dependencies\xmlsec-compile.bat Win64
-echo XML Security Compile 64 Status: %errorLevel% >> %ROOT_DIR%build.log
- at if errorlevel 1 goto end
-
-
-cd ..
-Time /t >> %ROOT_DIR%build.log
-
-:end
diff --git a/dependencies/libcurl-new-x64.bat b/dependencies/libcurl-new-x64.bat
deleted file mode 100644
index f2ad389..0000000
--- a/dependencies/libcurl-new-x64.bat
+++ /dev/null
@@ -1,7 +0,0 @@
-cd winbuild
-cls
-Nmake /f Makefile.vc mode=dll WITH_DEVEL=%ROOT_DIR%%OPENSSL_DIR%\x64Debug WITH_SSL=dll WITH_ZLIB=dll ENABLE_WINSSL=no VC=%MsVCVersionNum% DEBUG=yes MAKE="NMAKE /e" ZLIB_LFLAGS=/libpath:%ROOT_DIR%%ZLIB_DIR%\x64\DEBUG ZLIB_CFLAGS="/DHAVE_ZLIB_H /DHAVE_ZLIB /DHAVE_LIBZ /I%ROOT_DIR%%ZLIB_DIR%" ZLIB_LIBS=%ZLIB_IMPLIB%D.lib SSL_LIBS="%SSLLibD_space%" BASE_NAME=%LIBCURL_NAME% BASE_NAME_DEBUG=%LIBCURL_NAME%d
-
-nmake /f Makefile.vc mode=dll WITH_DEVEL=%ROOT_DIR%%OPENSSL_DIR%\x64 WITH_SSL=dll WITH_ZLIB=dll ENABLE_WINSSL=no VC=%MsVCVersionNum% DEBUG=no MAKE="NMAKE /e" ZLIB_LFLAGS=/libpath:%ROOT_DIR%%ZLIB_DIR%\x64\Release ZLIB_CFLAGS="/DHAVE_ZLIB_H /DHAVE_ZLIB /DHAVE_LIBZ /I%ROOT_DIR%%ZLIB_DIR%" ZLIB_LIBS=%ZLIB_IMPLIB%.lib SSL_LIBS="%SSLlib_space%" BASE_NAME=%LIBCURL_NAME% BASE_NAME_DEBUG=%LIBCURL_NAME%
-
-:done
\ No newline at end of file
diff --git a/dependencies/libcurl-new.bat b/dependencies/libcurl-new.bat
deleted file mode 100644
index a279864..0000000
--- a/dependencies/libcurl-new.bat
+++ /dev/null
@@ -1,9 +0,0 @@
-cd winbuild
-cls
-Nmake /f Makefile.vc mode=dll WITH_DEVEL=%ROOT_DIR%%OPENSSL_DIR%\x86Debug WITH_SSL=dll WITH_ZLIB=dll ENABLE_WINSSL=no VC=%MsVCVersionNum% DEBUG=yes MAKE="NMAKE /e" ZLIB_LFLAGS=/libpath:%ROOT_DIR%%ZLIB_DIR%\DEBUG ZLIB_CFLAGS="/DHAVE_ZLIB_H /DHAVE_ZLIB /DHAVE_LIBZ /I%ROOT_DIR%%ZLIB_DIR%" ZLIB_LIBS=%ZLIB_IMPLIB%D.lib SSL_LIBS="%SSLLibD_space%" BASE_NAME=%LIBCURL_NAME% BASE_NAME_DEBUG=%LIBCURL_NAME%d
- at if errorlevel 1 goto done
-
-nmake /f Makefile.vc mode=dll WITH_DEVEL=%ROOT_DIR%%OPENSSL_DIR%\x86 WITH_SSL=dll WITH_ZLIB=dll ENABLE_WINSSL=no VC=%MsVCVersionNum% DEBUG=no MAKE="NMAKE /e" ZLIB_LFLAGS=/libpath:%ROOT_DIR%%ZLIB_DIR%\Release ZLIB_CFLAGS="/DHAVE_ZLIB_H /DHAVE_ZLIB /DHAVE_LIBZ /I%ROOT_DIR%%ZLIB_DIR%" ZLIB_LIBS=%ZLIB_IMPLIB%.lib SSL_LIBS="%SSLlib_space%" BASE_NAME=%LIBCURL_NAME% BASE_NAME_DEBUG=%LIBCURL_NAME%d7
-
-
-:done
\ No newline at end of file
diff --git a/dependencies/libcurl.bat b/dependencies/libcurl.bat
deleted file mode 100644
index 2d1aca1..0000000
--- a/dependencies/libcurl.bat
+++ /dev/null
@@ -1,2 +0,0 @@
- at if EXIST builds rd/s/q builds
-
diff --git a/dependencies/log4shib-compile.bat b/dependencies/log4shib-compile.bat
deleted file mode 100644
index af49276..0000000
--- a/dependencies/log4shib-compile.bat
+++ /dev/null
@@ -1,11 +0,0 @@
-msbuild /m msvc%MsVCVersionNum%\msvc%MsVCVersionNum%.sln /p:Configuration=Debug /t:clean /p:Platform=%1%
- at if errorlevel 1 goto end
-msbuild /m msvc%MsVCVersionNum%\msvc%MsVCVersionNum%.sln /p:Configuration=Release /t:clean /p:Platform=%1%
- at if errorlevel 1 goto end
-
-msbuild /m msvc%MsVCVersionNum%\msvc%MsVCVersionNum%.sln /t:Rebuild /p:Configuration=Release /p:Platform=%1%
- at if errorlevel 1 goto end
-msbuild /m msvc%MsVCVersionNum%\msvc%MsVCVersionNum%.sln /t:Rebuild /p:Configuration=Debug /p:Platform=%1%
- at if errorlevel 1 goto end
-
-:end
\ No newline at end of file
diff --git a/dependencies/log4shib.bat b/dependencies/log4shib.bat
deleted file mode 100644
index 335dba6..0000000
--- a/dependencies/log4shib.bat
+++ /dev/null
@@ -1 +0,0 @@
-REM Nothing
diff --git a/dependencies/openssl-compile32.bat b/dependencies/openssl-compile32.bat
deleted file mode 100644
index ce9ff8a..0000000
--- a/dependencies/openssl-compile32.bat
+++ /dev/null
@@ -1,13 +0,0 @@
-if exist makefile nmake distclean
-perl Configure VC-WIN32 --prefix=%ROOT_DIR%\%OPENSSL_DIR%\x86
- at if errorlevel 1 goto done
-nmake install_sw
- at if errorlevel 1 goto done
-
-
-nmake distclean
-perl ConfigureD debug-VC-WIN32 --prefix=%ROOT_DIR%\%OPENSSL_DIR%\x86Debug
- at if errorlevel 1 goto done
-nmake install_sw
-
-:done
\ No newline at end of file
diff --git a/dependencies/openssl-compile64.bat b/dependencies/openssl-compile64.bat
deleted file mode 100644
index 302d01b..0000000
--- a/dependencies/openssl-compile64.bat
+++ /dev/null
@@ -1,12 +0,0 @@
-if exist makefile nmake distclean
-perl Configure VC-WIN64A --prefix=%ROOT_DIR%\%OPENSSL_DIR%\x64
- at if errorlevel 1 goto done
-nmake install_sw
- at if errorlevel 1 goto done
-
-nmake distclean
-perl ConfigureD debug-VC-WIN64A --prefix=%ROOT_DIR%\%OPENSSL_DIR%\x64Debug
- at if errorlevel 1 goto done
-nmake install_sw
-
-:done
\ No newline at end of file
diff --git a/dependencies/openssl.bat b/dependencies/openssl.bat
deleted file mode 100644
index ff42f7e..0000000
--- a/dependencies/openssl.bat
+++ /dev/null
@@ -1,16 +0,0 @@
- at if NOT EXIST Configure (
- Echo Could not find Configure. Check this is an OpenSSL Build >> %ROOT_DIR%build.log
- exit /b 1
-)
-
- at if NOT EXIST ConfigureD (
- Echo Could not find ConfigureD. Apply customizations as per https://wiki.shibboleth.net/confluence/display/OpenSAML/OpenSSL >> %ROOT_DIR%build.log
- exit /b 1
-)
-
- at if EXIST x64 rd/s/q x64
- at if EXIST x64Debug rd/s/q x64Debug
- at if EXIST x86 rd/s/q x86
- at if EXIST x86Debug rd/s/q x86Debug
-
-exit /b 0
\ No newline at end of file
diff --git a/dependencies/xerces-compile.bat b/dependencies/xerces-compile.bat
deleted file mode 100644
index 6a740f8..0000000
--- a/dependencies/xerces-compile.bat
+++ /dev/null
@@ -1,14 +0,0 @@
-cd /d %ROOT_DIR%%XERCES_DIR%
-cd buildx86\%MsVCVersion%
-cmake --build . --config Debug --clean-first --target install
- at if errorlevel 1 goto end
-cmake --build . --config Release --clean-first --target install
- at if errorlevel 1 goto end
-cd ..\..\buildx64\%MsVCVersion%
-
-cmake --build . --config Debug --clean-first --target install
- at if errorlevel 1 goto end
-cmake --build . --config Release --clean-first --target install
- at if errorlevel 1 goto end
-
-:end
\ No newline at end of file
diff --git a/dependencies/xerces.bat b/dependencies/xerces.bat
deleted file mode 100644
index e0e7913..0000000
--- a/dependencies/xerces.bat
+++ /dev/null
@@ -1,12 +0,0 @@
-cd /d %ROOT_DIR%%XERCES_DIR%
-rd/s/q buildx86\%MsVCVersion% buildx64\%MsVCVersion% install32\%MsVCVersion% install64\%MsVCVersion%
-mkdir buildx86\%MsVCVersion%
-cd buildx86\%MsVCVersion%
-set CXXFLAGS=/MP
-cmake -G "Visual Studio 15 2017" -DCMAKE_INSTALL_PREFIX=%ROOT_DIR%%XERCES_DIR%\install32\%MsVCVersion% ..\..
-cd ..\..
-mkdir buildx64\%MsVCVersion%
-cd buildx64\%MsVCVersion%
-cmake -G "Visual Studio 15 2017 Win64" -DCMAKE_INSTALL_PREFIX=%ROOT_DIR%%XERCES_DIR%\install64\%MsVCVersion% ..\..
-cd ..\..
-set CXXFLAGS=
diff --git a/dependencies/xmlsec-compile.bat b/dependencies/xmlsec-compile.bat
deleted file mode 100644
index 85fb1aa..0000000
--- a/dependencies/xmlsec-compile.bat
+++ /dev/null
@@ -1,18 +0,0 @@
-rem xmlsec-compile Win64
-rem xmlsec-compile Win32
-
-set ForceImportBeforeCppTargets=%SCRIPTS_DIR%\xsec.props
-msbuild /m projects\VC%MsVCVersionNum%.0\xsec\xsec.sln /p:Configuration="Debug Minimal" /m /t:clean /p:Platform=%1%
- at if errorlevel 1 goto end
-msbuild /m projects\VC%MsVCVersionNum%.0\xsec\xsec.sln /p:Configuration="Release Minimal" /m /t:clean /p:Platform=%1%
- at if errorlevel 1 goto end
-
-msbuild /m projects\VC%MsVCVersionNum%.0\xsec\xsec.sln /p:Configuration="Debug Minimal" /m /t:Build /p:Platform=%1%
- at if errorlevel 1 goto end
-msbuild /m projects\VC%MsVCVersionNum%.0\xsec\xsec.sln /p:Configuration="Release Minimal" /m /t:Build /p:Platform=%1%
- at if errorlevel 1 goto end
-
-
-:end
-
-set ForceImportBeforeCppTargets=
diff --git a/dependencies/xmlsec.bat b/dependencies/xmlsec.bat
deleted file mode 100644
index 149eb58..0000000
--- a/dependencies/xmlsec.bat
+++ /dev/null
@@ -1,2 +0,0 @@
-REM Nothing
-
diff --git a/dependencies/zlib-compile.bat b/dependencies/zlib-compile.bat
deleted file mode 100644
index 9cbd43b..0000000
--- a/dependencies/zlib-compile.bat
+++ /dev/null
@@ -1,31 +0,0 @@
-rem USE(x86) zlib-compile.bat .
-rem USE(x64) zlib-compile.bat x64
-rem clean and create target dirs
-
-rd/s/q %1%\Release %1%\Debug
-mkdir %1%\Release
-mkdir %1%\Debug
-
-rem Release: Clean. Make. Clean
-
-nmake /f win32\Makefile.shib clean
- at if errorlevel 1 goto end
-nmake /f win32\Makefile.shib
- at if errorlevel 1 goto end
-copy %ZLIB_SHAREDLIB%.dll %1%\Release
-copy %ZLIB_IMPLIB%.* %1%\Release
-nmake /f win32\Makefile.shib clean
- at if errorlevel 1 goto end
-
-rem Debug: Clean. Make. Clean
-
-
-nmake /f win32\Makefile.shib.debug clean
- at if errorlevel 1 goto end
-nmake /f win32\Makefile.shib.debug
- at if errorlevel 1 goto end
-copy %ZLIB_SHAREDLIB%D.dll %1%\Debug
-copy %ZLIB_IMPLIB%D.* %1%\Debug
-nmake /f win32\Makefile.shib.debug clean
-
-:end
\ No newline at end of file
diff --git a/dependencies/zlib.bat b/dependencies/zlib.bat
deleted file mode 100644
index fcd1f3b..0000000
--- a/dependencies/zlib.bat
+++ /dev/null
@@ -1,13 +0,0 @@
-rd/s/q Release x64 debug
-
-echo s/SHAREDLIB =.*$/SHAREDLIB=%ZLIB_SHAREDLIB%.dll/>zlib1.sed
-echo s/IMPLIB .*$/IMPLIB=%ZLIB_IMPLIB%.lib/>zlib2.sed
-sed win32\makefile.msc -f zlib1.sed -f zlib2.sed > win32\makefile.shib
-
-echo s/SHAREDLIB =.*$/SHAREDLIB=%ZLIB_SHAREDLIB%D.dll/>zlib1.sed
-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.debug
-
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list