From 3b260d4a0ac32aa851297fdac372d59e300b8fe2 Mon Sep 17 00:00:00 2001
From: "ted.mielczarek%gmail.com"
 <ted.mielczarek%gmail.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Thu, 9 Aug 2007 02:11:39 +0000
Subject: [PATCH] bug 386045 - MozillaBuild doesn't recognize MSVC9.  patch by
 Robin Monks <mozillamonks@yahoo.ca>, r=me

git-svn-id: svn://10.0.0.236/trunk@231691 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../build-environment/win32/guess-msvc.bat    | 26 ++++++++++
 .../build-environment/win32/start-msvc9.bat   | 52 +++++++++++++++++++
 2 files changed, 78 insertions(+)
 create mode 100755 mozilla/tools/build-environment/win32/start-msvc9.bat

diff --git a/mozilla/tools/build-environment/win32/guess-msvc.bat b/mozilla/tools/build-environment/win32/guess-msvc.bat
index 6e57c10678e..c58ad5628e8 100755
--- a/mozilla/tools/build-environment/win32/guess-msvc.bat
+++ b/mozilla/tools/build-environment/win32/guess-msvc.bat
@@ -14,6 +14,8 @@ SET MSVC6KEY=%MSVCROOTKEY%\6.0\Setup\Microsoft Visual C++
 SET MSVC71KEY=%MSVCROOTKEY%\7.1\Setup\VC
 SET MSVC8KEY=%MSVCROOTKEY%\8.0\Setup\VC
 SET MSVC8EXPRESSKEY=HKLM\SOFTWARE\Microsoft\VCExpress\8.0\Setup\VC
+SET MSVC9KEY=%MSVCROOTKEY%\9.0\Setup\VC
+SET MSVC9EXPRESSKEY=HKLM\SOFTWARE\Microsoft\VCExpress\9.0\Setup\VC
 
 REM First see if we can find MSVC, then set the variable
 REM NOTE: delims=<tab><space>
@@ -47,10 +49,25 @@ if "%VC8EXPRESSDIR%"=="" (
   )
 )
 
+REG QUERY "%MSVC9KEY%" /v ProductDir >nul 2>nul
+if "%VC9DIR%"=="" (
+  IF %ERRORLEVEL% EQU 0 (
+    FOR /F "tokens=2* delims=	 " %%A IN ('REG QUERY "%MSVC9KEY%" /v ProductDir') DO SET VC9DIR=%%B
+  )
+)
+
+REG QUERY "%MSVC9EXPRESSKEY%" /v ProductDir >nul 2>nul
+if "%VC9EXPRESSDIR%"=="" (
+  IF %ERRORLEVEL% EQU 0 (
+    FOR /F "tokens=2* delims=	 " %%A IN ('REG QUERY "%MSVC9EXPRESSKEY%" /v ProductDir') DO SET VC9EXPRESSDIR=%%B
+  )
+)
+
 REM Look for Installed SDKs:
 SET SDKROOTKEY=HKLM\SOFTWARE\Microsoft\MicrosoftSDK\InstalledSDKs
 SET SDK2003SP1KEY=%SDKROOTKEY%\8F9E5EF3-A9A5-491B-A889-C58EFFECE8B3
 SET SDK2003SP2KEY=%SDKROOTKEY%\D2FF9F89-8AA2-4373-8A31-C838BF4DBBE1
+SET SDK6KEY=HKLM\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v6.0\WinSDKBuild
 
 REG QUERY "%SDK2003SP2KEY%" /v "Install Dir" >nul 2>nul
 if "%SDKDIR%"=="" (
@@ -66,8 +83,17 @@ if "%SDKDIR%"=="" (
   )
 )
 
+REG QUERY "%SDK6KEY%" /v InstallationFolder >nul 2>nul
+if "%SDKDIR%"=="" (
+  IF %ERRORLEVEL% EQU 0 (
+    FOR /F "tokens=2* usebackq delims= " %%A IN (`REG QUERY "HKLM\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v6.0\WinSDKBuild" /v InstallationFolder`) DO SET SDKDIR=%%B
+  )
+)
+
 ECHO Visual C++ 6 directory: %VC6DIR%
 ECHO Visual C++ 7.1 directory: %VC71DIR%
 ECHO Visual C++ 8 directory: %VC8DIR%
 ECHO Visual C++ 8 Express directory: %VC8EXPRESSDIR%
+ECHO Visual C++ 9 directory: %VC9DIR%
+ECHO Visual C++ 9 Express directory: %VC9EXPRESSDIR%
 ECHO SDK directory: %SDKDIR%
diff --git a/mozilla/tools/build-environment/win32/start-msvc9.bat b/mozilla/tools/build-environment/win32/start-msvc9.bat
new file mode 100755
index 00000000000..154cca883f5
--- /dev/null
+++ b/mozilla/tools/build-environment/win32/start-msvc9.bat
@@ -0,0 +1,52 @@
+@echo off
+
+SET MOZ_MSVCVERSION=9
+
+SET MOZILLABUILDDRIVE=%~d0%
+SET MOZILLABUILDPATH=%~p0%
+SET MOZILLABUILD=%MOZILLABUILDDRIVE%%MOZILLABUILDPATH%
+
+echo "Mozilla tools directory: %MOZILLABUILD%"
+
+REM Get MSVC paths
+call "%MOZILLABUILD%\guess-msvc.bat"
+
+REM Use the "new" moztools-static
+set MOZ_TOOLS=%MOZILLABUILD%\moztools
+
+rem append moztools to PATH
+SET PATH=%PATH%;%MOZ_TOOLS%\bin
+
+if "%VC9DIR%"=="" (
+    if "%VC9EXPRESSDIR%"=="" (
+        ECHO "Microsoft Visual C++ version 9 (2008) was not found. Exiting."
+        pause
+        EXIT /B 1
+    )
+
+    if "%SDKDIR%"=="" (
+        ECHO "Microsoft Platform SDK was not found. Exiting."
+        pause
+        EXIT /B 1
+    )
+
+    rem Prepend MSVC paths
+    call "%VC9EXPRESSDIR%\Bin\vcvars32.bat"
+
+    rem Don't set SDK paths in this block, because blocks are early-evaluated.
+) else (
+    rem Prepend MSVC paths
+    call "%VC9DIR%\Bin\vcvars32.bat"
+)
+
+if "%VC9DIR%"=="" (
+    rem Prepend SDK paths - Don't use the SDK SetEnv.cmd because it pulls in
+    rem random VC paths which we don't want.
+    rem Add the atlthunk compat library to the end of our LIB
+    set PATH=%SDKDIR%\bin;%PATH%
+    set LIB=%SDKDIR%\lib;%LIB%;%MOZILLABUILD%\atlthunk_compat
+    set INCLUDE=%SDKDIR%\include;%SDKDIR%\include\atl;%INCLUDE%
+)
+
+cd "%USERPROFILE%"
+start "MSYS Shell - MSVC9 Environment" "%MOZILLABUILD%\msys\bin\rxvt" -backspacekey  -sl 2500 -fg %FGCOLOR% -bg %BGCOLOR% -sr -fn "Lucida Console" -tn msys -geometry 80x25 -e /bin/bash --login -i