[cpp-msbuild] branch master updated: Dependency build: General refresh
Rod Widdowson
rdw at steadingsoftware.com
Sun Sep 3 10:43:08 EDT 2017
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=3fe6adea6ac57d8e621e098f362b986baeefc110
The following commit(s) were added to refs/heads/master by this push:
new 3fe6ade Dependency build: General refresh
3fe6ade is described below
commit 3fe6adea6ac57d8e621e098f362b986baeefc110
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Thu Aug 31 16:30:15 2017 +0100
Dependency build: General refresh
Tidy up config.bat
Add new OpenSSL build commands for "new way"
Cleanup curl during initial setup.
Better error sensing in the curl build
Turn of duplication in the xerces build
Get into the correct directory for the cUrl build
---
dependencies/config.bat | 12 +++-
dependencies/doall.bat | 115 +++++++++++++++++++------------------
dependencies/libcurl-new-x64.bat | 2 +-
dependencies/libcurl-new.bat | 4 +-
dependencies/libcurl.bat | 2 +
dependencies/openssl-compile32.bat | 13 +++++
dependencies/openssl-compile64.bat | 12 ++++
dependencies/openssl.bat | 12 ++++
8 files changed, 110 insertions(+), 62 deletions(-)
diff --git a/dependencies/config.bat b/dependencies/config.bat
index a19f073..7deeddb 100644
--- a/dependencies/config.bat
+++ b/dependencies/config.bat
@@ -2,7 +2,6 @@ rem GOTTA HAVE TRAILING SLASH
set ROOT_DIR=H:\Perforce\VS2017\
-set SCRIPTS_DIR=%ROOT_DIR%cpp-msbuild\dependencies
set VS_DIR=d:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Auxiliary\Build\
set ZLIB_DIR=zlib-1.2.11
@@ -26,10 +25,17 @@ set LIBCURL_NAME=libcurl5
set XSEC_DIR=xml-security-c-1.8.0
SET MsVCVersionNum=15
-set MsVCVersion=VC%MsVCVersionNum%
+REM
+REM Should not need to change anything
+REM
+set MsVCVersion=VC%MsVCVersionNum%
set ForceImportBeforeCppTargets=%SCRIPTS_DIR%\xsec.props
+set SCRIPTS_DIR=%ROOT_DIR%cpp-msbuild\dependencies
+
-set path=%PATH%;%ROOT_DIR%%OPENSSL_DIR%\out32dll.dbg;%ROOT_DIR%%XERCES_DIR%\BUILD\WIN32\VC10\DEBUG;%ROOT_DIR%%XSEC_DIR%\Build\Win32\VC10\Debug No Xalan;%ROOT_DIR%%libcurl_dir%\lib\debug-dll-ssl-dll-zlib-dll;%ROOT_DIR%%LOGSHIB_DIR%\msvc10\Debug;%ROOT_DIR%%ZLIB_DIR%\Debug
+rem
+rem The following is only needed if you want to run things.
+rem set path=%PATH%;%ROOT_DIR%%OPENSSL_DIR%\out32dll.dbg;%ROOT_DIR%%XERCES_DIR%\BUILD\WIN32\VC10\DEBUG;%ROOT_DIR%%XSEC_DIR%\Build\Win32\VC10\Debug No Xalan;%ROOT_DIR%%libcurl_dir%\lib\debug-dll-ssl-dll-zlib-dll;%ROOT_DIR%%LOGSHIB_DIR%\msvc10\Debug;%ROOT_DIR%%ZLIB_DIR%\Debug
diff --git a/dependencies/doall.bat b/dependencies/doall.bat
index 786de06..f1a75b8 100644
--- a/dependencies/doall.bat
+++ b/dependencies/doall.bat
@@ -1,32 +1,38 @@
cls
-date /t > build.log
-Time /t >> build.log
-
call config.bat
-cd %ZLIB_DIR%
-call ..\zlib.bat
-echo Zlib Config Status: %errorLevel% >> ..\build.log
+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
@if errorlevel 1 goto end
CD ..\%LOGSHIB_DIR%
-call ..\log4shib.bat
-echo Log4Shib Config Status: %errorLevel% >> ..\build.log
+call %ROOT_DIR%cpp-msbuild\dependencies\log4shib.bat
+echo Log4Shib Config Status: %errorLevel% >> %ROOT_DIR%build.log
@if errorlevel 1 goto end
-cd ..\%XERCES_DIR%
-call ..\xerces.bat
-echo Xerces Config Status: %errorLevel% >> ..\build.log
+cd %ROOT_DIR%\%XERCES_DIR%
+call %ROOT_DIR%cpp-msbuild\dependencies\xerces.bat
+echo Xerces Config Status: %errorLevel% >> %ROOT_DIR%build.log
@if errorlevel 1 goto end
-cd ..\%OPENSSL_DIR%
-call ..\openssl.bat
-echo OpenSSL Config Status: %errorLevel% >> ..\build.log
+cd %ROOT_DIR%\%LIBCURL_DIR%
+call %ROOT_DIR%cpp-msbuild\dependencies\libcurl.bat
+echo libcurl Config Status: %errorLevel% >> %ROOT_DIR%build.log
@if errorlevel 1 goto end
-cd ..\%XSEC_DIR%
-call ..\xmlsec.bat
-echo XML Security (c) Config Status: %errorLevel% >> ..\build.log
+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
@if errorlevel 1 goto end
cd ..
@@ -40,42 +46,37 @@ call "%VS_DIR%vcvarsall.bat" x86
REM 32 bit compiles and MSBUILD compiles
-cd %ZLIB_DIR%
-call ..\zlib-compile.bat .
-echo Zlib Compile 32 Status: %errorLevel% >> ..\build.log
+cd %ROOT_DIR%\%ZLIB_DIR%
+call %ROOT_DIR%cpp-msbuild\dependencies\zlib-compile.bat .
+echo Zlib Compile 32 Status: %errorLevel% >> %ROOT_DIR%build.log
@if errorlevel 1 goto end
-CD ..\%LOGSHIB_DIR%
-call ..\log4shib-compile.bat Win32
-echo Log4Shib Compile 32 Status: %errorLevel% >> ..\build.log
+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
@if errorlevel 1 goto end
-call ..\log4shib-compile.bat x64
-echo Log4Shib Compile 64 Status: %errorLevel% >> ..\build.log
+call %ROOT_DIR%cpp-msbuild\dependencies\log4shib-compile.bat x64
+echo Log4Shib Compile 64 Status: %errorLevel% >> %ROOT_DIR%build.log
@if errorlevel 1 goto end
-cd ..\%XERCES_DIR%
-call ..\xerces-compile.bat Win32
-echo Xerces Compile 32 Status: %errorLevel% >> ..\build.log
- at if errorlevel 1 goto end
-call ..\xerces-compile.bat x64
-echo Xerces Compile 64 Status: %errorLevel% >> ..\build.log
+cd %ROOT_DIR%\%XERCES_DIR%
+call %ROOT_DIR%cpp-msbuild\dependencies\xerces-compile.bat
+echo Xerces Compile 32 Status: %errorLevel% >> %ROOT_DIR%build.log
@if errorlevel 1 goto end
-cd ..\%OPENSSL_DIR%
-call ..\openssl-compile32.bat
-echo OpenSSL Compile 32 Status: %errorLevel% >> ..\build.log
+cd %ROOT_DIR%\%OPENSSL_DIR%
+call %ROOT_DIR%cpp-msbuild\dependencies\openssl-compile32.bat
+echo OpenSSL Compile 32 Status: %errorLevel% >> %ROOT_DIR%build.log
@if errorlevel 1 goto end
-cd ..\%LIBCURL_DIR%
-call ..\libcurl-new.bat
-echo LibCurl Compile 32 Status: %errorLevel% >> ..\build.log
-rem call ..\execurl-compile32.bat
-rem echo ExeCurl Compile 32 Status: %errorLevel% >> ..\build.log
+cd %ROOT_DIR%\%LIBCURL_DIR%
+call %ROOT_DIR%cpp-msbuild\dependencies\libcurl-new.bat
+echo LibCurl Compile 32 Status: %errorLevel% >> %ROOT_DIR%build.log
@if errorlevel 1 goto end
-cd ..\%XSEC_DIR%
-call ..\xmlsec-compile.bat Win32
-echo XML Security Compile 32 Status: %errorLevel% >> ..\build.log
+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
@if errorlevel 1 goto end
cd ..
@@ -88,38 +89,38 @@ call "%VS_DIR%\vcvarsall.bat" x64
@echo on
@if errorlevel 1 goto end
-cd %ZLIB_DIR%
+cd %ROOT_DIR%\%ZLIB_DIR%
-call ..\zlib-compile.bat x64
-echo Zlib Compile 64 Status: %errorLevel% >> ..\build.log
+call %ROOT_DIR%cpp-msbuild\dependencies\zlib-compile.bat x64
+echo Zlib Compile 64 Status: %errorLevel% >> %ROOT_DIR%build.log
@if errorlevel 1 goto end
-cd ..\%LOGSHIB_DIR%
+cd %ROOT_DIR%\%LOGSHIB_DIR%
REM Done in x86
-cd ..\%XERCES_DIR%
+cd %ROOT_DIR%\%XERCES_DIR%
REM Done in x86
-cd ..\%OPENSSL_DIR%
-call ..\openssl-compile64.bat
-echo Open SSL (64) Compile Status: %errorLevel% >> ..\build.log
+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
@if errorlevel 1 goto end
-cd ..\%LIBCURL_DIR%
-call ..\libcurl-new-x64.bat
-echo Libcurl (64) Compile Status: %errorLevel% >> ..\build.log
+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
@if errorlevel 1 goto end
-cd ..\%XSEC_DIR%
+cd %ROOT_DIR%\%XSEC_DIR%
REM back to 32 bit tools. Who knows why.
call "%VS_DIR%\vcvarsall.bat" x86
@echo on
-call ..\xmlsec-compile.bat Win64
-echo XML Security Compile 64 Status: %errorLevel% >> ..\build.log
+call %ROOT_DIR%cpp-msbuild\dependencies\xmlsec-compile.bat Win64
+echo XML Security Compile 64 Status: %errorLevel% >> %ROOT_DIR%build.log
@if errorlevel 1 goto end
cd ..
-Time /t >> build.log
+Time /t >> %ROOT_DIR%build.log
:end
diff --git a/dependencies/libcurl-new-x64.bat b/dependencies/libcurl-new-x64.bat
index 6c95899..f2ad389 100644
--- a/dependencies/libcurl-new-x64.bat
+++ b/dependencies/libcurl-new-x64.bat
@@ -1,4 +1,4 @@
-nmake clean
+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
diff --git a/dependencies/libcurl-new.bat b/dependencies/libcurl-new.bat
index 7f90fcb..a279864 100644
--- a/dependencies/libcurl-new.bat
+++ b/dependencies/libcurl-new.bat
@@ -1,7 +1,9 @@
-nmake clean
+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
new file mode 100644
index 0000000..a3b4308
--- /dev/null
+++ b/dependencies/libcurl.bat
@@ -0,0 +1,2 @@
+rd/s/q builds
+
diff --git a/dependencies/openssl-compile32.bat b/dependencies/openssl-compile32.bat
new file mode 100644
index 0000000..ce9ff8a
--- /dev/null
+++ b/dependencies/openssl-compile32.bat
@@ -0,0 +1,13 @@
+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
new file mode 100644
index 0000000..302d01b
--- /dev/null
+++ b/dependencies/openssl-compile64.bat
@@ -0,0 +1,12 @@
+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
new file mode 100644
index 0000000..618910c
--- /dev/null
+++ b/dependencies/openssl.bat
@@ -0,0 +1,12 @@
+
+ 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 custimzations as per https://wiki.shibboleth.net/confluence/display/OpenSAML/OpenSSL >> %ROOT_DIR%build.log
+ exit /b 1
+)
+
+exit /b 0
\ No newline at end of file
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list