You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by zo...@apache.org on 2004/02/25 02:08:35 UTC
cvs commit: xml-xalan/test build.bat
zongaro 2004/02/24 17:08:35
Modified: test build.bat
Log:
Patch for bug report 27016 from Sarah McNamara (mcnamara () ca ! ibm ! com).
Work-around to allow the Ant <property environment="ENV"> statement to work
on Windows 2003. The word-around is to explicitly set the Java os.name
system property to "Windows_NT".
Revision Changes Path
1.15 +14 -1 xml-xalan/test/build.bat
Index: build.bat
===================================================================
RCS file: /home/cvs/xml-xalan/test/build.bat,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- build.bat 24 Feb 2004 21:04:29 -0000 1.14
+++ build.bat 25 Feb 2004 01:08:35 -0000 1.15
@@ -60,6 +60,7 @@
@setlocal
set classpath=..\java\bin\ant.jar;..\java\bin\xercesImpl.jar;..\java\bin\xalan.jar;..\java\bin\xml-apis.jar;%CLASSPATH%
+rem set classpath=..\java\bin\ant.jar;..\java\bin\xercesImpl.jar;..\java\bin\xalan.jar;..\java\bin\xml-apis.jar;%CLASSPATH%
rem On NT/2K grab all arguments at once
@@ -86,6 +87,16 @@
if "%ANT_HOME%"=="" set _ANT_HOME=..\java
if not "%ANT_HOME%"=="" set _ANT_HOME=%ANT_HOME%
+rem Patch for Ant limitation:
+rem <property environment="xxx" /> is only available on certain platforms.
+rem Apparently Windows 2003 is not one of the supported platforms.
+rem A workaround (according to Ant's FAQ) is to set the os.name=Windows_NT
+rem before calling Ant.
+rem Since this is a Windows batch file and I don't think Xalan's test
+rem harness or targets care which Windows version we're running on, its
+rem probably safe to use this workaround.
+set _ANT_OPTS=%ANT_OPTS% -Dos.name=Windows_NT
+
rem Note: classpath handling is special for testing Xalan
rem If PARSER_JAR blank, default to xerces in the xalan dir
if "%PARSER_JAR%" == "" set _PARSER_JAR=..\java\bin\xercesImpl.jar
@@ -122,11 +133,13 @@
:checkJikes
rem also pass along the selected parser to Ant
rem Note: we don't need to do this for xml-apis.jar
-set _ANT_OPTS=%ANT_OPTS% -Dparserjar=%_PARSER_JAR%
+set _ANT_OPTS=%_ANT_OPTS% -Dparserjar=%_PARSER_JAR%
if not "%JIKESPATH%" == "" goto runAntWithJikes
:runAnt
+echo on
"%_JAVACMD%" %JAVA_OPTS% -classpath "%_CLASSPATH%" -Dant.home="%_ANT_HOME%" %_ANT_OPTS% org.apache.tools.ant.Main %ANT_CMD_LINE_ARGS%
+echo off
goto end
:runAntWithJikes
---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org