[cpp-msbuild] branch master updated: Checkpoint some auto-build work

Rod Widdowson rdw at steadingsoftware.com
Sun Nov 27 11:10:17 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=af48f7d2c724c544b40cc1a3edde4f20376b19e8

The following commit(s) were added to refs/heads/master by this push:
       new  af48f7d   Checkpoint some auto-build work
af48f7d is described below

commit af48f7d2c724c544b40cc1a3edde4f20376b19e8
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Sun Nov 27 15:29:17 2016 +0000

    Checkpoint some auto-build work
    
    - My working version config.bat (used to set the environment prior to building)
      This includes
         o A couple of extra environmental variables (MsVCVersion, ForceImpotyBeforeCppTargets)
         o A setting of PATH to help run executables
    - Some changes to xsec.props (for Santuario)
         o Abstract the VC version out to config.bat
         o Supress WinCapi in the build
         o Some (probably erroneous) changes in preparation for OpenSSL1.1
---
 dependencies/config.bat | 20 +++++++++++++-------
 dependencies/xsec.props | 32 ++++++++++++++++----------------
 2 files changed, 29 insertions(+), 23 deletions(-)

diff --git a/dependencies/config.bat b/dependencies/config.bat
index d9553f3..aacaf95 100644
--- a/dependencies/config.bat
+++ b/dependencies/config.bat
@@ -1,19 +1,25 @@
-set SCRIPTS_DIR=H:\Perforce\sp-dependency-build\scripts
+set SCRIPTS_DIR=H:\Perforce\devel\cpp-msbuild\dependencies
 set VS14_DIR=c:\Program Files (x86)\Microsoft Visual Studio 14.0\
 
 set ZLIB_DIR=zlib-1.2.8
 set ZLIB_IMPLIB=zlib1
 set ZLIB_SHAREDLIB=zlib1_2
 
-set LOGSHIB_DIR=cpp-log4shib-1.9
+set LOGSHIB_DIR=log4shib-1.0.10
 
-set XERCES_DIR=xerces-3.1.99
+set XERCES_DIR=xerces-c-3.1.3
 
-set OPENSSL_DIR=openssl-1.0.2g
-set OPENSSL_NAME=1_0_2_7
+set OPENSSL_DIR=openssl-1.1
+set OPENSSL_NAME=1_0_2_4
 
-set LIBCURL_DIR=curl-7.48.0
+set LIBCURL_DIR=curl-7.49.1
 set LIBCURL_NAME=libcurl5
 
-set XSEC_DIR=xml-security-cpp
+set XSEC_DIR=xml-security-c-1.7.99-X
+
+set MsVCVersion=VC10
+
+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
 
diff --git a/dependencies/xsec.props b/dependencies/xsec.props
index 3e37119..9aa4c77 100644
--- a/dependencies/xsec.props
+++ b/dependencies/xsec.props
@@ -3,45 +3,45 @@
 
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug No Xalan|Win32'">
     <ClCompile>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);XSEC_HAVE_OPENSSL=1</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(SolutionDir)\..\..\..\..\$(OpenSSl_dir)\inc32;$(SolutionDir)\..\..\..\..\$(OpenSSl_dir)\include;$(SolutionDir)\..\..\..\..\$(Xerces_dir)\src</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions);XSEC_HAVE_OPENSSL=1;SUPPRESS_XSEC_HAVE_WINCAPI=1</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(SolutionDir)\..\..\..\..\$(OpenSSl_dir)\inc32.dbg;$(SolutionDir)\..\..\..\..\$(Xerces_dir)\src</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories);$(SolutionDir)..\..\..\..\$(Xerces_dir)\Build\Win32\VC14\Debug;$(SolutionDir)..\..\..\..\$(Openssl_dir)\out32dll.dbg;</AdditionalLibraryDirectories>
