[cpp-msbuild] branch master updated: CPPXT-106 Config changes for dependency build of latest versions against VS2017
Rod Widdowson
rdw at steadingsoftware.com
Tue Aug 29 05:20:18 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=330203cceaa9fb77f569fdcbe65638ef124a5c80
The following commit(s) were added to refs/heads/master by this push:
new 330203c CPPXT-106 Config changes for dependency build of latest versions against VS2017
330203c is described below
commit 330203cceaa9fb77f569fdcbe65638ef124a5c80
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Tue Aug 29 10:17:01 2017 +0100
CPPXT-106 Config changes for dependency build of latest versions against VS2017
https://issues.shibboleth.net/jira/projects/CPPXT/issues/CPPXT-106
---
dependencies/config.bat | 22 ++++++++--------------
dependencies/doall.bat | 23 +++++++----------------
dependencies/xerces.bat | 4 ++--
3 files changed, 17 insertions(+), 32 deletions(-)
diff --git a/dependencies/config.bat b/dependencies/config.bat
index 6b12716..a19f073 100644
--- a/dependencies/config.bat
+++ b/dependencies/config.bat
@@ -1,37 +1,31 @@
rem GOTTA HAVE TRAILING SLASH
-set ROOT_DIR=H:\Perforce\devel\
+set ROOT_DIR=H:\Perforce\VS2017\
set SCRIPTS_DIR=%ROOT_DIR%cpp-msbuild\dependencies
-set VS14_DIR=c:\Program Files (x86)\Microsoft Visual Studio 14.0\
+set VS_DIR=d:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Auxiliary\Build\
-set ZLIB_DIR=zlib-1.2.8
+set ZLIB_DIR=zlib-1.2.11
set ZLIB_IMPLIB=zlib1
set ZLIB_SHAREDLIB=zlib1_2
set LOGSHIB_DIR=log4shib-1.0.10
-set XERCES_DIR=xerces-c-3.1.3
+set XERCES_DIR=xerces-c-3.2.0
-set OPENSSL_DIR=openssl-1.1
-
-rem set SSLLib=ssleay32.lib;libeay32.lib
-rem set SSLLib_space=ssleay32.lib libeay32.lib
-rem set SSLLibD=ssleay32D.lib;libeay32D.lib
-rem set SSLLibD_space=ssleay32D.lib libeay32D.lib
+set OPENSSL_DIR=openssl-1.1.0f
set SSLLib=libcrypto.lib;libssl.lib
set SSLLib_space=libcrypto.lib libssl.lib
-
set SSLLibD=libcrypto.lib;libssl.lib
set SSLLibD_space=libcrypto.lib libssl.lib
-set LIBCURL_DIR=curl-7.49.99
+set LIBCURL_DIR=curl-7.55.1
set LIBCURL_NAME=libcurl5
-set XSEC_DIR=xml-security-c-1.7.99-X
+set XSEC_DIR=xml-security-c-1.8.0
-SET MsVCVersionNum=10
+SET MsVCVersionNum=15
set MsVCVersion=VC%MsVCVersionNum%
diff --git a/dependencies/doall.bat b/dependencies/doall.bat
index 7f2397a..786de06 100644
--- a/dependencies/doall.bat
+++ b/dependencies/doall.bat
@@ -24,13 +24,6 @@ call ..\openssl.bat
echo OpenSSL Config Status: %errorLevel% >> ..\build.log
@if errorlevel 1 goto end
-cd ..\%LIBCURL_DIR%
-call ..\libcurl.bat
-echo libcurl Config Status: %errorLevel% >> ..\build.log
-call ..\execurl.bat
-echo execurl Config Status: %errorLevel% >> ..\build.log
- at if errorlevel 1 goto end
-
cd ..\%XSEC_DIR%
call ..\xmlsec.bat
echo XML Security (c) Config Status: %errorLevel% >> ..\build.log
@@ -42,7 +35,7 @@ REM
REM Compile 32 and MsBuild
REM
-call "%VS14_DIR%\VC\vcvarsall.bat" x86
+call "%VS_DIR%vcvarsall.bat" x86
@echo on
REM 32 bit compiles and MSBUILD compiles
@@ -74,10 +67,10 @@ echo OpenSSL Compile 32 Status: %errorLevel% >> ..\build.log
@if errorlevel 1 goto end
cd ..\%LIBCURL_DIR%
-call ..\libcurl-compile32.bat
+call ..\libcurl-new.bat
echo LibCurl Compile 32 Status: %errorLevel% >> ..\build.log
-call ..\execurl-compile32.bat
-echo ExeCurl Compile 32 Status: %errorLevel% >> ..\build.log
+rem call ..\execurl-compile32.bat
+rem echo ExeCurl Compile 32 Status: %errorLevel% >> ..\build.log
@if errorlevel 1 goto end
cd ..\%XSEC_DIR%
@@ -91,7 +84,7 @@ REM
REM Compile X64
REM
-call "%VS14_DIR%\VC\vcvarsall.bat" x64
+call "%VS_DIR%\vcvarsall.bat" x64
@echo on
@if errorlevel 1 goto end
@@ -113,15 +106,13 @@ echo Open SSL (64) Compile Status: %errorLevel% >> ..\build.log
@if errorlevel 1 goto end
cd ..\%LIBCURL_DIR%
-call ..\libcurl-compile64.bat
+call ..\libcurl-new-x64.bat
echo Libcurl (64) Compile Status: %errorLevel% >> ..\build.log
-call ..\execurl-compile64.bat
-echo Execurl (64) Compile Status: %errorLevel% >> ..\build.log
@if errorlevel 1 goto end
cd ..\%XSEC_DIR%
REM back to 32 bit tools. Who knows why.
-call "%VS14_DIR%\VC\vcvarsall.bat" x86
+call "%VS_DIR%\vcvarsall.bat" x86
@echo on
call ..\xmlsec-compile.bat Win64
echo XML Security Compile 64 Status: %errorLevel% >> ..\build.log
diff --git a/dependencies/xerces.bat b/dependencies/xerces.bat
index e2a8711..293e1a2 100644
--- a/dependencies/xerces.bat
+++ b/dependencies/xerces.bat
@@ -2,11 +2,11 @@ cd /d %ROOT_DIR%%XERCES_DIR%
rd/s/q buildx86\%MsVCVersion% buildx64\%MsVCVersion% install32\%MsVCVersion% install64\%MsVCVersion%
mkdir buildx86\%MsVCVersion%
cd buildx86\%MsVCVersion%
-cmake -G "Visual Studio 10 2010" -DCMAKE_CXX_FLAGS=/MP -DCMAKE_INSTALL_PREFIX=%ROOT_DIR%%XERCES_DIR%\install32\%MsVCVersion% ..\..
+cmake -G "Visual Studio 15 2017" -DCMAKE_CXX_FLAGS=/MP -DCMAKE_INSTALL_PREFIX=%ROOT_DIR%%XERCES_DIR%\install32\%MsVCVersion% ..\..
cd ..\..
mkdir buildx64\%MsVCVersion%
cd buildx64\%MsVCVersion%
-cmake -G "Visual Studio 10 2010 Win64" -DCMAKE_CXX_FLAGS=/MP -DCMAKE_INSTALL_PREFIX=%ROOT_DIR%%XERCES_DIR%\install64\%MsVCVersion% ..\..
+cmake -G "Visual Studio 15 2017 Win64" -DCMAKE_CXX_FLAGS=/MP -DCMAKE_INSTALL_PREFIX=%ROOT_DIR%%XERCES_DIR%\install64\%MsVCVersion% ..\..
cd ..\..
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list