[cpp-sp] 01/02: There CAN be another 'Minimal' in this build...
Scott Cantor
cantor.2 at osu.edu
Wed Oct 9 18:31:54 UTC 2024
This is an automated email from the git hooks/post-receive script.
scantor pushed a commit to branch main
in repository cpp-sp.
View the commit online:
http://git.shibboleth.net/view/?p=cpp-sp.git;a=commit;h=8276085612dd075d32251604f28efda6a679faf5
commit 8276085612dd075d32251604f28efda6a679faf5
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Wed Oct 9 14:29:32 2024 -0400
There CAN be another 'Minimal' in this build...
---
msi/WiX/MergeModules/MergeModules.make | 28 ++++++++++++++--------------
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/msi/WiX/MergeModules/MergeModules.make b/msi/WiX/MergeModules/MergeModules.make
index eb3bf07a..36e34f86 100644
--- a/msi/WiX/MergeModules/MergeModules.make
+++ b/msi/WiX/MergeModules/MergeModules.make
@@ -247,25 +247,25 @@ XmlSec-x64.msm: XmlSec-x64.wixobj
light XmlSec-x64.wixobj
del ..\*64*.msi
-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"
+XmlSec-x86.wixobj: XmlSec-x86.wxs "$(BuildSP)\$(xmlsec)\Build\Win32\$(MsVCVersion)\Release\xsec_$(XmlSecFileVersion).dll"\
+ "$(BuildSP)\$(xmlsec)\Build\Win32\$(MsVCVersion)\Release\c14n.exe"\
+ "$(BuildSP)\$(xmlsec)\Build\Win32\$(MsVCVersion)\Release\checksig.exe"\
+ "$(BuildSP)\$(xmlsec)\Build\Win32\$(MsVCVersion)\Release\cipher.exe"\
+ "$(BuildSP)\$(xmlsec)\Build\Win32\$(MsVCVersion)\Release\siginf.exe"\
+ "$(BuildSP)\$(xmlsec)\Build\Win32\$(MsVCVersion)\Release\templatesign.exe"\
+ "$(BuildSP)\$(xmlsec)\Build\Win32\$(MsVCVersion)\Release\txfmout.exe"
wixcop -indent:2 XmlSec-x86.wxs
candle XmlSec-x86.wxs -dBuildDirectory=$(BuildSP) -dXmlSecVersion=$(XmlSecVersion) -dxmlsec=$(xmlsec) -dXmlSecFileVersion=$(XmlSecFileVersion)\
-dXmlSec32Component=$(XmlSec32Component) -dXmlSec32Componentd=$(XmlSec32Componentd) -dShibbolethMsVersion=$(MsVCVersion)\
-dBuildDebug=$(DebugInstaller)
-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"
+XmlSec-x64.wixobj: XmlSec-x64.wxs "$(BuildSP)\$(xmlsec)\Build\x64\$(MsVCVersion)\Release\xsec_$(XmlSecFileVersion).dll"\
+ "$(BuildSP)\$(xmlsec)\Build\x64\$(MsVCVersion)\Release\c14n.exe"\
+ "$(BuildSP)\$(xmlsec)\Build\x64\$(MsVCVersion)\Release\checksig.exe"\
+ "$(BuildSP)\$(xmlsec)\Build\x64\$(MsVCVersion)\Release\cipher.exe"\
+ "$(BuildSP)\$(xmlsec)\Build\x64\$(MsVCVersion)\Release\siginf.exe"\
+ "$(BuildSP)\$(xmlsec)\Build\x64\$(MsVCVersion)\Release\templatesign.exe"\
+ "$(BuildSP)\$(xmlsec)\Build\x64\$(MsVCVersion)\Release\txfmout.exe"
wixcop -indent:2 XmlSec-x64.wxs
candle XmlSec-x64.wxs -dBuildDirectory=$(BuildSP) -dXmlSecVersion=$(XmlSecVersion) -dxmlsec=$(xmlsec) -dXmlSecFileVersion=$(XmlSecFileVersion)\
-dXmlSec64Component=$(XmlSec64Component) -dXmlSec64Componentd=$(XmlSec64Componentd) -dShibbolethMsVersion=$(MsVCVersion)\
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list