[cpp-sp COMMIT] in /branches/REL_2/msi/WiX: ShibbolethSP-iis-dialog.wxs ShibbolethSP-main-x64.wxs

[noreply at shibboleth.net]

Author: scantor
Date: Sun May 20 22:22:07 2012
New Revision: 3674

URL: http://svn.shibboleth.net/view/cpp-sp?rev=3674&view=rev
Log:
Config file handling changes

Modified:
    branches/REL_2/msi/WiX/ShibbolethSP-iis-dialog.wxs
    branches/REL_2/msi/WiX/ShibbolethSP-main-x64.wxs

Modified: branches/REL_2/msi/WiX/ShibbolethSP-iis-dialog.wxs
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/msi/WiX/ShibbolethSP-iis-dialog.wxs?rev=3674&r1=3673&r2=3674&view=diff
==============================================================================
--- branches/REL_2/msi/WiX/ShibbolethSP-iis-dialog.wxs (original)
+++ branches/REL_2/msi/WiX/ShibbolethSP-iis-dialog.wxs Sun May 20 22:22:07 2012
@@ -41,7 +41,7 @@
 
         <Control Id='IISLine2' Type='Text' X='25' Y='79' Width='312' Height='20' 
                  Text='This will install the ISAPI filter for IIS, register the specified file extension and create a Web Services Extension entry (IIS 6 and later).'/>
-        <Control Id='InstallISAPICheckBox' Type='CheckBox' X='86' Y='154' Width='180' Height='14' 
+        <Control Id='InstallISAPICheckBox' Type='CheckBox' X='86' Y='120' Width='180' Height='14' 
                  Property='INSTALL_ISAPI_FILTER' Text='Install ISAPI filter and configure IIS' 
                  CheckBoxValue='TRUE' TabSkip='yes' />
 

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=3674&r1=3673&r2=3674&view=diff
==============================================================================
--- branches/REL_2/msi/WiX/ShibbolethSP-main-x64.wxs (original)
+++ branches/REL_2/msi/WiX/ShibbolethSP-main-x64.wxs Sun May 20 22:22:07 2012
@@ -101,10 +101,10 @@
     </Directory><!--TARGETDIR-->
 
     <DirectoryRef Id='etc_shibboleth' FileSource='$(var.SPBuildDirectory)\cpp-sp\configs'>
-      <Component Id='SetService64' Guid='{8DE75314-84B5-4BD1-ABD2-9FC1DEE399DC}' Permanent='yes'>
+      <Component Id='SetService64' Guid='{8DE75314-84B5-4BD1-ABD2-9FC1DEE399DC}'>
         <File KeyPath='yes' Name='SetService64.bat' />
       </Component>
-      <Component Id='SetService32' Guid='{3332A486-845E-4EE4-975F-3D75757EB941}' Permanent='yes'>
+      <Component Id='SetService32' Guid='{3332A486-845E-4EE4-975F-3D75757EB941}'>
         <File KeyPath='yes' Name='SetService32.bat' />
       </Component>
     </DirectoryRef><!-- etc_shibboleth -->