[shibboleth-sp2] 17/23: SSPCPP-765 Share Santuario install dir location with dll build

Ferenc Wágner wferi at moszumanska.debian.org
Wed Feb 21 10:57:07 UTC 2018


This is an automated email from the git hooks/post-receive script.

wferi pushed a commit to branch master
in repository shibboleth-sp2.

commit e3b381c45fdfe49387a31e82e525829dcbaa1aba
Author: Rod Widdowson <rdw at steadingsoftware.com>
Date:   Wed Dec 6 15:31:36 2017 +0000

    SSPCPP-765 Share Santuario install dir location with dll build
    
    https://issues.shibboleth.net/jira/browse/SSPCPP-765
---
 Projects/vc15/wix/MergeModules.vcxproj |  8 ++---
 msi/WiX/MergeModules/MergeModules.make | 62 +++++++++++++++++-----------------
 msi/WiX/MergeModules/XmlSec-x64.wxs    |  6 ++--
 msi/WiX/MergeModules/XmlSec-x86.wxs    |  6 ++--
 4 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/Projects/vc15/wix/MergeModules.vcxproj b/Projects/vc15/wix/MergeModules.vcxproj
index e8a611b..6177a97 100644
--- a/Projects/vc15/wix/MergeModules.vcxproj
+++ b/Projects/vc15/wix/MergeModules.vcxproj
@@ -58,7 +58,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
@@ -67,14 +67,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 
@@ -83,7 +83,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>
     <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
   </PropertyGroup>
diff --git a/msi/WiX/MergeModules/MergeModules.make b/msi/WiX/MergeModules/MergeModules.make
index 414a57a..e99cb12 100644
--- a/msi/WiX/MergeModules/MergeModules.make
+++ b/msi/WiX/MergeModules/MergeModules.make
@@ -80,7 +80,7 @@ Log4Shib-x86.wixobj: Log4Shib-x86.wxs\
 			$(BuildSP)\log4shib-$(Log4ShibVersion)\ms$(MsVCVersion)\Debug\log4shib$(Log4ShibFileVersion)D.dll\
 			$(BuildSP)\log4shib-$(Log4ShibVersion)\ms$(MsVCVersion)\Release\log4shib$(Log4ShibFileVersion).dll
 	wixcop -indent:2 Log4Shib-x86.wxs
-	candle Log4Shib-x86.wxs -dBuildDirectory=$(BuildSP) -dLog4ShibVersion=$(Log4ShibVersion)\
+	candle Log4Shib-x86.wxs -dBuildDirectory=$(BuildSP) -dLog4ShibVersion=$(Log4ShibVersion)\ -d
 							-dLog4ShibFileVersion=$(Log4ShibFileVersion)\
                             -dLog4ShibComponent32=$(Log4ShibComponent32) -dLog4ShibComponent32d=$(Log4ShibComponent32d)\
                             -dShibbolethMsVersion=$(MsVCVersion)
@@ -240,40 +240,40 @@ XmlSec-x64.msm: XmlSec-x64.wixobj
 	light XmlSec-x64.wixobj
 	del ..\*64*.msi
 
