[cpp-sp COMMIT] in /branches/REL_2: configs/SetService32.bat configs/SetService64.bat msi/WiX/ShibbolethSP-defs-x86.w...

[noreply at shibboleth.net]

Author: rdw
Date: Wed May  9 17:51:05 2012
New Revision: 3653

URL: http://svn.shibboleth.net/view/cpp-sp?rev=3653&view=rev
Log:
SSPCPP-452 (add scripts to swap architecture of shibd).  Also fix bug whereby we had accidently removed 64 bit OpenSSL, and make 'etc' files permanent and 'etc\dist' files non permanent

Added:
    branches/REL_2/configs/SetService32.bat   (with props)
    branches/REL_2/configs/SetService64.bat   (with props)
Modified:
    branches/REL_2/msi/WiX/ShibbolethSP-defs-x86.wxi
    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
    branches/REL_2/msi/scripts/shib_edit_config_files.vbs-wix

Modified: branches/REL_2/msi/WiX/ShibbolethSP-defs-x86.wxi
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/msi/WiX/ShibbolethSP-defs-x86.wxi?rev=3653&r1=3652&r2=3653&view=diff
==============================================================================
--- branches/REL_2/msi/WiX/ShibbolethSP-defs-x86.wxi (original)
+++ branches/REL_2/msi/WiX/ShibbolethSP-defs-x86.wxi Wed May  9 17:51:05 2012
@@ -14,12 +14,11 @@
   <ComponentRef Id='upgrade.xsl'/>
   <ComponentRef Id='examplemetadata.xml'/>
   <ComponentRef Id='exampleshibboleth2.xml'/> 
-
-  <ComponentRef Id='etc_shibboleth_nonperm'/>
+  <ComponentRef Id='xsltproc.js'/>
+  <ComponentRef Id='keygen.bat'/>
 
   <ComponentRef Id='dist_noperm'/>
   <ComponentRef Id='sslError.html'/>
-  <ComponentRef Id='xsltproc.js'/>
   <ComponentRef Id='bindingTemplate.html'/>
   <ComponentRef Id='globalLogout.html'/>
   <ComponentRef Id='localLogout.html'/>

Modified: branches/REL_2/msi/WiX/ShibbolethSP-main-x64.wxs
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/msi/WiX/ShibbolethSP-main-x64.wxs?rev=3653&r1=3652&r2=3653&view=diff
==============================================================================
--- branches/REL_2/msi/WiX/ShibbolethSP-main-x64.wxs (original)
+++ branches/REL_2/msi/WiX/ShibbolethSP-main-x64.wxs Wed May  9 17:51:05 2012
@@ -66,6 +66,7 @@
         <Merge Id='CurlMergeModule_x64' Language='1033' SourceFile='MergeModules\Curl-x64.msm' DiskId='1' />
         <Merge Id='FastCGIMergeModule_x64' Language='1033' SourceFile='MergeModules\FastCGI-x64.msm' DiskId='1' />
         <Merge Id='Log4ShibMergeModule_x64' Language='1033' SourceFile='MergeModules\Log4Shib-x64.msm' DiskId='1' />
+        <Merge Id='OpenSSLMergeModule_x64' Language='1033' SourceFile='MergeModules\OpenSSL-x64.msm' DiskId='1' />
         <Merge Id='ShibbolethMergeModule_x64' Language='1033' SourceFile='MergeModules\Shibboleth-x64.msm' DiskId='1' />
         <Merge Id='XercesMergeModule_x64' Language='1033' SourceFile='MergeModules\Xerces-x64.msm' DiskId='1' />
         <Merge Id='XmlSecMergeModule_x64' Language='1033' SourceFile='MergeModules\XmlSec-x64.msm' DiskId='1' />
@@ -89,6 +90,15 @@
 
     </Directory><!--TARGETDIR-->
 
+    <DirectoryRef Id='etc_shibboleth' FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-sp\configs'>
+      <Component Id='SetService64' Guid='{8DE75314-84B5-4BD1-ABD2-9FC1DEE399DC}' Permanent='yes'>
+        <File KeyPath='yes' Name='SetService64.bat' />
+      </Component>
+      <Component Id='SetService32' Guid='{3332A486-845E-4EE4-975F-3D75757EB941}' Permanent='yes'>
+        <File KeyPath='yes' Name='SetService32.bat' />
+      </Component>
+    </DirectoryRef><!-- etc_shibboleth -->
+
     <!-- TODO use QtExecCmdLine to execute SetX64Shibd -->
 
     <Feature Id='Shibboleth' Title='Shibboleth' Level='1' Display='hidden' 
@@ -109,6 +119,7 @@
       <MergeRef Id='CurlMergeModule_x64'/>
       <MergeRef Id='FastCGIMergeModule_x64'/>
       <MergeRef Id='Log4ShibMergeModule_x64'/>
+      <MergeRef Id='OpenSSLMergeModule_x64'/>
       <MergeRef Id='ShibbolethMergeModule_x64'/>
       <MergeRef Id='XercesMergeModule_x64'/>
       <MergeRef Id='XmlSecMergeModule_x64'/>
@@ -152,6 +163,9 @@
       <ComponentRef Id='SetPath'/>
       <ComponentRef Id='SetPath64'/>
 
+      <ComponentRef Id='SetService64' />
+      <ComponentRef Id='SetService32' />
+
       <?include ShibbolethSP-defs-x86.wxi ?>
 
     </Feature>

Modified: branches/REL_2/msi/WiX/ShibbolethSP-noarch.wxs
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/msi/WiX/ShibbolethSP-noarch.wxs?rev=3653&r1=3652&r2=3653&view=diff
==============================================================================
--- branches/REL_2/msi/WiX/ShibbolethSP-noarch.wxs (original)
+++ branches/REL_2/msi/WiX/ShibbolethSP-noarch.wxs Wed May  9 17:51:05 2012
@@ -72,10 +72,10 @@
                      Permanent='yes'>
             <File Name='example-shibboleth2.xml' />
           </Component>
-          <Component Id='etc_shibboleth_nonperm' Guid='{A5BBCB8B-42B3-4402-B66D-66D2971F509F}'>
+          <Component Id='keygen.bat' Guid='{A5BBCB8B-42B3-4402-B66D-66D2971F509F}'  Permanent='yes'>
             <File Name='keygen.bat' KeyPath='yes' Source='$(var.BuildDirectory)\cvs\2.0\cpp-sp\configs\keygen.bat-wix'/>
           </Component>

[... 90 lines stripped ...]