X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2Fclass%2FSystem.XML%2Frun-XSLT-tests.bat;h=5322a17d980e46829c4f4348699ba059d90e75fd;hb=6b79b6c14d321f1e7cc8cd9727e4ce4df02bf96a;hp=27e9c108d55454557337d743b69d645c00f0c690;hpb=6110fc90713ce59ff0996fcd3520e09a96575820;p=mono.git

diff --git a/mcs/class/System.XML/run-XSLT-tests.bat b/mcs/class/System.XML/run-XSLT-tests.bat
index 27e9c108d55..5322a17d980 100644
--- a/mcs/class/System.XML/run-XSLT-tests.bat
+++ b/mcs/class/System.XML/run-XSLT-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
@@ -95,7 +95,7 @@ IF %ERRORLEVEL% NEQ 0 GOTO BUILD_EXCEPTION
 unzip -un xslt-testsuite-03.ZIP
 IF %ERRORLEVEL% NEQ 0 GOTO BUILD_EXCEPTION
 del xslt-reference-results.tar.gz
-wget http://svn.myrealbox.com/source/trunk/release/test-ext/xslt-standalone/xslt-reference-results.tar.gz
+wget http://anonsvn.mono-project.com/source/trunk/release/test-ext/xslt-standalone/xslt-reference-results.tar.gz
 IF %ERRORLEVEL% NEQ 0 GOTO BUILD_EXCEPTION
 tar -xzf xslt-reference-results.tar.gz
 IF %ERRORLEVEL% NEQ 0 GOTO BUILD_EXCEPTION
@@ -145,10 +145,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 .