[cpp-sp] branch main updated: There CANNOT be another 'Minimal' in this build...

Scott Cantor cantor.2 at osu.edu
Wed Oct 9 17:46:34 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=3ccd44d4a09115cbe53b524003d172a5f2a1cd84

The following commit(s) were added to refs/heads/main by this push:
     new 3ccd44d4 There CANNOT be another 'Minimal' in this build...
3ccd44d4 is described below

commit 3ccd44d4a09115cbe53b524003d172a5f2a1cd84
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Wed Oct 9 13:46:14 2024 -0400

    There CANNOT be another 'Minimal' in this build...
---
 msi/WiX/MergeModules/XmlSec-x64.wxs | 4 ++--
 msi/WiX/MergeModules/XmlSec-x86.wxs | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/msi/WiX/MergeModules/XmlSec-x64.wxs b/msi/WiX/MergeModules/XmlSec-x64.wxs
index 50461997..b3eea16b 100644
--- a/msi/WiX/MergeModules/XmlSec-x64.wxs
+++ b/msi/WiX/MergeModules/XmlSec-x64.wxs
@@ -23,7 +23,7 @@
       <Directory Id="ProgramFiles64Folder" Name="ProgramFiles">
         <Directory Id="shibboleth" Name="Shibboleth">
           <Directory Id="shibboleth_SP" Name="SP">
-            <Directory Id="lib" Name="lib" FileSource="$(var.BuildDirectory)\$(var.xmlsec)\Build\x64\$(var.ShibbolethMsVersion)\Release Minimal">
+            <Directory Id="lib" Name="lib" FileSource="$(var.BuildDirectory)\$(var.xmlsec)\Build\x64\$(var.ShibbolethMsVersion)\Release">
               <Component Id="xsec.dll" Guid="$(var.XmlSec64Component)" Win64="yes">
                 <File KeyPath="yes" Checksum="yes" Name="xsec_$(var.XmlSecFileVersion).dll" />
                 <File KeyPath="no"  Checksum="no"  Name="xsec_lib.pdb" />
@@ -53,7 +53,7 @@
                 <File KeyPath="no"  Checksum="no"  Name="txfmout.pdb" />
               </Component>
               <?if $(var.BuildDebug) != "" ?>
-              <Directory Id="lib_debug" Name="debug" FileSource="$(var.BuildDirectory)\$(var.xmlsec)\Build\x64\$(var.ShibbolethMsVersion)\Debug Minimal">
+              <Directory Id="lib_debug" Name="debug" FileSource="$(var.BuildDirectory)\$(var.xmlsec)\Build\x64\$(var.ShibbolethMsVersion)\Debug">
                 <Component Id="xsecD.dll" Guid="$(var.XmlSec64Componentd)" Win64="yes">
                   <File KeyPath="yes" Checksum="yes" Name="xsec_$(var.XmlSecFileVersion)D.dll" />
                   <File KeyPath="no"  Checksum="no"  Id="xsec_$(var.XmlSecFileVersion)D.pdb" Name="xsec_lib.pdb" />
diff --git a/msi/WiX/MergeModules/XmlSec-x86.wxs b/msi/WiX/MergeModules/XmlSec-x86.wxs
index c6008fe1..29b3fb4b 100644
--- a/msi/WiX/MergeModules/XmlSec-x86.wxs
+++ b/msi/WiX/MergeModules/XmlSec-x86.wxs
@@ -23,7 +23,7 @@
       <Directory Id="ProgramFilesFolder" Name="ProgramFiles">
         <Directory Id="shibboleth" Name="Shibboleth">
           <Directory Id="shibboleth_SP" Name="SP">
-            <Directory Id="lib" Name="lib" FileSource="$(var.BuildDirectory)\$(var.xmlsec)\Build\Win32\$(var.ShibbolethMsVersion)\Release Minimal">
+            <Directory Id="lib" Name="lib" FileSource="$(var.BuildDirectory)\$(var.xmlsec)\Build\Win32\$(var.ShibbolethMsVersion)\Release">
               <Component Id="xsec.dll" Guid="$(var.XmlSec32Component)">
                 <File KeyPath="yes" Checksum="yes" Name="xsec_$(var.XmlSecFileVersion).dll" />
                 <File KeyPath="no"  Checksum="no"  Name="xsec_lib.pdb" />
@@ -53,7 +53,7 @@
                 <File KeyPath="no"  Checksum="no"  Name="txfmout.pdb" />
               </Component>
               <?if $(var.BuildDebug) != "" ?>
-              <Directory Id="lib_debug" Name="debug" FileSource="$(var.BuildDirectory)\$(var.xmlsec)\Build\Win32\$(var.ShibbolethMsVersion)\Debug Minimal">
+              <Directory Id="lib_debug" Name="debug" FileSource="$(var.BuildDirectory)\$(var.xmlsec)\Build\Win32\$(var.ShibbolethMsVersion)\Debug">
                 <Component Id="xsecD.dll" Guid="$(var.XmlSec32Componentd)">
                   <File KeyPath="yes" Checksum="yes" Name="xsec_$(var.XmlSecFileVersion)D.dll" />
                   <File KeyPath="no"  Checksum="no"  Id="xsec_$(var.XmlSecFileVersion)D.pdb" Name="xsec_lib.pdb" />

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the commits mailing list