projects
/
mono.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #3406 from alexanderkyte/mobile_static_default
[mono.git]
/
mcs
/
class
/
System.XML
/
run-W3C-tests.bat
diff --git
a/mcs/class/System.XML/run-W3C-tests.bat
b/mcs/class/System.XML/run-W3C-tests.bat
index 19e3c5b200763c28cd3bee3d04787ccc75bc0ec3..dc36393b6c0a88ea8f556c8372fa7ff4d9637dcb 100644
(file)
--- 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
\r
REM ********************************************************
\r
\r
REM @echo Set environment
\r
REM ********************************************************
\r
\r
-set JGAC_PATH=%VMW_HOME%\j
gac\vmw4j2ee_110
\
\r
-set JAVA_HOME=%VMW_HOME%\jre
5
\r
+set JGAC_PATH=%VMW_HOME%\j
ava_refs\framework
\
\r
+set JAVA_HOME=%VMW_HOME%\jre
\r
\r
set RUNTIME_CLASSPATH=%JGAC_PATH%mscorlib.jar
\r
set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%JGAC_PATH%System.jar
\r
\r
set RUNTIME_CLASSPATH=%JGAC_PATH%mscorlib.jar
\r
set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%JGAC_PATH%System.jar
\r
@@
-137,10
+137,21
@@
REM ********************************************************
@echo Build XmlTool
\r
REM ********************************************************
\r
set XML_TOOL_PATH=..\..\tools\mono-xmltool
\r
@echo Build XmlTool
\r
REM ********************************************************
\r
set XML_TOOL_PATH=..\..\tools\mono-xmltool
\r
-msbuild %XML_TOOL_PATH%\XmlTool20.vmwcsproj /t:%BUILD_OPTION% /p:Configuration=%PROJECT_CONFIGURATION% >>%BUILD_LOG% 2<&1
\r
+
\r
+if "%XMLTOOL_BUILD%" == "DONE" goto XMLTOOLSKIP
\r
+
\r
+msbuild %XML_TOOL_PATH%\XmlTool20.csproj /t:%BUILD_OPTION% /p:Configuration=%PROJECT_CONFIGURATION% >>%BUILD_LOG% 2<&1
\r
\r
IF %ERRORLEVEL% NEQ 0 GOTO BUILD_EXCEPTION
\r
\r
\r
IF %ERRORLEVEL% NEQ 0 GOTO BUILD_EXCEPTION
\r
\r
+goto XMLTOOLREADY
\r
+
\r
+:XMLTOOLSKIP
\r
+echo Skipping XmlToll build...
\r
+
\r
+:XMLTOOLREADY
\r
+set XMLTOOL_BUILD=DONE
\r
+
\r
copy %XML_TOOL_PATH%\bin\%PROJECT_CONFIGURATION%\xmltool.exe .
\r
copy %XML_TOOL_PATH%\nunit_transform.xslt .
\r
\r
copy %XML_TOOL_PATH%\bin\%PROJECT_CONFIGURATION%\xmltool.exe .
\r
copy %XML_TOOL_PATH%\nunit_transform.xslt .
\r
\r