-XmlSec-x86.wixobj: XmlSec-x86.wxs "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\Win32\$(MsVCVersion)\Release Minimal\xsec_$(XmlSecFileVersion).dll"\
-                                  "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\Win32\$(MsVCVersion)\Release Minimal\c14n.exe"\
-                                  "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\Win32\$(MsVCVersion)\Release Minimal\checksig.exe"\
-                                  "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\Win32\$(MsVCVersion)\Release Minimal\cipher.exe"\
-                                  "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\Win32\$(MsVCVersion)\Release Minimal\siginf.exe"\
-                                  "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\Win32\$(MsVCVersion)\Release Minimal\templatesign.exe"\
-                                  "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\Win32\$(MsVCVersion)\Release Minimal\txfmout.exe"\
-                                  "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\Win32\$(MsVCVersion)\Debug Minimal\xsec_$(XmlSecFileVersion)D.dll"\
-                                  "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\Win32\$(MsVCVersion)\Debug Minimal\c14n.exe"\
-                                  "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\Win32\$(MsVCVersion)\Debug Minimal\checksig.exe"\
-                                  "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\Win32\$(MsVCVersion)\Debug Minimal\cipher.exe"\
-                                  "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\Win32\$(MsVCVersion)\Debug Minimal\siginf.exe"\
-                                  "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\Win32\$(MsVCVersion)\Debug Minimal\templatesign.exe"\
-                                  "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\Win32\$(MsVCVersion)\Debug Minimal\txfmout.exe"
+XmlSec-x86.wixobj: XmlSec-x86.wxs "$(BuildSP)\$(xmlsec)\Build\Win32\$(MsVCVersion)\Release Minimal\xsec_$(XmlSecFileVersion).dll"\
+                                  "$(BuildSP)\$(xmlsec)\Build\Win32\$(MsVCVersion)\Release Minimal\c14n.exe"\
+                                  "$(BuildSP)\$(xmlsec)\Build\Win32\$(MsVCVersion)\Release Minimal\checksig.exe"\
+                                  "$(BuildSP)\$(xmlsec)\Build\Win32\$(MsVCVersion)\Release Minimal\cipher.exe"\
+                                  "$(BuildSP)\$(xmlsec)\Build\Win32\$(MsVCVersion)\Release Minimal\siginf.exe"\
+                                  "$(BuildSP)\$(xmlsec)\Build\Win32\$(MsVCVersion)\Release Minimal\templatesign.exe"\
+                                  "$(BuildSP)\$(xmlsec)\Build\Win32\$(MsVCVersion)\Release Minimal\txfmout.exe"\
+                                  "$(BuildSP)\$(xmlsec)\Build\Win32\$(MsVCVersion)\Debug Minimal\xsec_$(XmlSecFileVersion)D.dll"\
+                                  "$(BuildSP)\$(xmlsec)\Build\Win32\$(MsVCVersion)\Debug Minimal\c14n.exe"\
+                                  "$(BuildSP)\$(xmlsec)\Build\Win32\$(MsVCVersion)\Debug Minimal\checksig.exe"\
+                                  "$(BuildSP)\$(xmlsec)\Build\Win32\$(MsVCVersion)\Debug Minimal\cipher.exe"\
+                                  "$(BuildSP)\$(xmlsec)\Build\Win32\$(MsVCVersion)\Debug Minimal\siginf.exe"\
+                                  "$(BuildSP)\$(xmlsec)\Build\Win32\$(MsVCVersion)\Debug Minimal\templatesign.exe"\
+                                  "$(BuildSP)\$(xmlsec)\Build\Win32\$(MsVCVersion)\Debug Minimal\txfmout.exe"
 	wixcop -indent:2 XmlSec-x86.wxs
-	candle XmlSec-x86.wxs -dBuildDirectory=$(BuildSP) -dXmlSecVersion=$(XmlSecVersion) -dXmlSecFileVersion=$(XmlSecFileVersion)\
+	candle XmlSec-x86.wxs -dBuildDirectory=$(BuildSP) -dXmlSecVersion=$(XmlSecVersion) -dxmlsec=$(xmlsec) -dXmlSecFileVersion=$(XmlSecFileVersion)\
                           -dXmlSec32Component=$(XmlSec32Component) -dXmlSec32Componentd=$(XmlSec32Componentd) -dShibbolethMsVersion=$(MsVCVersion)
 
