[cpp-sp COMMIT] in /branches/REL_2/msi/WiX: Compile.bat MergeModules/Curl-x86.wxs MergeModules/OpenSAML-schemas.wxs M...

[noreply at shibboleth.net]

Author: rdw
Date: Mon May  7 17:04:44 2012
New Revision: 3646

URL: http://svn.shibboleth.net/view/cpp-sp?rev=3646&view=rev
Log:
More work on making the x64 installer work.  TODOs added.  X86 install clean compiles

Added:
    branches/REL_2/msi/WiX/ShibbolethSP-defs-x86.wxi
    branches/REL_2/msi/WiX/ShibbolethSP-main-x86.wxs
Modified:
    branches/REL_2/msi/WiX/Compile.bat
    branches/REL_2/msi/WiX/MergeModules/Curl-x86.wxs
    branches/REL_2/msi/WiX/MergeModules/OpenSAML-schemas.wxs
    branches/REL_2/msi/WiX/MergeModules/XmlTooling-schemas.wxs
    branches/REL_2/msi/WiX/MergeModules/Zlib-x64.wxs
    branches/REL_2/msi/WiX/ShibbolethSP-main-x64.wxs
    branches/REL_2/msi/WiX/ShibbolethSP-noarch.wxs
    branches/REL_2/msi/WiX/ShibbolethSP-properties.wxi

Modified: branches/REL_2/msi/WiX/Compile.bat
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/msi/WiX/Compile.bat?rev=3646&r1=3645&r2=3646&view=diff
==============================================================================
--- branches/REL_2/msi/WiX/Compile.bat (original)
+++ branches/REL_2/msi/WiX/Compile.bat Mon May  7 17:04:44 2012
@@ -17,4 +17,8 @@
 candle ShibbolethSP-main-x64.wxs
 light -sw1055 -sice:ICE82 -o ShibbolethSP-main-x64.msi ShibbolethSP-main-x64.wixobj ShibbolethSP-exe-x64.wixobj ShibbolethSP-registry-x64.wixobj  ShibbolethSP-noarch.wixobj ShibbolethSP-exe-x86.wixobj ShibbolethSP-registry-x86.wixobj
 
+wixcop -indent:2 ShibbolethSP-main-x86.wxs
+candle ShibbolethSP-main-x86.wxs
+light -sw1055 -sice:ICE82 -o ShibbolethSP-main-x86.msi ShibbolethSP-main-x86.wixobj ShibbolethSP-noarch.wixobj ShibbolethSP-exe-x86.wixobj ShibbolethSP-registry-x86.wixobj
 
+

Modified: branches/REL_2/msi/WiX/MergeModules/Curl-x86.wxs
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/msi/WiX/MergeModules/Curl-x86.wxs?rev=3646&r1=3645&r2=3646&view=diff
==============================================================================
--- branches/REL_2/msi/WiX/MergeModules/Curl-x86.wxs (original)
+++ branches/REL_2/msi/WiX/MergeModules/Curl-x86.wxs Mon May  7 17:04:44 2012
@@ -22,7 +22,7 @@
   <Module Id='CurlMergeModule_x86' Language='1033' Version='$(var.CurlVersion)'>
     <Package Id='10467105-6375-49E1-AC35-045084BD8FA4' Description='Merge Module for CURL (x86)'
              Comments='This module is built by the Shibboleth Consortium.'
-             Manufacturer='Shibboleth Consortium' InstallerVersion='405' Platform='x64'/>
+             Manufacturer='Shibboleth Consortium' InstallerVersion='400'/>
 
     <Directory Id='TARGETDIR' Name='SourceDir'>
       <Directory Id='ProgramFilesFolder' Name='ProgramFiles'>

Modified: branches/REL_2/msi/WiX/MergeModules/OpenSAML-schemas.wxs
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/msi/WiX/MergeModules/OpenSAML-schemas.wxs?rev=3646&r1=3645&r2=3646&view=diff
==============================================================================
--- branches/REL_2/msi/WiX/MergeModules/OpenSAML-schemas.wxs (original)
+++ branches/REL_2/msi/WiX/MergeModules/OpenSAML-schemas.wxs Mon May  7 17:04:44 2012
@@ -26,85 +26,87 @@
 
     <Directory Id='TARGETDIR' Name='SourceDir'>
       <Directory Id='CommonAppDataFolder' Name='CommonFiles' >
-        <Directory Id='common_shibboleth' Name='Shibboleth' >
-          <Directory Id='common_sp' Name='SP' >
-            <Directory Id='common_doc' Name='doc'
-                       FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-opensaml\schemas\' >
-              <Component Id='schema_assertion_01' Guid='{3BB83A55-9212-40F4-86E1-D95CEDAE5501}'>
-                <File Name='cs-sstc-schema-assertion-01.xsd' KeyPath='yes' />
-              </Component>
-              <Component Id='schema_assertion_1_1' Guid='{71ED2BC0-50EE-48D5-9649-5F7C5A8388F3}'>
-                <File Name='cs-sstc-schema-assertion-1.1.xsd' KeyPath='yes' />
-              </Component>
-              <Component Id='schema_protocol_1_1' Guid='{DD3829CB-F91A-4291-85F8-771E0930E9F1}'>
-                <File Name="cs-sstc-schema-protocol-01.xsd" KeyPath="yes" />
-              </Component>
-              <Component Id='schema_protocol_01' Guid='{E0CD8123-B42F-4F15-B4B4-A4F99DE68F8E}'>
-                <File Name='cs-sstc-schema-protocol-1.1.xsd'/>
-              </Component>
-              <Component Id='samlschema' Guid='{355CA6A9-57F9-491D-8D1A-33161CDE6DF1}' >
-                <File Name='saml10-catalog.xml' 
-                      Source='$(var.BuildDirectory)\cvs\2.0\cpp-opensaml\schemas\saml10-catalog.xml.in' />
-                <File Name='saml11-catalog.xml' 
-                      Source='$(var.BuildDirectory)\cvs\2.0\cpp-opensaml\schemas\saml11-catalog.xml.in' />
-                <File Name='saml20-catalog.xml' 
-                      Source='$(var.BuildDirectory)\cvs\2.0\cpp-opensaml\schemas\saml20-catalog.xml.in' />
-                <File Name='saml-schema-assertion-2.0.xsd'/>
-                <File Name='saml-schema-authn-context-2.0.xsd'/>
-                <File Id='a_c_auth_telephony2.0.xsd' 

[... 470 lines stripped ...]