ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From peterrei...@apache.org
Subject cvs commit: ant/src/script ant.bat
Date Thu, 10 Mar 2005 14:10:47 GMT
peterreilly    2005/03/10 06:10:47

  Modified:    src/script Tag: ANT_16_BRANCH ant.bat
  Log:
  sync up clear classpath in ant.bat
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.32.2.8  +14 -0     ant/src/script/ant.bat
  
  Index: ant.bat
  ===================================================================
  RCS file: /home/cvs/ant/src/script/ant.bat,v
  retrieving revision 1.32.2.7
  retrieving revision 1.32.2.8
  diff -u -r1.32.2.7 -r1.32.2.8
  --- ant.bat	28 Jan 2005 16:39:21 -0000	1.32.2.7
  +++ ant.bat	10 Mar 2005 14:10:47 -0000	1.32.2.8
  @@ -25,6 +25,8 @@
   if "%ANT_HOME%"=="" set ANT_HOME=%DEFAULT_ANT_HOME%
   set DEFAULT_ANT_HOME=
   
  +set _USE_CLASSPATH=yes
  +
   rem Slurp the command line arguments. This loop allows for an unlimited number
   rem of arguments (up to the command line limit, anyway).
   set ANT_CMD_LINE_ARGS=%1
  @@ -32,9 +34,17 @@
   shift
   :setupArgs
   if ""%1""=="""" goto doneStart
  +if ""%1""==""-noclasspath"" goto clearclasspath
   set ANT_CMD_LINE_ARGS=%ANT_CMD_LINE_ARGS% %1
   shift
   goto setupArgs
  +
  +rem here is there is a -noclasspath in the options
  +:clearclasspath
  +set _USE_CLASSPATH=no
  +shift
  +goto setupArgs
  +
   rem This label provides a place for the argument list loop to break out
   rem and for NT handling to skip to.
   
  @@ -79,6 +89,7 @@
   if not "%JIKESPATH%"=="" goto runAntWithJikes
   
   :runAnt
  +if "%_USE_CLASSPATH%"=="no" goto runAntNoClasspath
   if not "%CLASSPATH%"=="" goto runAntWithClasspath
   "%_JAVACMD%" %ANT_OPTS% -classpath "%ANT_HOME%\lib\ant-launcher.jar" "-Dant.home=%ANT_HOME%"
org.apache.tools.ant.launch.Launcher %ANT_ARGS% %ANT_CMD_LINE_ARGS%
   goto end
  @@ -88,7 +99,10 @@
   goto end
   
   :runAntWithJikes
  +if "%_USE_CLASSPATH%"=="no" goto runAntWithJikesNoClasspath
   if not "%CLASSPATH%"=="" goto runAntWithJikesAndClasspath
  +
  +:runAntWithJikesNoClasspath
   "%_JAVACMD%" %ANT_OPTS% -classpath "%ANT_HOME%\lib\ant-launcher.jar" "-Dant.home=%ANT_HOME%"
"-Djikes.class.path=%JIKESPATH%" org.apache.tools.ant.launch.Launcher %ANT_ARGS% %ANT_CMD_LINE_ARGS%
   goto end
   
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org
For additional commands, e-mail: dev-help@ant.apache.org


Mime
View raw message