X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2Fclass%2FSystem.XML%2Frun-W3C-tests.bat;h=dc36393b6c0a88ea8f556c8372fa7ff4d9637dcb;hb=ed989a8e9e5c170b6d19edc60bb80e8a4e6d5cc0;hp=19e3c5b200763c28cd3bee3d04787ccc75bc0ec3;hpb=496dfbf9ec0fd3143e5dd560a863d916e56a52b8;p=mono.git

diff --git a/mcs/class/System.XML/run-W3C-tests.bat b/mcs/class/System.XML/run-W3C-tests.bat
index 19e3c5b2007..dc36393b6c0 100644
--- a/mcs/class/System.XML/run-W3C-tests.bat
+++ b/mcs/class/System.XML/run-W3C-tests.bat
@@ -46,8 +46,8 @@ REM ********************************************************
 REM @echo Set environment
 REM ********************************************************
 
-set JGAC_PATH=%VMW_HOME%\jgac\vmw4j2ee_110\
-set JAVA_HOME=%VMW_HOME%\jre5
+set JGAC_PATH=%VMW_HOME%\java_refs\framework\
+set JAVA_HOME=%VMW_HOME%\jre
 
 set RUNTIME_CLASSPATH=%JGAC_PATH%mscorlib.jar
 set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%JGAC_PATH%System.jar
@@ -137,10 +137,21 @@ REM ********************************************************
 @echo Build XmlTool
 REM ********************************************************
 set XML_TOOL_PATH=..\..\tools\mono-xmltool
-msbuild %XML_TOOL_PATH%\XmlTool20.vmwcsproj /t:%BUILD_OPTION% /p:Configuration=%PROJECT_CONFIGURATION% >>%BUILD_LOG% 2<&1
+
+if "%XMLTOOL_BUILD%" == "DONE" goto XMLTOOLSKIP
+
+msbuild %XML_TOOL_PATH%\XmlTool20.csproj /t:%BUILD_OPTION% /p:Configuration=%PROJECT_CONFIGURATION% >>%BUILD_LOG% 2<&1
 
 IF %ERRORLEVEL% NEQ 0 GOTO BUILD_EXCEPTION
 
+goto XMLTOOLREADY
+
+:XMLTOOLSKIP
+echo Skipping XmlToll build...
+
+:XMLTOOLREADY
+set XMLTOOL_BUILD=DONE
+
 copy %XML_TOOL_PATH%\bin\%PROJECT_CONFIGURATION%\xmltool.exe .
 copy %XML_TOOL_PATH%\nunit_transform.xslt .