[cpp-sp COMMIT] in /branches/REL_2/msi: WiX/ShibbolethSP-exe-x86.wxs WiX/ShibbolethSP-main-x64.wxs WiX/ShibbolethSP-m...

[noreply at shibboleth.net]

Author: rdw
Date: Thu May 10 15:36:36 2012
New Revision: 3654

URL: http://svn.shibboleth.net/view/cpp-sp?rev=3654&view=rev
Log: (empty)

Added:
    branches/REL_2/msi/scripts/shib_install_isapi_filter.vbs-wix
    branches/REL_2/msi/scripts/shib_uninstall_isapi_filter.vbs-wix
Modified:
    branches/REL_2/msi/WiX/ShibbolethSP-exe-x86.wxs
    branches/REL_2/msi/WiX/ShibbolethSP-main-x64.wxs
    branches/REL_2/msi/WiX/ShibbolethSP-main-x86.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-exe-x86.wxs
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/msi/WiX/ShibbolethSP-exe-x86.wxs?rev=3654&r1=3653&r2=3654&view=diff
==============================================================================
--- branches/REL_2/msi/WiX/ShibbolethSP-exe-x86.wxs (original)
+++ branches/REL_2/msi/WiX/ShibbolethSP-exe-x86.wxs Thu May 10 15:36:36 2012
@@ -116,7 +116,7 @@
                  FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-sp\Release' >
         <Component Id='shibd.exe' Guid='{2476BB80-9384-4026-86F5-E1569A685187}'>
           <File Name='shibd.exe' KeyPath='yes' />
-          <!-- TODO this should not happen on an upgrade (install/uninstall) -->
+          <!-- NOTE - whether this actually happens is predicated in noarch on whether this is an upgrade or not -->
           <ServiceInstall Id='shibd' Name='shibd_Default' 
                           DisplayName='Shibboleth 2 Daemon (Default)' Type='ownProcess' 
                           Start='auto' ErrorControl='ignore' />

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=3654&r1=3653&r2=3654&view=diff
==============================================================================
--- branches/REL_2/msi/WiX/ShibbolethSP-main-x64.wxs (original)
+++ branches/REL_2/msi/WiX/ShibbolethSP-main-x64.wxs Thu May 10 15:36:36 2012
@@ -24,6 +24,9 @@
            UpgradeCode='$(var.ShibbolethUpgradeCode)' Version='$(var.ShibbolethVersion)'>
     <Package Description='Installer for Shibboleth SP (x86 and x64)' Compressed='yes'
              Manufacturer='Shibboleth Consortium' InstallerVersion='300' Platform='x64'/>
+
+    <MajorUpgrade DowngradeErrorMessage="A later version of [ProductName] is already installed. Setup will now exit." 
+                  MigrateFeatures="yes"  Schedule="afterInstallExecute" />
 
     <PropertyRef Id='SHIB_OLDVERSION_64'/>
     <PropertyRef Id='SHIB_OLDVERSION'/>
@@ -99,8 +102,6 @@
       </Component>
     </DirectoryRef><!-- etc_shibboleth -->
 
-    <!-- TODO use QtExecCmdLine to execute SetX64Shibd -->
-
     <Feature Id='Shibboleth' Title='Shibboleth' Level='1' Display='hidden' 
              ConfigurableDirectory='INSTALLDIR'>
       <MergeRef Id='CurlMergeModule_x86'/>

Modified: branches/REL_2/msi/WiX/ShibbolethSP-main-x86.wxs
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/msi/WiX/ShibbolethSP-main-x86.wxs?rev=3654&r1=3653&r2=3654&view=diff
==============================================================================
--- branches/REL_2/msi/WiX/ShibbolethSP-main-x86.wxs (original)
+++ branches/REL_2/msi/WiX/ShibbolethSP-main-x86.wxs Thu May 10 15:36:36 2012
@@ -24,6 +24,9 @@
            UpgradeCode='$(var.ShibbolethUpgradeCode)' Version='$(var.ShibbolethVersion)'>
     <Package Description='Installer for Shibboleth SP (x86 and x64)' Compressed='yes'
              Manufacturer='Shibboleth Consortium' InstallerVersion='300'/>
+
+    <MajorUpgrade DowngradeErrorMessage="A later version of [ProductName] is already installed. Setup will now exit." 
+                  MigrateFeatures="yes"  Schedule="afterInstallExecute" />
 
     <PropertyRef Id='SHIB_OLDVERSION'/>
 

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=3654&r1=3653&r2=3654&view=diff
==============================================================================
--- branches/REL_2/msi/WiX/ShibbolethSP-noarch.wxs (original)
+++ branches/REL_2/msi/WiX/ShibbolethSP-noarch.wxs Thu May 10 15:36:36 2012
@@ -1,5 +1,4 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<!-- TODO etc is uninstallable, etc\dist isn't -->
 <!-- Licensed to the University Corporation for Advanced Internet
      Development, Inc. (UCAID) under one or more contributor license
      agreements.  See the NOTICE file distributed with this work for
@@ -173,15 +172,69 @@
 
     <CustomAction Id='KeyGen' BinaryKey='WixCA' DllEntry='CAQuietExec' Execute='deferred' Impersonate='no' />
     <CustomAction Id='SetKeyGen' Property='KeyGen' Value='&quot;[INSTALLDIR]etc\shibboleth\keygen.bat&quot;' />
-    
-    <!-- TODO IIS Install (if not ALREADYINSTALLED)
-         TODO IIS Uninstalll (if UGRADINGPRODUCTCODE) -->
+
+    <Binary Id='install_isapi' 

[... 139 lines stripped ...]