From metasim@locus.apache.org  Sun Nov 19 04:22:49 2000
Return-Path: <metasim@locus.apache.org>
Mailing-List: contact ant-dev-help@jakarta.apache.org; run by ezmlm
Delivered-To: mailing list ant-dev@jakarta.apache.org
Received: (qmail 84429 invoked by uid 500); 19 Nov 2000 04:22:49 -0000
Delivered-To: apmail-jakarta-ant-cvs@apache.org
Received: (qmail 84426 invoked by uid 1209); 19 Nov 2000 04:22:49 -0000
Date: 19 Nov 2000 04:22:49 -0000
Message-ID: <20001119042249.84425.qmail@locus.apache.org>
From: metasim@locus.apache.org
To: jakarta-ant-cvs@apache.org
Subject: cvs commit: jakarta-ant/src/antidote build.xml

metasim     00/11/18 20:22:49

  Modified:    src/antidote/bin antidote.bat
               src/antidote build.xml
  Log:
  Removed checking of default ant install location.
  
  Revision  Changes    Path
  1.4       +48 -48    jakarta-ant/src/antidote/bin/antidote.bat
  
  Index: antidote.bat
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/antidote/bin/antidote.bat,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- antidote.bat	2000/11/16 23:14:13	1.3
  +++ antidote.bat	2000/11/19 04:22:48	1.4
  @@ -1,48 +1,48 @@
  -@echo off
  -
  -rem Slurp the command line arguments.  This loop allows for an unlimited number of 
  -rem agruments (up to the command line limit, anyway).
  -
  -set ANT_CMD_LINE_ARGS=
  -
  -:setupArgs
  -if %1a==a goto doneArgs
  -set ANT_CMD_LINE_ARGS=%ANT_CMD_LINE_ARGS% %1
  -shift
  -goto setupArgs
  -
  -:doneArgs
  -rem The doneArgs label is here just to provide a place for the argument list loop
  -rem to break out to.
  -
  -rem find ANT_HOME
  -if not "%ANT_HOME%"=="" goto checkJava
  -
  -rem check for ant in Program Files on system drive
  -if not exist "%SystemDrive%\Program Files\ant" goto checkSystemDrive
  -set ANT_HOME=%SystemDrive%\Program Files\ant
  -goto checkJava
  -
  -:checkSystemDrive
  -rem check for ant in root directory of system drive
  -if not exist "%SystemDrive%\ant" goto noAntHome
  -set ANT_HOME=%SystemDrive%\ant
  -goto checkJava
  -
  -:noAntHome
  -echo ANT_HOME is not set and ant could not be located. Please set ANT_HOME.
  -goto end
  -
  -:checkJava
  -if "%JAVACMD%" == "" set JAVACMD=java
  -
  -set LOCALCLASSPATH="%CLASSPATH%"
  -for %%i in ("%ANT_HOME%\lib\*.jar") do call "%ANT_HOME%\bin\lcp.bat" "%%i"
  -
  -%JAVACMD% -classpath %LOCALCLASSPATH% -Dant.home="%ANT_HOME%" org.apache.tools.ant.gui.Main %ANT_CMD_LINE_ARGS%
  -goto end
  -
  -:end
  -set LOCALCLASSPATH=
  -set ANT_CMD_LINE_ARGS=
  -
  +@echo off
  +
  +rem Slurp the command line arguments.  This loop allows for an unlimited number of 
  +rem agruments (up to the command line limit, anyway).
  +
  +set ANT_CMD_LINE_ARGS=
  +
  +:setupArgs
  +if %1a==a goto doneArgs
  +set ANT_CMD_LINE_ARGS=%ANT_CMD_LINE_ARGS% %1
  +shift
  +goto setupArgs
  +
  +:doneArgs
  +rem The doneArgs label is here just to provide a place for the argument list loop
  +rem to break out to.
  +
  +rem find ANT_HOME
  +if not "%ANT_HOME%"=="" goto checkJava
  +
  +rem check for ant in Program Files on system drive
  +rem if not exist "%SystemDrive%\Program Files\ant" goto checkSystemDrive
  +rem set ANT_HOME=%SystemDrive%\Program Files\ant
  +rem goto checkJava
  +
  +rem :checkSystemDrive
  +rem check for ant in root directory of system drive
  +rem if not exist "%SystemDrive%\ant" goto noAntHome
  +rem set ANT_HOME=%SystemDrive%\ant
  +rem goto checkJava
  +
  +:noAntHome
  +echo ANT_HOME is not set and ant could not be located. Please set ANT_HOME.
  +goto end
  +
  +:checkJava
  +if "%JAVACMD%" == "" set JAVACMD=java
  +
  +set LOCALCLASSPATH="%CLASSPATH%"
  +for %%i in ("%ANT_HOME%\lib\*.jar") do call "%ANT_HOME%\bin\lcp.bat" "%%i"
  +
  +%JAVACMD% -classpath %LOCALCLASSPATH% -Dant.home="%ANT_HOME%" org.apache.tools.ant.gui.Main %ANT_CMD_LINE_ARGS%
  +goto end
  +
  +:end
  +set LOCALCLASSPATH=
  +set ANT_CMD_LINE_ARGS=
  +
  
  
  
  1.7       +1 -1      jakarta-ant/src/antidote/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/antidote/build.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- build.xml	2000/11/16 18:32:19	1.6
  +++ build.xml	2000/11/19 04:22:49	1.7
  @@ -31,7 +31,7 @@
     <!-- =================================================================== -->
     <!-- Set some the defaults the user can override in .ant.properties      -->
     <!-- =================================================================== -->
  -  <property name="build.compiler" value="jikes"/>
  +  <property name="build.compiler" value="modern"/>
     <property name="build.compiler.emacs" value="on"/>
   
     <!-- =================================================================== -->