[svn] r7646: nemerle/trunk/misc/packages/wix: buildSetup.cmd src/CompilerAndTools.wxs src/Generated.wxi sr...

[pbludov]

Log:
wix installer fixes.

Author: pbludov
Date: Wed May  2 08:25:31 2007
New Revision: 7646

Removed:
   nemerle/trunk/misc/packages/wix/src/Generated.wxi
Modified:
   nemerle/trunk/misc/packages/wix/buildSetup.cmd
   nemerle/trunk/misc/packages/wix/src/CompilerAndTools.wxs
   nemerle/trunk/misc/packages/wix/src/Version.wxi
   nemerle/trunk/misc/packages/wix/src/vs-plugin.wxs

Modified: nemerle/trunk/misc/packages/wix/buildSetup.cmd
==============================================================================
--- nemerle/trunk/misc/packages/wix/buildSetup.cmd	(original)
+++ nemerle/trunk/misc/packages/wix/buildSetup.cmd	Wed May  2 08:25:31 2007
@@ -53,16 +53,13 @@
 set GeneratedFile=%~dp0src\Generated.wxi
 set MsiFile=%~dp0redist\Nemerle.msi
 
-rem
-rem Add some assemblies to GAC.
-rem
-
-GacUtil -i %NemerleSetupContent%\bin\Nemerle.dll
-GacUtil -i %NemerleSetupContent%\bin\Nemerle.Macros.dll
-GacUtil -i %NemerleSetupContent%\bin\Nemerle.Compiler.dll
+
+rem Change current directory to dist/bin to help RegPkg.exe find the right dlls.
+cd "%~dp0dist\bin"
 
 "%RegPkgDir%\RegPkg.exe" /root:Software\Microsoft\VisualStudio\8.0 "/wixfile:%GeneratedFile%" /codebase "%NemerleSetupContent%\vs-plugin\Nemerle.VisualStudio.dll"
 if errorlevel 1 goto done
+cd "%~dp0"
 
 "%WixDir%\candle.exe" -ext WixNetFxExtension -sw1080 src/*.wxs
 if errorlevel 1 goto done
@@ -91,4 +88,5 @@
 goto done
 
 :done
+cd "%~dp0"
 pause
\ No newline at end of file

Modified: nemerle/trunk/misc/packages/wix/src/CompilerAndTools.wxs
==============================================================================
--- nemerle/trunk/misc/packages/wix/src/CompilerAndTools.wxs	(original)
+++ nemerle/trunk/misc/packages/wix/src/CompilerAndTools.wxs	Wed May  2 08:25:31 2007
@@ -87,7 +87,6 @@
         <File Id="File_ncc.exe" Name="ncc.exe" Source="dist\bin\" >
            <netfx:NativeImage Id="Image_ncc.exe" Dependencies="no" />
         </File>
-        <File Id="File_ncc.xml" Name="ncc.xml" Source="dist\bin\" />
         <Environment Id="Env_Nemerle" Action="set" System="yes" Name="Nemerle" Value="[BINDIR]" />
         <Environment Id="Env_Path" Action="set" Part="last" System="yes" Name="Path" Value="[BINDIR]" />
         <RegistryValue Root="HKLM" Key="SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\ncc.exe"

Modified: nemerle/trunk/misc/packages/wix/src/Version.wxi
==============================================================================
--- nemerle/trunk/misc/packages/wix/src/Version.wxi	(original)
+++ nemerle/trunk/misc/packages/wix/src/Version.wxi	Wed May  2 08:25:31 2007
@@ -30,8 +30,8 @@
 <Include>
 
 <?define ProductShortName   = "Nemerle" ?>
-<?define ProductVersion     = "0.9.3.7579" ?>
-<?define ProductVersionText = "0.9.3 (APR 2007 CTP)" ?>
+<?define ProductVersion     = "0.9.4.7645" ?>
+<?define ProductVersionText = "0.9.4 (MAY 2007 CTP) build 7645" ?>
 <?define Manufacturer       = "Nemerle.org" ?>
 <?define ProductCode        = "A55CE804-9111-4F23-B499-E9DAD3D4DFAD" ?>
 <?define UpgradeCode        = "A87511AC-0F24-4144-8211-99183084A71A" ?>

Modified: nemerle/trunk/misc/packages/wix/src/vs-plugin.wxs
==============================================================================
--- nemerle/trunk/misc/packages/wix/src/vs-plugin.wxs	(original)
+++ nemerle/trunk/misc/packages/wix/src/vs-plugin.wxs	Wed May  2 08:25:31 2007
@@ -59,6 +59,10 @@
         <File Id="File_Nemerle.VisualStudio.xml" Name="Nemerle.VisualStudio.xml"     Source="dist\vs-plugin\" />
         <File Id="File_Nemerle.VisualStudio.dll.config" Name="Nemerle.VisualStudio.dll.config"     Source="dist\vs-plugin\" />
 
+        <!-- Remove mapping for .n files added by Simple VS Integration -->
+        <RemoveRegistryKey Action="removeOnInstall" Root="HKCU" Key="Software\Microsoft\VisualStudio\8.0\FileExtensionMapping\n" /> 
+        <RemoveRegistryKey Action="removeOnInstall" Root="HKCU" Key="Software\Microsoft\VisualStudio\8.0\Default Editors\n" /> 
+
         <!-- This file is generated by
 			RegPkg.exe" /root:Software\Microsoft\VisualStudio\8.0 "/wixfile:generated.wxi" /codebase "dist\vs-plugin\"
         -->
@@ -108,8 +112,9 @@
         <Component Id="Comp_ItemTemplates" DiskId="1" Guid="F3762AF1-8B79-435a-942D-395FA3D49CC5">
           <File Id="File_Class.zip" Name="Class.zip" />
           <File Id="File_Form.zip" Name="Form.zip" />
-          <File Id="ResX.zip" Name="ResX.zip" />
-          <File Id="Text.zip" Name="Text.zip" />
+          <File Id="File_ResX.zip" Name="ResX.zip" />
+          <File Id="File_Text.zip" Name="Text.zip" />
+          <File Id="File_UserControl.zip" Name="UserControl.zip" />
         </Component>
       </Directory>
     </DirectoryRef>