[cpp-msbuild] 01/02: Misc changes for dependency build

Rod Widdowson rdw at steadingsoftware.com
Wed Dec 7 05:17:16 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=0e6a65066e4f9c08faec22f1960eafef48a0a711

commit 0e6a65066e4f9c08faec22f1960eafef48a0a711
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Mon Dec 5 12:03:32 2016 +0000

    Misc changes for dependency build
    
    - Make the "new" libcurl build batch file more driven from the config
      environment.  This involves further shenanigans because of the OpenSSl
      lib name changes
    - New 64 batch file for libcurl  build
    - Modify the XML Security build for the new OpenSSL paths, Also only
      build xsec_lib (because of dependency issues)
---
 dependencies/config.bat          | 21 ++++++++++++++++++---
 dependencies/libcurl-new-x64.bat |  7 +++++++
 dependencies/libcurl-new.bat     |  6 ++----
 dependencies/xmlsec-compile.bat  | 14 +++++++-------
 dependencies/xsec.props          | 25 ++++++++++++-------------
 5 files changed, 46 insertions(+), 27 deletions(-)

diff --git a/dependencies/config.bat b/dependencies/config.bat
index aacaf95..ee90d12 100644
--- a/dependencies/config.bat
+++ b/dependencies/config.bat
@@ -1,4 +1,9 @@
-set SCRIPTS_DIR=H:\Perforce\devel\cpp-msbuild\dependencies
+rem GOTTA HAVE TRAILING SLASH
+
+set ROOT_DIR=H:\Perforce\devel\
+
+
+set SCRIPTS_DIR=%ROOT_DIR%cpp-msbuild\dependencies
 set VS14_DIR=c:\Program Files (x86)\Microsoft Visual Studio 14.0\
 
 set ZLIB_DIR=zlib-1.2.8
@@ -12,14 +17,24 @@ set XERCES_DIR=xerces-c-3.1.3
 set OPENSSL_DIR=openssl-1.1
 set OPENSSL_NAME=1_0_2_4
 
+rem set SSLLib=ssleay32.lib;libeay32.lib
+rem set SSLLibD=ssleay32D.lib;libeay32D.lib
+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.1
 set LIBCURL_NAME=libcurl5
 
 set XSEC_DIR=xml-security-c-1.7.99-X
 
-set MsVCVersion=VC10
+SET MsVCVersionNum=10
+set MsVCVersion=VC%MsVCVersionNum%
+
 
 set ForceImportBeforeCppTargets=%SCRIPTS_DIR%\xsec.props
 
-set path=%PATH%;H:\Perforce\devel\%OPENSSL_DIR%\out32dll.dbg;H:\Perforce\devel\%XERCES_DIR%\BUILD\WIN32\VC10\DEBUG;H:\Perforce\devel\%XSEC_DIR%\Build\Win32\VC10\Debug No Xalan;H:\Perforce\devel\%libcurl_dir%\lib\debug-dll-ssl-dll-zlib-dll;H:\Perforce\devel\%LOGSHIB_DIR%\msvc10\Debug;H:\Perforce\devel\%ZLIB_DIR%\Debug
+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/libcurl-new-x64.bat b/dependencies/libcurl-new-x64.bat
new file mode 100644
index 0000000..ca6cd91
--- /dev/null
+++ b/dependencies/libcurl-new-x64.bat
@@ -0,0 +1,7 @@
+nmake clean
+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%d
+
+:done
\ No newline at end of file
diff --git a/dependencies/libcurl-new.bat b/dependencies/libcurl-new.bat
index 987d6d7..7f90fcb 100644
--- a/dependencies/libcurl-new.bat
+++ b/dependencies/libcurl-new.bat
@@ -1,9 +1,7 @@
 nmake clean
 cls
-nmake /f Makefile.vc mode=dll WITH_DEVEL=H:\Perforce\devel\x86-dbg WITH_SSL=dll WITH_ZLIB=dll ENABLE_WINSSL=no VC=10 DEBUG=yes MAKE="NMAKE /e" ZLIB_LFLAGS=/libpath:H:\Perforce\devel\zlib-1.2.8\DEBUG ZLIB_CFLAGS="/DHAVE_ZLIB_H /DHAVE_ZLIB /DHAVE_LIBZ /IH:\Perforce\devel\zlib-1.2.8" ZLIB_LIBS=zlib1D.lib SSL_LIBS="libssl.lib libcrypto.lib" BASE_NAME=LIBCURL5 BASE_NAME_DEBUG=libcurl5d_imp
+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
 
