Updated for 2.5 fileset plus various cleanups

[shibboleth/sp.git] / msi / WiX / ShibbolethSP-registry-x86.wxs

diff --git a/msi/WiX/ShibbolethSP-registry-x86.wxs b/msi/WiX/ShibbolethSP-registry-x86.wxs
index 712a3ba..ac988a4 100644 (file)
--- a/msi/WiX/ShibbolethSP-registry-x86.wxs
+++ b/msi/WiX/ShibbolethSP-registry-x86.wxs
@@ -19,10 +19,11 @@
 <?include Versions.wxi ?>\r
 \r
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
-  <!-- This is where we put all the architecture neutral bits of the\r
-       Shibboleth install.  It turns out that it may not be all the\r
-       architecture insenstive stuff since some GUIDS may have moved\r
-       -->\r
+  <!--\r
+    This is where we put all the architecture neutral bits of the\r
+    Shibboleth install.  It turns out that it may not be all the\r
+    architecture insenstive stuff since some GUIDS may have moved\r
+  -->\r
   <Fragment>\r
     <!-- Previous version search -->\r
     <Property Id='SHIB_OLDVERSION' Value='none' Secure='yes'>\r
@@ -72,15 +73,10 @@
       </Component>\r
 \r
       <Component Id='shib.ico' Guid='{FA0F86A1-0731-4D66-8216-BC74D231B598}'>\r
-        <File KeyPath='yes' Source='$(var.BuildDirectory)\cvs\2.0\cpp-sp\msi\shib.ico' />\r
+        <File KeyPath='yes' Source='$(var.SPBuildDirectory)\cpp-sp\msi\shib.ico' />\r
         <RegistryValue Root='HKLM' Key='Software\Microsoft\Windows\CurrentVersion\Uninstall\[ProductCode]' \r
                        Name='DisplayIcon' Value='[#shib.ico],0' Type='string' />\r
       </Component>\r
     </DirectoryRef>\r
-  <!--\r
-     <ComponentRef Id='file_extension'/>\r
-     <ComponentRef Id='shib.ico' />\r
-     -->\r
-\r
   </Fragment>\r
 </Wix>\r