[svn] r7199: vs-plugin/trunk/Setup: WixNetFxExtension buildSetup.cmd

[pbludov]

Log:
Wix 3.0 issues

Author: pbludov
Date: Wed Jan  3 13:59:13 2007
New Revision: 7199

Removed:
   vs-plugin/trunk/Setup/WixNetFxExtension/
Modified:
   vs-plugin/trunk/Setup/buildSetup.cmd

Modified: vs-plugin/trunk/Setup/buildSetup.cmd
==============================================================================
--- vs-plugin/trunk/Setup/buildSetup.cmd	(original)
+++ vs-plugin/trunk/Setup/buildSetup.cmd	Wed Jan  3 13:59:13 2007
@@ -30,15 +30,36 @@
 echo.
 echo BuildType=%Type%
 
+rem
+rem Ensure we have all required binaries
+rem
+
 set IntegrationBinaries=%~dp0..\bin\%Type%\Nemerle.VisualStudio.dll
 if not exist "%IntegrationBinaries%" goto errIntegrationBinaries
 
 set NemerleBinaries=%~dp0..\..\bin\%Type%\NCC.exe
 if not exist "%NemerleBinaries%" goto errNemerleBinaries
 
-if "%VisualStudioIntegration%"=="" goto errEnvVar
-rem need path to Wix 3.0
-rem set WIXDIR=%VisualStudioIntegration%\Tools\Wix
+rem
+rem Ensure we have all required tools
+rem
+
+if "%VisualStudioIntegration%"=="" goto errEnvVarVSSDK
+
+if not "%WixDir%"=="" goto wixSet
+
+rem Check default wix folder
+if not exist "%ProgramFiles%\Windows Installer XML v3\bin\light.exe" goto errEnvVarWix
+
+echo light.exe found in "%ProgramFiles%\Windows Installer XML v3\bin" folder
+set WixDir=%ProgramFiles%\Windows Installer XML v3\bin
+
+:wixSet
+
+rem
+rem Ready to build the setup.exe
+rem
+
 set RegPkgDir=%VisualStudioIntegration%\Tools\Bin
 set WixSrcFolder=%~dp0Wix
 set VariablesFile=%WixSrcFolder%\Variables.wxi
@@ -48,15 +69,8 @@
 
 "%RegPkgDir%\RegPkg.exe" /root:Software\Microsoft\VisualStudio\8.0 "/wixfile:%GeneratedFile%" /codebase "%IntegrationBinaries%"
 
-if exist %WIXDIR%\WixNetFxExtension.dll goto wixValid
-echo Your Wix installation does not have WixNetFx extension. It is recommented to upgrade to version 2.0.4820.0 or later.
-echo Press Ctrl+C to exit or
-pause
-copy WixNetFxExtension\*.* "%WIXDIR%"
-
-:wixValid
-"%WIXDIR%\candle.exe" -ext WixNetFxExtension -dType=%Type%  wix/*.wxs
-"%WIXDIR%\light.exe"  -ext WixNetFxExtension *.wixobj -ext WixUIExtension -out "%MsiFile%" -cultures:en-us 
+"%WixDir%\candle.exe" -ext WixNetFxExtension -sw1080 -dType=%Type%  wix/*.wxs
+"%WixDir%\light.exe"  -ext WixNetFxExtension *.wixobj -ext WixUIExtension -out "%MsiFile%" -cultures:en-us 
 
 echo Building Nemerle.VisualStudio.exe. Pease wait...
 iexpress /N /Q Bootstrapper.sed
@@ -70,10 +84,14 @@
 echo Done.
 goto done
 
-:errEnvVar
+:errEnvVarVSSDK
 echo Please specify environment variable "VisualStudioIntegration".
 goto done
 
+:errEnvVarWix
+echo Please specify environment variable "WixDir".
+goto done
+
 :errIntegrationBinaries
 echo File '%IntegrationBinaries%' not found.
 echo Please build integration binaries.