[shibboleth-sp2] 63/82: CPPXT-123 Change the installer path for where xmlsec lives
Etienne Dysli Metref
edm-guest at moszumanska.debian.org
Thu Nov 16 08:16:26 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 b7565cc7a63d41391099f4df4aef022c5bfe1301
Author: Rod Widdowson <rdw at steadingsoftware.com>
Date: Tue Sep 19 16:11:08 2017 +0100
CPPXT-123 Change the installer path for where xmlsec lives
https://issues.shibboleth.net/jira/browse/CPPXT-123
---
msi/WiX/MergeModules/MergeModules.make | 56 +++++++++++++++++-----------------
msi/WiX/MergeModules/XmlSec-x64.wxs | 4 +--
msi/WiX/MergeModules/XmlSec-x86.wxs | 4 +--
3 files changed, 32 insertions(+), 32 deletions(-)
diff --git a/msi/WiX/MergeModules/MergeModules.make b/msi/WiX/MergeModules/MergeModules.make
index d586317..1e50ab4 100644
--- a/msi/WiX/MergeModules/MergeModules.make
+++ b/msi/WiX/MergeModules/MergeModules.make
@@ -240,38 +240,38 @@ 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 No Xalan\xsec_$(XmlSecFileVersion).dll"\
- "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\Win32\$(MsVCVersion)\Release No Xalan\c14n.exe"\
- "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\Win32\$(MsVCVersion)\Release No Xalan\checksig.exe"\
- "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\Win32\$(MsVCVersion)\Release No Xalan\cipher.exe"\
- "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\Win32\$(MsVCVersion)\Release No Xalan\siginf.exe"\
- "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\Win32\$(MsVCVersion)\Release No Xalan\templatesign.exe"\
- "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\Win32\$(MsVCVersion)\Release No Xalan\txfmout.exe"\
- "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\Win32\$(MsVCVersion)\Debug No Xalan\xsec_$(XmlSecFileVersion)D.dll"\
- "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\Win32\$(MsVCVersion)\Debug No Xalan\c14n.exe"\
- "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\Win32\$(MsVCVersion)\Debug No Xalan\checksig.exe"\
- "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\Win32\$(MsVCVersion)\Debug No Xalan\cipher.exe"\
- "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\Win32\$(MsVCVersion)\Debug No Xalan\siginf.exe"\
- "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\Win32\$(MsVCVersion)\Debug No Xalan\templatesign.exe"\
- "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\Win32\$(MsVCVersion)\Debug No Xalan\txfmout.exe"
+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"
wixcop -indent:2 XmlSec-x86.wxs
candle XmlSec-x86.wxs -dBuildDirectory=$(BuildSP) -dXmlSecVersion=$(XmlSecVersion) -dXmlSecFileVersion=$(XmlSecFileVersion)\
-dXmlSec32Component=$(XmlSec32Component) -dXmlSec32Componentd=$(XmlSec32Componentd) -dShibbolethMsVersion=$(MsVCVersion)
-XmlSec-x64.wixobj: XmlSec-x64.wxs "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\x64\$(MsVCVersion)\Release No Xalan\xsec_$(XmlSecFileVersion).dll"\
- "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\x64\$(MsVCVersion)\Release No Xalan\c14n.exe"\
- "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\x64\$(MsVCVersion)\Release No Xalan\checksig.exe"\
- "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\x64\$(MsVCVersion)\Release No Xalan\cipher.exe"\
- "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\x64\$(MsVCVersion)\Release No Xalan\siginf.exe"\
- "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\x64\$(MsVCVersion)\Release No Xalan\templatesign.exe"\
- "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\x64\$(MsVCVersion)\Release No Xalan\txfmout.exe"\
- "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\x64\$(MsVCVersion)\Debug No Xalan\xsec_$(XmlSecFileVersion)D.dll"\
- "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\x64\$(MsVCVersion)\Debug No Xalan\c14n.exe"\
- "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\x64\$(MsVCVersion)\Debug No Xalan\checksig.exe"\
- "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\x64\$(MsVCVersion)\Debug No Xalan\cipher.exe"\
- "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\x64\$(MsVCVersion)\Debug No Xalan\siginf.exe"\
- "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\x64\$(MsVCVersion)\Debug No Xalan\templatesign.exe"\
- "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\x64\$(MsVCVersion)\Debug No Xalan\txfmout.exe"
+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"
wixcop -indent:2 XmlSec-x64.wxs
candle XmlSec-x64.wxs -dBuildDirectory=$(BuildSP) -dXmlSecVersion=$(XmlSecVersion) -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 abd9e93..b3b0c8a 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 No Xalan'>
+ FileSource='$(var.BuildDirectory)\xml-security-c-$(var.XmlSecVersion)\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 No Xalan'>
+ FileSource='$(var.BuildDirectory)\xml-security-c-$(var.XmlSecVersion)\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>
diff --git a/msi/WiX/MergeModules/XmlSec-x86.wxs b/msi/WiX/MergeModules/XmlSec-x86.wxs
index 982c544..e9a6251 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 No Xalan'>
+ FileSource='$(var.BuildDirectory)\xml-security-c-$(var.XmlSecVersion)\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 No Xalan'>
+ FileSource='$(var.BuildDirectory)\xml-security-c-$(var.XmlSecVersion)\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>
--
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