[cpp-sp COMMIT] in /branches/REL_2/msi/WiX: ShibbolethSP-defs-x86.wxi ShibbolethSP-install-dlg.wxs ShibbolethSP-main-...

[noreply at shibboleth.net]

Author: rdw
Date: Mon Jul  9 06:09:16 2012
New Revision: 3725

URL: http://svn.shibboleth.net/view/cpp-sp?rev=3725&view=rev
Log:
Remove the option of not installing shibd_default

Modified:
    branches/REL_2/msi/WiX/ShibbolethSP-defs-x86.wxi
    branches/REL_2/msi/WiX/ShibbolethSP-install-dlg.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
    branches/REL_2/msi/WiX/ShibbolethSP-registry-x64.wxs
    branches/REL_2/msi/WiX/ShibbolethSP-registry-x86.wxs

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=3725&r1=3724&r2=3725&view=diff
==============================================================================
--- branches/REL_2/msi/WiX/ShibbolethSP-defs-x86.wxi (original)
+++ branches/REL_2/msi/WiX/ShibbolethSP-defs-x86.wxi Mon Jul  9 06:09:16 2012
@@ -3,7 +3,6 @@
   <!-- ShibbolethSP-noarch -->
 
   <ComponentRef Id='main.css'/>
-  <ComponentRef Id='logo.jpg'/>
   <ComponentRef Id='CREDITS.txt'/>
   <ComponentRef Id='LICENSE.txt'/>
   <ComponentRef Id='NOTICE.txt'/>
@@ -82,7 +81,6 @@
 
   <!-- ShibbolethSP-registry-x32 -->
   <ComponentRef Id='TargetDir'/>
-  <ComponentRef Id='InstallShibd'/>
   <ComponentRef Id='InstallIsapi'/>
   <ComponentRef Id='file_extension'/>
   <ComponentRef Id='shib.ico' />

Modified: branches/REL_2/msi/WiX/ShibbolethSP-install-dlg.wxs
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/msi/WiX/ShibbolethSP-install-dlg.wxs?rev=3725&r1=3724&r2=3725&view=diff
==============================================================================
--- branches/REL_2/msi/WiX/ShibbolethSP-install-dlg.wxs (original)
+++ branches/REL_2/msi/WiX/ShibbolethSP-install-dlg.wxs Mon Jul  9 06:09:16 2012
@@ -25,7 +25,6 @@
 
       <!-- This Dialog sets up:
            - INSTALLDIR
-           - INSTALL_SHIBD_SERVICE
            - INSTALL_32BIT (if a 64bit machine)
            - INSTALL_ISAPI_FILTER (if IIS about)
            - SHIB_FILE_EXTENSION (if IIS about)
@@ -58,12 +57,11 @@
         </Control>
 
         <!-- Service? -->
-        <Control Id='InstallShibd' Type='CheckBox' X='25' Y='146' Height='17' Width='160' 
-                 Property='INSTALL_SHIBD_SERVICE' CheckBoxValue='TRUE' 
-                 Text='Install shibd as Service' />
+        <Control Id='InstallShibd' Type='Text' X='25' Y='148' Height='17' Width='235' 
+                 Text='The Shibboleth daemon will be installed as service shibd_default.' />
 
         <!-- 32 Bits? -->
-        <Control Id='Install32Bit' Type='CheckBox' X='185' Y='146' Height='17' Width='160'
+        <Control Id='Install32Bit' Type='CheckBox' X='265' Y='146' Height='17' Width='80'
                  Property='INSTALL_32BIT' CheckBoxValue='TRUE' 
                  Text='Run as 32-Bit'>
           <Condition Action='show'>IS64BITINSTALL = "TRUE"</Condition>

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=3725&r1=3724&r2=3725&view=diff
==============================================================================
--- branches/REL_2/msi/WiX/ShibbolethSP-main-x64.wxs (original)
+++ branches/REL_2/msi/WiX/ShibbolethSP-main-x64.wxs Mon Jul  9 06:09:16 2012
@@ -172,7 +172,6 @@
 
       <!-- ShibbolethSP-registry-x64 -->
       <ComponentRef Id='TargetDir64'/>
-      <ComponentRef Id='InstallShibd64'/>
       <ComponentRef Id='InstallIsapi64'/>
       <ComponentRef Id='Install32Bit64'/>
       <ComponentRef Id='file_extension64'/>

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=3725&r1=3724&r2=3725&view=diff
==============================================================================
--- branches/REL_2/msi/WiX/ShibbolethSP-noarch.wxs (original)
+++ branches/REL_2/msi/WiX/ShibbolethSP-noarch.wxs Mon Jul  9 06:09:16 2012
@@ -204,9 +204,6 @@
     <CustomAction Id='InheritInstallDir' Property='INSTALLDIR' Value='[OLD_INSTALLDIR]' />
     <CustomAction Id='InheritInstallDir64' Property='INSTALLDIR' Value='[OLD_INSTALLDIR64]' />
 
-    <!-- Set INSTALL_SHIBD correctly -->
-    <CustomAction Id='ClearInstallShibd' Property='INSTALL_SHIBD_SERVICE' Value='FALSE' />
-
     <InstallUISequence>
       <!-- All we need to sequence here is setting up inherited INSTALLDIR -->
 
@@ -254,10 +251,10 @@
       <!-- set service path to 64 bit one if this is an install and if we were told to -->
 
       <Custom Action='SetServicePath64' Before='CostInitialize'>
-        (NOT Installed) AND (INSTALL_SHIBD_SERVICE = "TRUE") AND (NOT ALREADYINSTALLED) AND (NOT INSTALL_32BIT) AND (IS64BITINSTALL = "TRUE")
+        (NOT Installed) AND (NOT ALREADYINSTALLED) AND (NOT INSTALL_32BIT) AND (IS64BITINSTALL = "TRUE")
       </Custom>
       <Custom Action='ServicePath64' After='InstallServices'>

[... 103 lines stripped ...]