-      <AdditionalDependencies>%(AdditionalDependencies);ssleay32d.lib;libeay32d.lib</AdditionalDependencies>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories);$(SolutionDir)..\..\..\..\$(Xerces_dir)\Build\Win32\$(MsVCVersion)\Debug;$(SolutionDir)..\..\..\..\$(Openssl_dir)\out32dll.dbg;</AdditionalLibraryDirectories>
+      <AdditionalDependencies>%(AdditionalDependencies);libeay32D.lib;ssleay32D.lib</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
 
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug No Xalan|x64'">
     <ClCompile>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);XSEC_HAVE_OPENSSL=1</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(SolutionDir)\..\..\..\..\$(OpenSSl_dir)\inc64;$(SolutionDir)\..\..\..\..\$(OpenSSl_dir)\include;$(SolutionDir)\..\..\..\..\$(Xerces_dir)\src</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions);XSEC_HAVE_OPENSSL=1;SUPPRESS_XSEC_HAVE_WINCAPI=1</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(SolutionDir)\..\..\..\..\$(OpenSSl_dir)\inc64.dbg;$(SolutionDir)\..\..\..\..\$(Xerces_dir)\src</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories);$(SolutionDir)..\..\..\..\$(Xerces_dir)\Build\Win64\VC14\Debug;$(SolutionDir)..\..\..\..\$(Openssl_dir)\out64dll.dbg;</AdditionalLibraryDirectories>
-      <AdditionalDependencies>%(AdditionalDependencies);ssleay32d.lib;libeay32d.lib</AdditionalDependencies>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories);$(SolutionDir)..\..\..\..\$(Xerces_dir)\Build\Win64\$(MsVCVersion)\Debug;$(SolutionDir)..\..\..\..\$(Openssl_dir)\out64dll.dbg;</AdditionalLibraryDirectories>
+      <AdditionalDependencies>%(AdditionalDependencies);libssl.lib;libcrypto.lib</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
 
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release No Xalan|Win32'">
     <ClCompile>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);XSEC_HAVE_OPENSSL=1</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(SolutionDir)\..\..\..\..\$(OpenSSl_dir)\inc32;$(SolutionDir)\..\..\..\..\$(OpenSSl_dir)\include;$(SolutionDir)\..\..\..\..\$(Xerces_dir)\src</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions);XSEC_HAVE_OPENSSL=1;SUPPRESS_XSEC_HAVE_WINCAPI=1</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(SolutionDir)\..\..\..\..\$(OpenSSl_dir)\inc32;$(SolutionDir)\..\..\..\..\$(Xerces_dir)\src</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories);$(SolutionDir)..\..\..\..\$(Xerces_dir)\Build\Win32\VC14\Release;$(SolutionDir)..\..\..\..\$(Openssl_dir)\out32dll;</AdditionalLibraryDirectories>
-      <AdditionalDependencies>%(AdditionalDependencies);ssleay32.lib;libeay32.lib</AdditionalDependencies>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories);$(SolutionDir)..\..\..\..\$(Xerces_dir)\Build\Win32\$(MsVCVersion)\Release;$(SolutionDir)..\..\..\..\$(Openssl_dir)\out32dll;</AdditionalLibraryDirectories>
+      <AdditionalDependencies>%(AdditionalDependencies);libssl.lib;libcrypto.lib</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
 
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release No Xalan|x64'">
     <ClCompile>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);XSEC_HAVE_OPENSSL=1</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(SolutionDir)\..\..\..\..\$(OpenSSl_dir)\inc64;$(SolutionDir)\..\..\..\..\$(OpenSSl_dir)\include;$(SolutionDir)\..\..\..\..\$(Xerces_dir)\src</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions);XSEC_HAVE_OPENSSL=1;SUPPRESS_XSEC_HAVE_WINCAPI=1</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(SolutionDir)\..\..\..\..\$(OpenSSl_dir)\inc64;$(SolutionDir)\..\..\..\..\$(Xerces_dir)\src</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories);$(SolutionDir)..\..\..\..\$(Xerces_dir)\Build\Win64\VC14\Release;$(SolutionDir)..\..\..\..\$(Openssl_dir)\out64dll;</AdditionalLibraryDirectories>
-      <AdditionalDependencies>%(AdditionalDependencies);ssleay32.lib;libeay32.lib</AdditionalDependencies>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories);$(SolutionDir)..\..\..\..\$(Xerces_dir)\Build\Win64\$(MsVCVersion)\Release;$(SolutionDir)..\..\..\..\$(Openssl_dir)\out64dll;</AdditionalLibraryDirectories>
+      <AdditionalDependencies>%(AdditionalDependencies);libssl.lib;libcrypto.lib</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