-goto done
-
-nmake /f Makefile.vc mode=dll WITH_DEVEL=H:\Perforce\devel\x86 WITH_SSL=dll WITH_ZLIB=dll ENABLE_WINSSL=no VC=10 DEBUG=no MAKE="NMAKE /e" ZLIB_LFLAGS=/libpath:H:\Perforce\devel\zlib-1.2.8\Release ZLIB_CFLAGS="/DHAVE_ZLIB_H /DHAVE_ZLIB /DHAVE_LIBZ /IH:\Perforce\devel\zlib-1.2.8" ZLIB_LIBS=zlib1.lib SSL_LIBS="libssl.lib libcrypto.lib" BASE_NAME=LIBCURL5 BASE_NAME_DEBUG=libcurl5d_imp
+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/xmlsec-compile.bat b/dependencies/xmlsec-compile.bat
index 906bf18..d7206ce 100644
--- a/dependencies/xmlsec-compile.bat
+++ b/dependencies/xmlsec-compile.bat
@@ -1,15 +1,15 @@
 set ForceImportBeforeCppTargets=%SCRIPTS_DIR%\xsec.props
-msbuild /m projects\VC14.0\xsec\xsec.sln /p:Configuration="Debug No Xalan"     /t:clean /p:Platform=%1%
+msbuild /m projects\VC%MsVCVersionNum%.0\xsec\xsec.sln /p:Configuration="Debug No Xalan"     /t:clean /p:Platform=%1%
 @if errorlevel 1 goto end
-msbuild /m projects\VC14.0\xsec\xsec.sln /p:Configuration="Release No Xalan"   /t:clean /p:Platform=%1%
+msbuild /m projects\VC%MsVCVersionNum%.0\xsec\xsec.sln /p:Configuration="Release No Xalan"   /t:clean /p:Platform=%1%
 @if errorlevel 1 goto end
 
-
-msbuild /m projects\VC14.0\xsec\xsec.sln /p:Configuration="Debug No Xalan"     /t:Rebuild /p:Platform=%1%
+msbuild /m projects\VC%MsVCVersionNum%.0\xsec\xsec.sln /p:Configuration="Debug No Xalan"     /t:xsec_lib:Rebuild /p:Platform=%1%
 @if errorlevel 1 goto end
-msbuild /m projects\VC14.0\xsec\xsec.sln /p:Configuration="Release No Xalan"   /t:Rebuild /p:Platform=%1%
+msbuild /m projects\VC%MsVCVersionNum%.0\xsec\xsec.sln /p:Configuration="Release No Xalan"   /t:xsec_lib:Rebuild /p:Platform=%1%
 @if errorlevel 1 goto end
 
-set ForceImportBeforeCppTargets=
 
-:end
\ No newline at end of file
+:end
+
+set ForceImportBeforeCppTargets=
diff --git a/dependencies/xsec.props b/dependencies/xsec.props
index 9aa4c77..ae2be11 100644
--- a/dependencies/xsec.props
+++ b/dependencies/xsec.props
@@ -1,47 +1,46 @@
 <?xml version="1.0" encoding="utf-8"?> 
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug No Xalan|Win32'">
     <ClCompile>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);XSEC_HAVE_OPENSSL=1;SUPPRESS_XSEC_HAVE_WINCAPI=1</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(SolutionDir)\..\..\..\..\$(OpenSSl_dir)\inc32.dbg;$(SolutionDir)\..\..\..\..\$(Xerces_dir)\src</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(SolutionDir)\..\..\..\..\$(OpenSSl_dir)\inc32.dbg;$(SolutionDir)\..\..\..\..\$(OpenSSl_dir)\x86Debug\include;$(SolutionDir)\..\..\..\..\$(Xerces_dir)\src</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories);$(SolutionDir)..\..\..\..\$(Xerces_dir)\Build\Win32\$(MsVCVersion)\Debug;$(SolutionDir)..\..\..\..\$(Openssl_dir)\out32dll.dbg;</AdditionalLibraryDirectories>
