SSPCPP-452 (add scripts to swap architecture of shibd). Also fix bug whereby we...

diff --git a/configs/SetService32.bat b/configs/SetService32.bat
new file mode 100644 (file)
index 0000000..1aa7f70
--- /dev/null
+++ b/configs/SetService32.bat
@@ -0,0 +1,5 @@
+@echo off
+setlocal
+sc stop shibd_default
+sc config shibd_default binPath= "@-INSTALLDIR-@\sbin\shibd.exe"
+sc start shibd_default

diff --git a/configs/SetService64.bat b/configs/SetService64.bat
new file mode 100644 (file)
index 0000000..bf67d28
--- /dev/null
+++ b/configs/SetService64.bat
@@ -0,0 +1,5 @@
+@echo off
+setlocal
+sc stop shibd_default
+sc config shibd_default binPath= "@-INSTALLDIR-@\sbin64\shibd.exe"
+sc start shibd_default

diff --git a/msi/WiX/ShibbolethSP-defs-x86.wxi b/msi/WiX/ShibbolethSP-defs-x86.wxi
index 2c5c47a..c8cb2ed 100644 (file)
--- a/msi/WiX/ShibbolethSP-defs-x86.wxi
+++ b/msi/WiX/ShibbolethSP-defs-x86.wxi
@@ -14,12 +14,11 @@
   <ComponentRef Id='upgrade.xsl'/>\r
   <ComponentRef Id='examplemetadata.xml'/>\r
   <ComponentRef Id='exampleshibboleth2.xml'/> \r
-\r
-  <ComponentRef Id='etc_shibboleth_nonperm'/>\r
+  <ComponentRef Id='xsltproc.js'/>\r
+  <ComponentRef Id='keygen.bat'/>\r
 \r
   <ComponentRef Id='dist_noperm'/>\r
   <ComponentRef Id='sslError.html'/>\r
-  <ComponentRef Id='xsltproc.js'/>\r
   <ComponentRef Id='bindingTemplate.html'/>\r
   <ComponentRef Id='globalLogout.html'/>\r
   <ComponentRef Id='localLogout.html'/>\r

diff --git a/msi/WiX/ShibbolethSP-main-x64.wxs b/msi/WiX/ShibbolethSP-main-x64.wxs
index 517618a..20976b8 100644 (file)
--- a/msi/WiX/ShibbolethSP-main-x64.wxs
+++ b/msi/WiX/ShibbolethSP-main-x64.wxs
@@ -66,6 +66,7 @@
         <Merge Id='CurlMergeModule_x64' Language='1033' SourceFile='MergeModules\Curl-x64.msm' DiskId='1' />\r
         <Merge Id='FastCGIMergeModule_x64' Language='1033' SourceFile='MergeModules\FastCGI-x64.msm' DiskId='1' />\r
         <Merge Id='Log4ShibMergeModule_x64' Language='1033' SourceFile='MergeModules\Log4Shib-x64.msm' DiskId='1' />\r
+        <Merge Id='OpenSSLMergeModule_x64' Language='1033' SourceFile='MergeModules\OpenSSL-x64.msm' DiskId='1' />\r
         <Merge Id='ShibbolethMergeModule_x64' Language='1033' SourceFile='MergeModules\Shibboleth-x64.msm' DiskId='1' />\r
         <Merge Id='XercesMergeModule_x64' Language='1033' SourceFile='MergeModules\Xerces-x64.msm' DiskId='1' />\r
         <Merge Id='XmlSecMergeModule_x64' Language='1033' SourceFile='MergeModules\XmlSec-x64.msm' DiskId='1' />\r
@@ -89,6 +90,15 @@
 \r
     </Directory><!--TARGETDIR-->\r
 \r
+    <DirectoryRef Id='etc_shibboleth' FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-sp\configs'>\r
+      <Component Id='SetService64' Guid='{8DE75314-84B5-4BD1-ABD2-9FC1DEE399DC}' Permanent='yes'>\r
+        <File KeyPath='yes' Name='SetService64.bat' />\r
+      </Component>\r
+      <Component Id='SetService32' Guid='{3332A486-845E-4EE4-975F-3D75757EB941}' Permanent='yes'>\r
+        <File KeyPath='yes' Name='SetService32.bat' />\r
+      </Component>\r
+    </DirectoryRef><!-- etc_shibboleth -->\r
+\r
     <!-- TODO use QtExecCmdLine to execute SetX64Shibd -->\r
 \r
     <Feature Id='Shibboleth' Title='Shibboleth' Level='1' Display='hidden' \r
