bug 184468 - launcher compilation automation
diff --git a/bundles/org.eclipse.equinox.executable/library/win32/build.bat b/bundles/org.eclipse.equinox.executable/library/win32/build.bat
index 03f413a..2ce6387 100644
--- a/bundles/org.eclipse.equinox.executable/library/win32/build.bat
+++ b/bundles/org.eclipse.equinox.executable/library/win32/build.bat
@@ -37,13 +37,13 @@
IF x.%1==x.ia64 GOTO IA64
:X86
-IF x.%JAVA_HOME%==x. set JAVA_HOME=C:\Dev\Java\IBM-1.5.0
+IF x.%JAVA_HOME%==x. set JAVA_HOME=C:\Dev\Java\IBM-1.5.0-20090707-SR10
set javaHome=%JAVA_HOME%
if not "%MSVC_HOME%" == "" goto MAKE
-set MSVC_HOME=k:\dev\products\msvc60\vc98
+set MSVC_HOME="C:\Program Files\MS_PLAT_SDK\msvc60\VC98"
call %MSVC_HOME%\bin\vcvars32.bat
if not "%mssdk%" == "" goto MAKE
-set mssdk=K:\dev\PRODUCTS\PLATSDK\feb2003
+set mssdk="C:\Program Files\MS_PLAT_SDK\feb2003"
call %mssdk%\setenv.bat
IF x.%1==x.x86 shift
set defaultOSArch=x86
@@ -110,6 +110,7 @@
goto NEXT )
if "%1" == "-java" (
set javaHome=%2
+ echo %javaHome%
shift
goto NEXT )
:LAST_ARG
diff --git a/bundles/org.eclipse.equinox.executable/library/wpf/build.bat b/bundles/org.eclipse.equinox.executable/library/wpf/build.bat
index 3f2ff66..7d70ff6 100644
--- a/bundles/org.eclipse.equinox.executable/library/wpf/build.bat
+++ b/bundles/org.eclipse.equinox.executable/library/wpf/build.bat
@@ -33,6 +33,8 @@
@rem ******
@echo off
+IF x.%1==x.x86 shift
+
IF NOT "%JAVA_HOME%"=="" GOTO MSVC
rem *****
rem Javah
@@ -41,7 +43,7 @@
:MSVC
-call "J:\dev\PRODUCTS\PLATSDK\March2007VistaRTM\Bin\setenv.cmd" /vista
+call "C:\Program Files\MS_PLAT_SDK\March2007VistaRTM\Bin\setenv.cmd" /vista
:MAKE
rem --------------------------
