[shibboleth-sp2] 55/82: CPPXT-119 Xerces is built using CMAKE from V3.2 on
Etienne Dysli Metref
edm-guest at moszumanska.debian.org
Thu Nov 16 08:16:25 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 25a29cd2e8ac8d9b84e6ecddc04d6eadaf077684
Author: Rod Widdowson <rdw at steadingsoftware.com>
Date: Tue Aug 22 16:32:00 2017 +0100
CPPXT-119 Xerces is built using CMAKE from V3.2 on
https://issues.shibboleth.net/jira/browse/CPPXT-119
This means that where the dlls come from changes. Clean up this
part of the build as part of the work.
---
Projects/vc10/Wix/MergeModules.vcxproj | 8 ++++----
msi/WiX/MergeModules/MergeModules.make | 14 ++++++++++----
msi/WiX/MergeModules/Xerces-x64.wxs | 6 ++----
msi/WiX/MergeModules/Xerces-x86.wxs | 6 ++----
4 files changed, 18 insertions(+), 16 deletions(-)
diff --git a/Projects/vc10/Wix/MergeModules.vcxproj b/Projects/vc10/Wix/MergeModules.vcxproj
index 1ad4bc0..22a50e4 100644
--- a/Projects/vc10/Wix/MergeModules.vcxproj
+++ b/Projects/vc10/Wix/MergeModules.vcxproj
@@ -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>
diff --git a/msi/WiX/MergeModules/MergeModules.make b/msi/WiX/MergeModules/MergeModules.make
index 2796b18..05e817e 100644
--- a/msi/WiX/MergeModules/MergeModules.make
+++ b/msi/WiX/MergeModules/MergeModules.make
@@ -157,13 +157,19 @@ Xerces-x64.msm: Xerces-x64.wixobj
light Xerces-x64.wixobj
del ..\*64*.msi
-Xerces-x86.wixobj: Xerces-x86.wxs $(BuildSP)\xerces-c-$(XercesVersion)\Build\Win32\$(MsVCVersion)\Release\xerces-c_$(XercesFileVersion).dll Xerces-x86.wxs $(BuildSP)\xerces-c-$(XercesVersion)\Build\Win32\$(MsVCVersion)\Debug\xerces-c_$(XercesFileVersion)D.dll
+XercesDll32=$(BuildSP)$(Xerces)\Install32\$(MsVCVersion)\bin\xerces-c_$(XercesFileVersion).dll
+XercesDebugDll32=$(BuildSP)$(Xerces)\Install32\$(MsVCVersion)\bin\xerces-c_$(XercesFileVersion)D.dll
+
+Xerces-x86.wixobj: Xerces-x86.wxs $(XercesDll32) Xerces-x86.wxs $(XercesDebugDll32)
wixcop -indent:2 Xerces-x86.wxs
- candle Xerces-x86.wxs -dBuildDirectory=$(BuildSP) -dXercesVersion=$(XercesVersion) -dXercesFileVersion=$(XercesFileVersion) -dXerces32Component=$(Xerces32Component) -dXerces32Componentd=$(Xerces32Componentd) -dShibbolethMsVersion=$(MsVCVersion)
+ candle Xerces-x86.wxs -dBuildDirectory=$(BuildSP) -dXercesDll=$(XercesDll32) -dXercesDebugDll=$(XercesDebugDll32) -dXercesVersion=$(XercesVersion) -dXercesFileVersion=$(XercesFileVersion) -dXerces32Component=$(Xerces32Component) -dXerces32Componentd=$(Xerces32Componentd) -dShibbolethMsVersion=$(MsVCVersion)
+
+XercesDll64=$(BuildSP)$(Xerces)\Install64\$(MsVCVersion)\bin\xerces-c_$(XercesFileVersion).dll
+XercesDebugDll64=$(BuildSP)$(Xerces)\Install64\$(MsVCVersion)\bin\xerces-c_$(XercesFileVersion)D.dll
-Xerces-x64.wixobj: Xerces-x64.wxs $(BuildSP)\xerces-c-$(XercesVersion)\Build\Win64\$(MsVCVersion)\Release\xerces-c_$(XercesFileVersion).dll Xerces-x86.wxs $(BuildSP)\xerces-c-$(XercesVersion)\Build\Win64\$(MsVCVersion)\Debug\xerces-c_$(XercesFileVersion)D.dll
+Xerces-x64.wixobj: Xerces-x64.wxs $(XercesDll64) Xerces-x86.wxs $(XercesDebugDll64)
wixcop -indent:2 Xerces-x64.wxs
- candle Xerces-x64.wxs -dBuildDirectory=$(BuildSP) -dXercesVersion=$(XercesVersion) -dXercesFileVersion=$(XercesFileVersion) -dXerces64Component=$(Xerces64Component) -dXerces64Componentd=$(Xerces64Componentd) -dShibbolethMsVersion=$(MsVCVersion)
+ candle Xerces-x64.wxs -dBuildDirectory=$(BuildSP) -dXercesDll=$(XercesDll64) -dXercesDebugDll=$(XercesDebugDll64) -dXercesVersion=$(XercesVersion) -dXercesFileVersion=$(XercesFileVersion) -dXerces64Component=$(Xerces64Component) -dXerces64Componentd=$(Xerces64Componentd) -dShibbolethMsVersion=$(MsVCVersion)
#
diff --git a/msi/WiX/MergeModules/Xerces-x64.wxs b/msi/WiX/MergeModules/Xerces-x64.wxs
index 6a6af3b..537e7be 100644
--- a/msi/WiX/MergeModules/Xerces-x64.wxs
+++ b/msi/WiX/MergeModules/Xerces-x64.wxs
@@ -27,13 +27,11 @@
<Directory Id='shibboleth_sp' Name='SP'>
<Directory Id='lib' Name='lib'>
<Component Id='xercesc.dll' Guid='$(var.Xerces64Component)' Win64='yes'>
- <File KeyPath='yes' Checksum='yes'
- Source='$(var.BuildDirectory)\xerces-c-$(var.XercesVersion)\Build\Win64\$(var.ShibbolethMsVersion)\Release\xerces-c_$(var.XercesFileVersion).dll'/>
+ <File KeyPath='yes' Checksum='yes' Source='$(var.XercesDll)'/>
</Component>
<Directory Id='lib_debug' Name='debug'>
<Component Id='xercescD.dll' Guid='$(var.Xerces64Componentd)' Win64='yes'>
- <File KeyPath='yes' Checksum='yes'
- Source='$(var.BuildDirectory)\xerces-c-$(var.XercesVersion)\Build\Win64\$(var.ShibbolethMsVersion)\Debug\xerces-c_$(var.XercesFileVersion)D.dll'/>
+ <File KeyPath='yes' Checksum='yes' Source='$(var.XercesDebugDll)'/>
</Component>
</Directory><!-- lib_debug-->
</Directory><!-- lib -->
diff --git a/msi/WiX/MergeModules/Xerces-x86.wxs b/msi/WiX/MergeModules/Xerces-x86.wxs
index ee80178..14ef5ed 100644
--- a/msi/WiX/MergeModules/Xerces-x86.wxs
+++ b/msi/WiX/MergeModules/Xerces-x86.wxs
@@ -27,13 +27,11 @@
<Directory Id='shibboleth_sp' Name='SP'>
<Directory Id='lib' Name='lib'>
<Component Id='xercesc.dll' Guid='$(var.Xerces32Component)'>
- <File KeyPath='yes' Checksum='yes'
- Source='$(var.BuildDirectory)\xerces-c-$(var.XercesVersion)\Build\Win32\$(var.ShibbolethMsVersion)\Release\xerces-c_$(var.XercesFileVersion).dll'/>
+ <File KeyPath='yes' Checksum='yes' Source='$(var.XercesDll)'/>
</Component>
<Directory Id='lib_debug' Name='debug'>
<Component Id='xercescD.dll' Guid='$(var.Xerces32Componentd)'>
- <File KeyPath='yes' Checksum='yes'
- Source='$(var.BuildDirectory)\xerces-c-$(var.XercesVersion)\Build\Win32\$(var.ShibbolethMsVersion)\Debug\xerces-c_$(var.XercesFileVersion)D.dll'/>
+ <File KeyPath='yes' Checksum='yes' Source='$(var.XercesDebugDll)'/>
</Component>
</Directory><!-- lib_debug-->
</Directory><!-- lib -->
--
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