-XmlSec-x64.wixobj: XmlSec-x64.wxs "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\x64\$(MsVCVersion)\Release Minimal\xsec_$(XmlSecFileVersion).dll"\
-                                  "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\x64\$(MsVCVersion)\Release Minimal\c14n.exe"\
-                                  "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\x64\$(MsVCVersion)\Release Minimal\checksig.exe"\
-                                  "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\x64\$(MsVCVersion)\Release Minimal\cipher.exe"\
-                                  "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\x64\$(MsVCVersion)\Release Minimal\siginf.exe"\
-                                  "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\x64\$(MsVCVersion)\Release Minimal\templatesign.exe"\
-                                  "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\x64\$(MsVCVersion)\Release Minimal\txfmout.exe"\
-                                  "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\x64\$(MsVCVersion)\Debug Minimal\xsec_$(XmlSecFileVersion)D.dll"\
-                                  "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\x64\$(MsVCVersion)\Debug Minimal\c14n.exe"\
-                                  "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\x64\$(MsVCVersion)\Debug Minimal\checksig.exe"\
-                                  "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\x64\$(MsVCVersion)\Debug Minimal\cipher.exe"\
-                                  "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\x64\$(MsVCVersion)\Debug Minimal\siginf.exe"\
-                                  "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\x64\$(MsVCVersion)\Debug Minimal\templatesign.exe"\
-                                  "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\x64\$(MsVCVersion)\Debug Minimal\txfmout.exe"
+XmlSec-x64.wixobj: XmlSec-x64.wxs "$(BuildSP)\$(xmlsec)\Build\x64\$(MsVCVersion)\Release Minimal\xsec_$(XmlSecFileVersion).dll"\
+                                  "$(BuildSP)\$(xmlsec)\Build\x64\$(MsVCVersion)\Release Minimal\c14n.exe"\
+                                  "$(BuildSP)\$(xmlsec)\Build\x64\$(MsVCVersion)\Release Minimal\checksig.exe"\
+                                  "$(BuildSP)\$(xmlsec)\Build\x64\$(MsVCVersion)\Release Minimal\cipher.exe"\
+                                  "$(BuildSP)\$(xmlsec)\Build\x64\$(MsVCVersion)\Release Minimal\siginf.exe"\
+                                  "$(BuildSP)\$(xmlsec)\Build\x64\$(MsVCVersion)\Release Minimal\templatesign.exe"\
+                                  "$(BuildSP)\$(xmlsec)\Build\x64\$(MsVCVersion)\Release Minimal\txfmout.exe"\
+                                  "$(BuildSP)\$(xmlsec)\Build\x64\$(MsVCVersion)\Debug Minimal\xsec_$(XmlSecFileVersion)D.dll"\
+                                  "$(BuildSP)\$(xmlsec)\Build\x64\$(MsVCVersion)\Debug Minimal\c14n.exe"\
+                                  "$(BuildSP)\$(xmlsec)\Build\x64\$(MsVCVersion)\Debug Minimal\checksig.exe"\
+                                  "$(BuildSP)\$(xmlsec)\Build\x64\$(MsVCVersion)\Debug Minimal\cipher.exe"\
+                                  "$(BuildSP)\$(xmlsec)\Build\x64\$(MsVCVersion)\Debug Minimal\siginf.exe"\
+                                  "$(BuildSP)\$(xmlsec)\Build\x64\$(MsVCVersion)\Debug Minimal\templatesign.exe"\
+                                  "$(BuildSP)\$(xmlsec)\Build\x64\$(MsVCVersion)\Debug Minimal\txfmout.exe"
 	wixcop -indent:2 XmlSec-x64.wxs
-	candle XmlSec-x64.wxs -dBuildDirectory=$(BuildSP) -dXmlSecVersion=$(XmlSecVersion) -dXmlSecFileVersion=$(XmlSecFileVersion)\
+	candle XmlSec-x64.wxs -dBuildDirectory=$(BuildSP) -dXmlSecVersion=$(XmlSecVersion) -dxmlsec=$(xmlsec) -dXmlSecFileVersion=$(XmlSecFileVersion)\
                           -dXmlSec64Component=$(XmlSec64Component) -dXmlSec64Componentd=$(XmlSec64Componentd) -dShibbolethMsVersion=$(MsVCVersion)
 
 #
diff --git a/msi/WiX/MergeModules/XmlSec-x64.wxs b/msi/WiX/MergeModules/XmlSec-x64.wxs
index b3b0c8a..1da7ffd 100644
--- a/msi/WiX/MergeModules/XmlSec-x64.wxs
+++ b/msi/WiX/MergeModules/XmlSec-x64.wxs
@@ -26,7 +26,7 @@
         <Directory Id='shibboleth' Name='Shibboleth'>
           <Directory Id='shibboleth_SP' Name='SP'>
             <Directory Id='lib' Name='lib' 
-                       FileSource='$(var.BuildDirectory)\xml-security-c-$(var.XmlSecVersion)\Build\x64\$(var.ShibbolethMsVersion)\Release Minimal'>
+                       FileSource='$(var.BuildDirectory)\$(var.xmlsec)\Build\x64\$(var.ShibbolethMsVersion)\Release Minimal'>
               <Component Id='xsec.dll' Guid='$(var.XmlSec64Component)' Win64='yes'>
                 <File KeyPath='yes' Checksum='yes' Name='xsec_$(var.XmlSecFileVersion).dll'/>
               </Component>