@@ -109,6 +119,7 @@
       <MergeRef Id='CurlMergeModule_x64'/>\r
       <MergeRef Id='FastCGIMergeModule_x64'/>\r
       <MergeRef Id='Log4ShibMergeModule_x64'/>\r
+      <MergeRef Id='OpenSSLMergeModule_x64'/>\r
       <MergeRef Id='ShibbolethMergeModule_x64'/>\r
       <MergeRef Id='XercesMergeModule_x64'/>\r
       <MergeRef Id='XmlSecMergeModule_x64'/>\r
@@ -152,6 +163,9 @@
       <ComponentRef Id='SetPath'/>\r
       <ComponentRef Id='SetPath64'/>\r
 \r
+      <ComponentRef Id='SetService64' />\r
+      <ComponentRef Id='SetService32' />\r
+\r
       <?include ShibbolethSP-defs-x86.wxi ?>\r
 \r
     </Feature>\r

diff --git a/msi/WiX/ShibbolethSP-noarch.wxs b/msi/WiX/ShibbolethSP-noarch.wxs
index 2a8acd4..6e4d0f9 100644 (file)
--- a/msi/WiX/ShibbolethSP-noarch.wxs
+++ b/msi/WiX/ShibbolethSP-noarch.wxs
@@ -72,10 +72,10 @@
                      Permanent='yes'>\r
             <File Name='example-shibboleth2.xml' />\r
           </Component>\r
-          <Component Id='etc_shibboleth_nonperm' Guid='{A5BBCB8B-42B3-4402-B66D-66D2971F509F}'>\r
+          <Component Id='keygen.bat' Guid='{A5BBCB8B-42B3-4402-B66D-66D2971F509F}'  Permanent='yes'>\r
             <File Name='keygen.bat' KeyPath='yes' Source='$(var.BuildDirectory)\cvs\2.0\cpp-sp\configs\keygen.bat-wix'/>\r
           </Component>\r
-          <Component Id='xsltproc.js' Guid='{B87F4A53-3C37-45DA-BE6F-C46790FA7C2D}'>\r
+          <Component Id='xsltproc.js' Guid='{B87F4A53-3C37-45DA-BE6F-C46790FA7C2D}'  Permanent='yes'>\r
             <File Name='xsltproc.js' />\r
           </Component>\r
           <Directory Id='etc_shibboleth_dist' Name='dist' \r
@@ -123,25 +123,25 @@
             <Component Id='securitypolicy.xml' Guid='{0EC04525-FCCF-4B60-8797-9B0CEC222B8C}'>\r
               <File Name='security-policy.xml' />\r
             </Component>\r
-            <Component Id='accessError.html' Guid='{6FAA81A0-A020-4E60-A37D-1EC4D0D5FD06}' Permanent='yes'>\r
+            <Component Id='accessError.html' Guid='{6FAA81A0-A020-4E60-A37D-1EC4D0D5FD06}'>\r
               <File Name='accessError.html' />\r
             </Component>\r
-            <Component Id='apache.config' Guid='{AF4EB2B1-2489-4E39-A89E-1CA7AC2B7483}' Permanent='yes'>\r
+            <Component Id='apache.config' Guid='{AF4EB2B1-2489-4E39-A89E-1CA7AC2B7483}'>\r
               <File Name='apache.config.in' />\r
             </Component>\r
-            <Component Id='apache2.config' Guid='{85BF72A1-FBA8-4955-ACCF-ABC83B1292C9}' Permanent='yes'>\r
+            <Component Id='apache2.config' Guid='{85BF72A1-FBA8-4955-ACCF-ABC83B1292C9}'>\r
               <File Name='apache2.config.in' KeyPath='yes' />\r
             </Component>\r
-            <Component Id='metadataError.html' Guid='{8C46D04A-A943-4FA4-AFCB-9B040306C2C0}' Permanent='yes'>\r
+            <Component Id='metadataError.html' Guid='{8C46D04A-A943-4FA4-AFCB-9B040306C2C0}'>\r
               <File  Name='metadataError.html' KeyPath='yes' />\r
             </Component>\r
