[shibboleth-sp2] 29/82: Resussitate VC10 build to handle new OpenSSL1.1 stuff
Etienne Dysli Metref
edm-guest at moszumanska.debian.org
Thu Nov 16 08:16:22 UTC 2017
This is an automated email from the git hooks/post-receive script.
edm-guest pushed a commit to branch master
in repository shibboleth-sp2.
commit b0b6040cd8696f8f3a6a97dedf4c4ece6522f1cb
Author: Rod Widdowson <rdw at steadingsoftware.com>
Date: Thu Jun 15 11:27:37 2017 +0100
Resussitate VC10 build to handle new OpenSSL1.1 stuff
---
Projects/vc10/Wix/MergeModules.vcxproj | 12 ++++++------
Projects/vc10/fastcgi/shibauthorizer.vcxproj | 12 ++++++------
Projects/vc10/fastcgi/shibresponder.vcxproj | 12 ++++++------
3 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/Projects/vc10/Wix/MergeModules.vcxproj b/Projects/vc10/Wix/MergeModules.vcxproj
index 77c1cc2..1ad4bc0 100644
--- a/Projects/vc10/Wix/MergeModules.vcxproj
+++ b/Projects/vc10/Wix/MergeModules.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
@@ -50,7 +50,7 @@ nmake /f MergeModules.make clean</NMakeReBuildCommandLine>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<NMakeBuildCommandLine>cd ..\..\..\msi\Wix\MergeModules
-nmake /f MergeModules.make BuildSP=$(BuildRoot) CurlVersion=$(CurlVersion) FastCGIVersion=$(FastCGIVersion) Log4ShibVersion=$(Log4ShibVersion) Log4ShibFileVersion=$(Log4ShibFileVersion) Log4ShibComponent32=$(Log4ShibComponent32) Log4ShibComponent32d=$(Log4ShibComponent32d) SolutionDir=$(SolutionDir)..\..\ OpenSAMLFileVersion=$(OpenSAMLFileVersion) OpenSAMLVersion=$(OpenSAMLVersion) XmlToolingFileVersion=$(XmlToolingFileVersion) SamlComponent32=$(SamlComponent32) XMLToolingComponent32=$(X [...]
+nmake /f MergeModules.make BuildSP=$(BuildRoot) CurlVersion=$(CurlVersion) FastCGIVersion=$(FastCGIVersion) Log4ShibVersion=$(Log4ShibVersion) Log4ShibFileVersion=$(Log4ShibFileVersion) Log4ShibComponent32=$(Log4ShibComponent32) Log4ShibComponent32d=$(Log4ShibComponent32d) SolutionDir=$(SolutionDir)..\..\ OpenSAMLFileVersion=$(OpenSAMLFileVersion) OpenSAMLVersion=$(OpenSAMLVersion) XmlToolingFileVersion=$(XmlToolingFileVersion) SamlComponent32=$(SamlComponent32) XMLToolingComponent32=$(X [...]
<NMakeCleanCommandLine>cd ..\..\..\msi\Wix\MergeModules
del *86.wixobj
del *86.msm
@@ -59,14 +59,14 @@ del OpenSAML-schemas.wixpdb
del OpenSAML-schemas.wixobj
del OpenSAML-schemas.msm</NMakeCleanCommandLine>
<NMakeReBuildCommandLine>cd ..\..\..\msi\Wix\MergeModules
-nmake /f MergeModules.make BuildSP=$(BuildRoot) CurlVersion=$(CurlVersion) FastCGIVersion=$(FastCGIVersion) Log4ShibVersion=$(Log4ShibVersion) Log4ShibFileVersion=$(Log4ShibFileVersion) Log4ShibComponent32=$(Log4ShibComponent32) Log4ShibComponent32d=$(Log4ShibComponent32d) SolutionDir=$(SolutionDir)..\..\ OpenSAMLVersion=$(OpenSAMLVersion) OpenSAMLFileVersion=$(OpenSAMLFileVersion) XmlToolingFileVersion=$(XmlToolingFileVersion) SamlComponent32=$(SamlComponent32) XMLToolingComponent32= [...]
+nmake /f MergeModules.make BuildSP=$(BuildRoot) CurlVersion=$(CurlVersion) FastCGIVersion=$(FastCGIVersion) Log4ShibVersion=$(Log4ShibVersion) Log4ShibFileVersion=$(Log4ShibFileVersion) Log4ShibComponent32=$(Log4ShibComponent32) Log4ShibComponent32d=$(Log4ShibComponent32d) SolutionDir=$(SolutionDir)..\..\ OpenSAMLVersion=$(OpenSAMLVersion) OpenSAMLFileVersion=$(OpenSAMLFileVersion) XmlToolingFileVersion=$(XmlToolingFileVersion) SamlComponent32=$(SamlComponent32) XMLToolingComponent32= [...]
<NMakePreprocessorDefinitions>
</NMakePreprocessorDefinitions>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<NMakeBuildCommandLine>
cd ..\..\..\msi\Wix\MergeModules
-nmake /f MergeModules.make BuildSP=$(BuildRoot) CurlVersion=$(CurlVersion) FastCGIVersion=$(FastCGIVersion) Log4ShibVersion=$(Log4ShibVersion) Log4ShibFileVersion=$(Log4ShibFileVersion) Log4ShibComponent64=$(Log4ShibComponent64) Log4ShibComponent64d=$(Log4ShibComponent64d) SolutionDir=$(SolutionDir)..\..\ OpenSAMLVersion=$(OpenSAMLVersion) OpenSAMLFileVersion=$(OpenSAMLFileVersion) XmlToolingFileVersion=$(XmlToolingFileVersion) SamlComponent64=$(SamlComponent64) XMLToolingComponent64=$( [...]
+nmake /f MergeModules.make BuildSP=$(BuildRoot) CurlVersion=$(CurlVersion) FastCGIVersion=$(FastCGIVersion) Log4ShibVersion=$(Log4ShibVersion) Log4ShibFileVersion=$(Log4ShibFileVersion) Log4ShibComponent64=$(Log4ShibComponent64) Log4ShibComponent64d=$(Log4ShibComponent64d) SolutionDir=$(SolutionDir)..\..\ OpenSAMLVersion=$(OpenSAMLVersion) OpenSAMLFileVersion=$(OpenSAMLFileVersion) XmlToolingFileVersion=$(XmlToolingFileVersion) SamlComponent64=$(SamlComponent64) XMLToolingComponent64=$( [...]
<NMakeCleanCommandLine>cd ..\..\..\msi\Wix\MergeModules
del *64.wixobj
del *64.msm
@@ -75,7 +75,7 @@ del OpenSAML-schemas.wixpdb
del OpenSAML-schemas.wixobj
del OpenSAML-schemas.msm</NMakeCleanCommandLine>
<NMakeReBuildCommandLine>cd ..\..\..\msi\Wix\MergeModules
-nmake /f MergeModules.make BuildSP=$(BuildRoot) CurlVersion=$(CurlVersion) FastCGIVersion=$(FastCGIVersion) Log4ShibVersion=$(Log4ShibVersion) Log4ShibFileVersion=$(Log4ShibFileVersion) Log4ShibComponent64=$(Log4ShibComponent64) Log4ShibComponent64d=$(Log4ShibComponent64d) SolutionDir=$(SolutionDir)..\..\ OpenSAMLVersion=$(OpenSAMLVersion) OpenSAMLFileVersion=$(OpenSAMLFileVersion) XmlToolingFileVersion=$(XmlToolingFileVersion) SamlComponent64=$(SamlComponent64) XMLToolingComponent64=$(X [...]
+nmake /f MergeModules.make BuildSP=$(BuildRoot) CurlVersion=$(CurlVersion) FastCGIVersion=$(FastCGIVersion) Log4ShibVersion=$(Log4ShibVersion) Log4ShibFileVersion=$(Log4ShibFileVersion) Log4ShibComponent64=$(Log4ShibComponent64) Log4ShibComponent64d=$(Log4ShibComponent64d) SolutionDir=$(SolutionDir)..\..\ OpenSAMLVersion=$(OpenSAMLVersion) OpenSAMLFileVersion=$(OpenSAMLFileVersion) XmlToolingFileVersion=$(XmlToolingFileVersion) SamlComponent64=$(SamlComponent64) XMLToolingComponent64=$(X [...]
<NMakePreprocessorDefinitions>WIN32;NDEBUG;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
</PropertyGroup>
<ItemDefinitionGroup>
@@ -114,4 +114,4 @@ nmake /f MergeModules.make BuildSP=$(BuildRoot) CurlVersion=$(CurlVersion) FastC
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/Projects/vc10/fastcgi/shibauthorizer.vcxproj b/Projects/vc10/fastcgi/shibauthorizer.vcxproj
index 93b6d32..b5809e0 100644
--- a/Projects/vc10/fastcgi/shibauthorizer.vcxproj
+++ b/Projects/vc10/fastcgi/shibauthorizer.vcxproj
@@ -111,7 +111,7 @@
</ResourceCompile>
<Link>
<AdditionalDependencies>xerces-c_3.lib;xmltooling1.lib;libfcgi.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <AdditionalLibraryDirectories>..\..\..\..\cpp-xmltooling\Build\VC10\$(Configuration);\fcgi-2.4.0-VC9\Win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>..\..\..\..\cpp-xmltooling\Build\VC10\$(Configuration);$(buildroot)\$(fcgi)\Win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<SubSystem>Console</SubSystem>
<DataExecutionPrevention>
</DataExecutionPrevention>
@@ -139,7 +139,7 @@
</ResourceCompile>
<Link>
<AdditionalDependencies>xerces-c_3.lib;xmltooling1.lib;libfcgi.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <AdditionalLibraryDirectories>..\..\..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);\fcgi-2.4.0-VC9\Win32\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>..\..\..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);$(buildroot)\$(fcgi)\Win32\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<SubSystem>Console</SubSystem>
<DataExecutionPrevention>
</DataExecutionPrevention>
@@ -166,8 +166,8 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>xerces-c_3D.lib;xmltooling1D.lib;libfcgi.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <AdditionalLibraryDirectories>..\..\..\..\cpp-xmltooling\Build\VC10\$(Configuration);\fcgi-2.4.0-VC9\Win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalDependencies>xerces-c_3D.lib;xmltooling1D.lib;libfcgid.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalLibraryDirectories>..\..\..\..\cpp-xmltooling\Build\VC10\$(Configuration);$(buildroot)\$(fcgi)\Win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
<DataExecutionPrevention>
@@ -195,8 +195,8 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>xerces-c_3D.lib;xmltooling1D.lib;libfcgi.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <AdditionalLibraryDirectories>..\..\..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);\fcgi-2.4.0-VC9\Win32\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalDependencies>xerces-c_3D.lib;xmltooling1D.lib;libfcgid.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalLibraryDirectories>..\..\..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);$(buildroot)\$(fcgi)\Win32\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
<DataExecutionPrevention>
diff --git a/Projects/vc10/fastcgi/shibresponder.vcxproj b/Projects/vc10/fastcgi/shibresponder.vcxproj
index 6d267f3..7296329 100644
--- a/Projects/vc10/fastcgi/shibresponder.vcxproj
+++ b/Projects/vc10/fastcgi/shibresponder.vcxproj
@@ -112,7 +112,7 @@
</ResourceCompile>
<Link>
<AdditionalDependencies>xerces-c_3.lib;xmltooling1.lib;libfcgi.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <AdditionalLibraryDirectories>..\..\..\..\cpp-xmltooling\Build\VC10\$(Configuration);\fcgi-2.4.0-VC9\Win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>..\..\..\..\cpp-xmltooling\Build\VC10\$(Configuration);$(buildroot)\$(fcgi)\Win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<SubSystem>Console</SubSystem>
<DataExecutionPrevention>
</DataExecutionPrevention>
@@ -140,7 +140,7 @@
</ResourceCompile>
<Link>
<AdditionalDependencies>xerces-c_3.lib;xmltooling1.lib;libfcgi.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <AdditionalLibraryDirectories>..\..\..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);\fcgi-2.4.0-VC9\Win32\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>..\..\..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);$(buildroot)\$(fcgi)\Win32\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<SubSystem>Console</SubSystem>
<DataExecutionPrevention>
</DataExecutionPrevention>
@@ -167,8 +167,8 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>xerces-c_3D.lib;xmltooling1D.lib;libfcgi.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <AdditionalLibraryDirectories>..\..\..\..\cpp-xmltooling\Build\VC10\$(Configuration);\fcgi-2.4.0-VC9\Win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalDependencies>xerces-c_3D.lib;xmltooling1D.lib;libfcgid.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalLibraryDirectories>..\..\..\..\cpp-xmltooling\Build\VC10\$(Configuration);$(buildroot)\$(fcgi)\Win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
<DataExecutionPrevention>
@@ -196,8 +196,8 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>xerces-c_3D.lib;xmltooling1D.lib;libfcgi.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <AdditionalLibraryDirectories>..\..\..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);\fcgi-2.4.0-VC9\Win32\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalDependencies>xerces-c_3D.lib;xmltooling1D.lib;libfcgid.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalLibraryDirectories>..\..\..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);$(buildroot)\$(fcgi)\Win32\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
<DataExecutionPrevention>
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-shibboleth/shibboleth-sp2.git
More information about the Pkg-shibboleth-devel
mailing list