-      <AdditionalDependencies>%(AdditionalDependencies);libeay32D.lib;ssleay32D.lib</AdditionalDependencies>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories);$(SolutionDir)..\..\..\..\$(Xerces_dir)\Build\Win32\$(MsVCVersion)\Debug;$(SolutionDir)..\..\..\..\$(Openssl_dir)\out32dll.dbg;$(SolutionDir)\..\..\..\..\$(OpenSSl_dir)\x86Debug\lib;</AdditionalLibraryDirectories>
+      <AdditionalDependencies>%(AdditionalDependencies);$(SSLLibD)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
 
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug No Xalan|x64'">
     <ClCompile>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);XSEC_HAVE_OPENSSL=1;SUPPRESS_XSEC_HAVE_WINCAPI=1</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(SolutionDir)\..\..\..\..\$(OpenSSl_dir)\inc64.dbg;$(SolutionDir)\..\..\..\..\$(Xerces_dir)\src</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(SolutionDir)\..\..\..\..\$(OpenSSl_dir)\inc64.dbg;$(SolutionDir)\..\..\..\..\$(OpenSSl_dir)\x64Debug\include;$(SolutionDir)\..\..\..\..\$(Xerces_dir)\src</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories);$(SolutionDir)..\..\..\..\$(Xerces_dir)\Build\Win64\$(MsVCVersion)\Debug;$(SolutionDir)..\..\..\..\$(Openssl_dir)\out64dll.dbg;</AdditionalLibraryDirectories>
-      <AdditionalDependencies>%(AdditionalDependencies);libssl.lib;libcrypto.lib</AdditionalDependencies>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories);$(SolutionDir)..\..\..\..\$(Xerces_dir)\Build\Win64\$(MsVCVersion)\Debug;$(SolutionDir)..\..\..\..\$(Openssl_dir)\out64dll.dbg;$(SolutionDir)\..\..\..\..\$(OpenSSl_dir)\x64Debug\lib;</AdditionalLibraryDirectories>
+      <AdditionalDependencies>%(AdditionalDependencies);$(SSLLibD)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
 
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release No Xalan|Win32'">
     <ClCompile>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);XSEC_HAVE_OPENSSL=1;SUPPRESS_XSEC_HAVE_WINCAPI=1</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(SolutionDir)\..\..\..\..\$(OpenSSl_dir)\inc32;$(SolutionDir)\..\..\..\..\$(Xerces_dir)\src</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(SolutionDir)\..\..\..\..\$(OpenSSl_dir)\inc32;$(SolutionDir)\..\..\..\..\$(OpenSSl_dir)\x86\include;$(SolutionDir)\..\..\..\..\$(Xerces_dir)\src</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories);$(SolutionDir)..\..\..\..\$(Xerces_dir)\Build\Win32\$(MsVCVersion)\Release;$(SolutionDir)..\..\..\..\$(Openssl_dir)\out32dll;</AdditionalLibraryDirectories>
-      <AdditionalDependencies>%(AdditionalDependencies);libssl.lib;libcrypto.lib</AdditionalDependencies>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories);$(SolutionDir)..\..\..\..\$(Xerces_dir)\Build\Win32\$(MsVCVersion)\Release;$(SolutionDir)..\..\..\..\$(Openssl_dir)\out32dll;$(SolutionDir)\..\..\..\..\$(OpenSSl_dir)\x86\lib;</AdditionalLibraryDirectories>
+      <AdditionalDependencies>%(AdditionalDependencies);$(SSLLib)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
 
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release No Xalan|x64'">
     <ClCompile>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);XSEC_HAVE_OPENSSL=1;SUPPRESS_XSEC_HAVE_WINCAPI=1</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(SolutionDir)\..\..\..\..\$(OpenSSl_dir)\inc64;$(SolutionDir)\..\..\..\..\$(Xerces_dir)\src</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(SolutionDir)\..\..\..\..\$(OpenSSl_dir)\inc64;$(SolutionDir)\..\..\..\..\$(OpenSSl_dir)\x64\include;$(SolutionDir)\..\..\..\..\$(Xerces_dir)\src</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories);$(SolutionDir)..\..\..\..\$(Xerces_dir)\Build\Win64\$(MsVCVersion)\Release;$(SolutionDir)..\..\..\..\$(Openssl_dir)\out64dll;</AdditionalLibraryDirectories>
-      <AdditionalDependencies>%(AdditionalDependencies);libssl.lib;libcrypto.lib</AdditionalDependencies>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories);$(SolutionDir)..\..\..\..\$(Xerces_dir)\Build\Win64\$(MsVCVersion)\Release;$(SolutionDir)..\..\..\..\$(Openssl_dir)\out64dll;$(SolutionDir)\..\..\..\..\$(OpenSSl_dir)\x64\lib;</AdditionalLibraryDirectories>
+      <AdditionalDependencies>%(AdditionalDependencies);;$(SSLLib)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.

More information about the commits mailing list