-            <Component Id='native.logger' Guid='{8586D4C7-E237-4C7F-BC79-DE0B06473395}' Permanent='yes'>\r
+            <Component Id='native.logger' Guid='{8586D4C7-E237-4C7F-BC79-DE0B06473395}'>\r
               <File Name='native.logger.in' KeyPath='yes' />\r
             </Component>\r
-            <Component Id='sessionError.html' Guid='{8AA240B3-DC5D-4687-B321-4F5E1BAEA820}' Permanent='yes'>\r
+            <Component Id='sessionError.html' Guid='{8AA240B3-DC5D-4687-B321-4F5E1BAEA820}'>\r
               <File Name='sessionError.html' KeyPath='yes' />\r
             </Component>\r
-            <Component Id='shibd.logger' Guid='{D8DA3D14-F779-4691-A883-4995158D2A74}' Permanent='yes'>\r
+            <Component Id='shibd.logger' Guid='{D8DA3D14-F779-4691-A883-4995158D2A74}'>\r
               <File Name='shibd.logger.in' KeyPath='yes' />\r
             </Component>\r
           </Directory><!-- etc_shibboleth_dist -->\r
@@ -197,13 +197,11 @@
          <ComponentRef Id='upgrade.xsl'/>\r
          <ComponentRef Id='examplemetadata.xml'/>\r
          <ComponentRef Id='exampleshibboleth2.xml' \r
-\r
-         <ComponentRef Id='etc_shibboleth_nonperm'/>\r
+         <ComponentRef Id='xsltproc.js'/>\r
+         <ComponentRef Id='keygen.bat'/>\r
 \r
          <ComponentRef Id='dist_noperm'/>\r
-         <ComponentRef Id='xsltproc.js'/>\r
          <ComponentRef Id='sslError.html'/>\r
-         <ComponentRef Id='xsltproc.js'/>\r
          <ComponentRef Id='bindingTemplate.html'/>\r
          <ComponentRef Id='globalLogout.html'/>\r
          <ComponentRef Id='localLogout.html'/>\r

diff --git a/msi/WiX/ShibbolethSP-properties.wxi b/msi/WiX/ShibbolethSP-properties.wxi
index 0e210f5..ccb2a50 100644 (file)
--- a/msi/WiX/ShibbolethSP-properties.wxi
+++ b/msi/WiX/ShibbolethSP-properties.wxi
@@ -32,7 +32,7 @@
   <!-- Install shibd_service -->\r
   <Property Id="INSTALL_SHIBD_SERVICE" Value="TRUE" Secure="yes" />\r
   <!-- 64 bit or 32bit service and DLLS, also used to swap in the 64 bit service -->\r
-  <Property Id="OUR_DLL_PATH" Secure="yes" />\r
+  <Property Id="INSTALL_32BIT" Secure="yes" />\r
   <Property Id="SHIBD_PORT" Value="1600" Secure="yes" />\r
 \r
   <Property Id="ARPCONTACT" Value="contact@shibboleth.net" />\r

diff --git a/msi/scripts/shib_edit_config_files.vbs-wix b/msi/scripts/shib_edit_config_files.vbs-wix
index a9ecb9b..86f7dc8 100644 (file)
--- a/msi/scripts/shib_edit_config_files.vbs-wix
+++ b/msi/scripts/shib_edit_config_files.vbs-wix
@@ -187,6 +187,13 @@ if (Err = 0) then
   If (NOT FileSystemObj.FileExists(ConfigDir & "protocols.xml")) then\r
     FileSystemObj.CopyFile DistDir & "protocols.xml", ConfigDir, false\r
   End If\r
+\r
+  ConfigFile  = ConfigDir & "SetService64.bat"\r
+  ReplaceInFile ConfigFile, "@-INSTALLDIR-@", InstallDir\r
+\r
+  ConfigFile  = ConfigDir & "SetService32.bat"\r
+  ReplaceInFile ConfigFile, "@-INSTALLDIR-@", InstallDir\r
   \r
+\r
 'Last End If\r
 End If
\ No newline at end of file