@@ -49,7 +49,7 @@
                 <File KeyPath='yes' Checksum='yes' Name='txfmout.exe'/>
               </Component>
               <Directory Id='lib_debug' Name='debug' 
-                         FileSource='$(var.BuildDirectory)\xml-security-c-$(var.XmlSecVersion)\Build\x64\$(var.ShibbolethMsVersion)\Debug Minimal'>
+                         FileSource='$(var.BuildDirectory)\$(var.xmlsec)\Build\x64\$(var.ShibbolethMsVersion)\Debug Minimal'>
                 <Component Id='xsecD.dll' Guid='$(var.XmlSec64Componentd)' Win64='yes'>
                   <File KeyPath='yes' Checksum='yes' Name='xsec_$(var.XmlSecFileVersion)D.dll'/>
                 </Component>
@@ -76,7 +76,7 @@
             <Directory Id='doc' Name='doc'>
               <Component Id='SANTUARIO.LICENSE' Guid='{07288B10-ED5A-443F-BC90-CFD987C798C4}' Win64='yes'>
                 <File KeyPath='yes' Name='SANTUARIO.LICENSE'
-                  Source='$(var.BuildDirectory)\xml-security-c-$(var.XmlSecVersion)\LICENSE.txt' />
+                  Source='$(var.BuildDirectory)\$(var.xmlsec)\LICENSE.txt' />
               </Component>
             </Directory><!-- doc -->
           </Directory><!-- shibboleth_sp -->
diff --git a/msi/WiX/MergeModules/XmlSec-x86.wxs b/msi/WiX/MergeModules/XmlSec-x86.wxs
index e9a6251..693e5e6 100644
--- a/msi/WiX/MergeModules/XmlSec-x86.wxs
+++ b/msi/WiX/MergeModules/XmlSec-x86.wxs
@@ -26,7 +26,7 @@
         <Directory Id='shibboleth' Name='Shibboleth'>
           <Directory Id='shibboleth_SP' Name='SP'>
             <Directory Id='lib' Name='lib' 
-                       FileSource='$(var.BuildDirectory)\xml-security-c-$(var.XmlSecVersion)\Build\Win32\$(var.ShibbolethMsVersion)\Release Minimal'>
+                       FileSource='$(var.BuildDirectory)\$(var.xmlsec)\Build\Win32\$(var.ShibbolethMsVersion)\Release Minimal'>
               <Component Id='xsec.dll' Guid='$(var.XmlSec32Component)'>
                 <File KeyPath='yes' Checksum='yes' Name='xsec_$(var.XmlSecFileVersion).dll'/>
               </Component>
@@ -49,7 +49,7 @@
                 <File KeyPath='yes' Checksum='yes' Name='txfmout.exe'/>
               </Component>
               <Directory Id='lib_debug' Name='debug' 
-                         FileSource='$(var.BuildDirectory)\xml-security-c-$(var.XmlSecVersion)\Build\Win32\$(var.ShibbolethMsVersion)\Debug Minimal'>
+                         FileSource='$(var.BuildDirectory)\$(var.xmlsec)\Build\Win32\$(var.ShibbolethMsVersion)\Debug Minimal'>
                 <Component Id='xsecD.dll' Guid='$(var.XmlSec32Componentd)'>
                   <File KeyPath='yes' Checksum='yes' Name='xsec_$(var.XmlSecFileVersion)D.dll'/>
                 </Component>
@@ -76,7 +76,7 @@
             <Directory Id='doc' Name='doc'>
               <Component Id='SANTUARIO.LICENSE' Guid='{FF81AD29-36DF-42BD-AFC9-211F083D9872}'>
                 <File KeyPath='yes' Name='SANTUARIO.LICENSE'
-                  Source='$(var.BuildDirectory)\xml-security-c-$(var.XmlSecVersion)\LICENSE.txt' />
+                  Source='$(var.BuildDirectory)\$(var.xmlsec)\LICENSE.txt' />
               </Component>
             </Directory><!-- doc -->
           </Directory><!-- shibboleth_sp -->

-- 
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