Config file handling changes

git-svn-id: https://svn.shibboleth.net/cpp-sp/branches/REL_2@3674 cb58f699-b61c-0410-a6fe-9272a202ed29

diff --git a/msi/WiX/ShibbolethSP-iis-dialog.wxs b/msi/WiX/ShibbolethSP-iis-dialog.wxs
index 128dd84..21386e3 100644 (file)
--- a/msi/WiX/ShibbolethSP-iis-dialog.wxs
+++ b/msi/WiX/ShibbolethSP-iis-dialog.wxs
@@ -41,7 +41,7 @@
 \r
         <Control Id='IISLine2' Type='Text' X='25' Y='79' Width='312' Height='20' \r
                  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).'/>\r
-        <Control Id='InstallISAPICheckBox' Type='CheckBox' X='86' Y='154' Width='180' Height='14' \r
+        <Control Id='InstallISAPICheckBox' Type='CheckBox' X='86' Y='120' Width='180' Height='14' \r
                  Property='INSTALL_ISAPI_FILTER' Text='Install ISAPI filter and configure IIS' \r
                  CheckBoxValue='TRUE' TabSkip='yes' />\r
 \r

diff --git a/msi/WiX/ShibbolethSP-main-x64.wxs b/msi/WiX/ShibbolethSP-main-x64.wxs
index 78084e2..2fe4dae 100644 (file)
--- a/msi/WiX/ShibbolethSP-main-x64.wxs
+++ b/msi/WiX/ShibbolethSP-main-x64.wxs
@@ -101,10 +101,10 @@
     </Directory><!--TARGETDIR-->\r
 \r
     <DirectoryRef Id='etc_shibboleth' FileSource='$(var.SPBuildDirectory)\cpp-sp\configs'>\r
-      <Component Id='SetService64' Guid='{8DE75314-84B5-4BD1-ABD2-9FC1DEE399DC}' Permanent='yes'>\r
+      <Component Id='SetService64' Guid='{8DE75314-84B5-4BD1-ABD2-9FC1DEE399DC}'>\r
         <File KeyPath='yes' Name='SetService64.bat' />\r
       </Component>\r
-      <Component Id='SetService32' Guid='{3332A486-845E-4EE4-975F-3D75757EB941}' Permanent='yes'>\r
+      <Component Id='SetService32' Guid='{3332A486-845E-4EE4-975F-3D75757EB941}'>\r
         <File KeyPath='yes' Name='SetService32.bat' />\r
       </Component>\r
     </DirectoryRef><!-- etc_shibboleth -->\r