Author: antonio
Date: Sat Apr 30 00:27:51 2005
New Revision: 165389
URL: http://svn.apache.org/viewcvs?rev=165389&view=rev
Log:
Update to ant 1.6.3
Modified:
cocoon/branches/BRANCH_2_1_X/status.xml
cocoon/branches/BRANCH_2_1_X/tools/bin/ant
cocoon/branches/BRANCH_2_1_X/tools/bin/ant.bat
cocoon/branches/BRANCH_2_1_X/tools/bin/antRun.bat
cocoon/branches/BRANCH_2_1_X/tools/lib/ant-junit.jar
cocoon/branches/BRANCH_2_1_X/tools/lib/ant-launcher.jar
cocoon/branches/BRANCH_2_1_X/tools/lib/ant-trax.jar
cocoon/branches/BRANCH_2_1_X/tools/lib/ant.jar
Modified: cocoon/branches/BRANCH_2_1_X/status.xml
URL:
http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/status.xml?rev=165389&r1=165388&r2=165389&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/status.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/status.xml Sat Apr 30 00:27:51 2005
@@ -196,6 +196,9 @@
<changes>
<release version="@version@" date="@date@">
+ <action dev="AG" type="update">
+ Updated ant to 1.6.3.
+ </action>
<action dev="VG" type="update">
OJB Block: Added support for OJB 1.1.
</action>
Modified: cocoon/branches/BRANCH_2_1_X/tools/bin/ant
URL:
http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/tools/bin/ant?rev=165389&r1=165388&r2=165389&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/tools/bin/ant (original)
+++ cocoon/branches/BRANCH_2_1_X/tools/bin/ant Sat Apr 30 00:27:51 2005
@@ -1,6 +1,6 @@
#! /bin/sh
-# Copyright 2001-2004 The Apache Software Foundation
+# Copyright 2001-2005 The Apache Software Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -87,15 +87,6 @@
esac
if [ -z "$ANT_HOME" -o ! -d "$ANT_HOME" ] ; then
- # try to find ANT
- if [ -d /opt/ant ] ; then
- ANT_HOME=/opt/ant
- fi
-
- if [ -d "${HOME}/opt/ant" ] ; then
- ANT_HOME="${HOME}/opt/ant"
- fi
-
## resolve links - $0 may be a link to ant's home
PRG="$0"
progname=`basename "$0"`
@@ -192,7 +183,7 @@
LOCALCLASSPATH="$LOCALCLASSPATH:$CLASSPATH"
fi
- # remove class path from launcher -lib option
+ # remove class path from launcher -cp option
CLASSPATH=""
fi
else
@@ -223,6 +214,10 @@
fi
# For Cygwin, switch paths to appropriate format before running java
+# For PATHs convert to unix format first, then to windows format to ensure
+# both formats are supported. Probably this will fail on directories with ;
+# in the name in the path. Let's assume that paths containing ; are more
+# rare than windows style paths on cygwin.
if $cygwin; then
if [ "$OS" = "Windows_NT" ] && cygpath -m .>/dev/null 2>/dev/null ; then
format=mixed
@@ -232,9 +227,11 @@
ANT_HOME=`cygpath --$format "$ANT_HOME"`
ANT_LIB=`cygpath --$format "$ANT_LIB"`
JAVA_HOME=`cygpath --$format "$JAVA_HOME"`
- LOCALCLASSPATH=`cygpath --path --$format "$LOCALCLASSPATH"`
+ LCP_TEMP=`cygpath --path --unix "$LOCALCLASSPATH"`
+ LOCALCLASSPATH=`cygpath --path --$format "$LCP_TEMP"`
if [ -n "$CLASSPATH" ] ; then
- CLASSPATH=`cygpath --path --$format "$CLASSPATH"`
+ CP_TEMP=`cygpath --path --unix "$CLASSPATH"`
+ CLASSPATH=`cygpath --path --$format "$CP_TEMP"`
fi
CYGHOME=`cygpath --$format "$HOME"`
fi
@@ -295,7 +292,7 @@
ant_sys_opts="-Djikes.class.path=\"$JIKESPATH\""
fi
fi
-ant_exec_command="exec \"$JAVACMD\" $ANT_OPTS -classpath \"$LOCALCLASSPATH\"
-Dant.home=\"$ANT_HOME\" -Dant.library.dir=\"$ANT_LIB\" $ant_sys_opts
org.apache.tools.ant.launch.Launcher $ANT_ARGS -lib \"$CLASSPATH\"
$ant_exec_args"
+ant_exec_command="exec \"$JAVACMD\" $ANT_OPTS -classpath \"$LOCALCLASSPATH\"
-Dant.home=\"$ANT_HOME\" -Dant.library.dir=\"$ANT_LIB\" $ant_sys_opts
org.apache.tools.ant.launch.Launcher $ANT_ARGS -cp \"$CLASSPATH\"
$ant_exec_args"
if $ant_exec_debug ; then
echo $ant_exec_command
fi
Modified: cocoon/branches/BRANCH_2_1_X/tools/bin/ant.bat
URL:
http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/tools/bin/ant.bat?rev=165389&r1=165388&r2=165389&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/tools/bin/ant.bat (original)
+++ cocoon/branches/BRANCH_2_1_X/tools/bin/ant.bat Sat Apr 30 00:27:51 2005
@@ -1,6 +1,6 @@
@echo off
-REM Copyright 2001,2004 The Apache Software Foundation
+REM Copyright 2001,2004-2005 The Apache Software Foundation
REM
REM Licensed under the Apache License, Version 2.0 (the "License");
REM you may not use this file except in compliance with the License.
@@ -17,6 +17,7 @@
if exist "%HOME%\antrc_pre.bat" call "%HOME%\antrc_pre.bat"
if "%OS%"=="Windows_NT" @setlocal
+if "%OS%"=="WINNT" @setlocal
rem %~dp0 is expanded pathname of the current script under NT
set DEFAULT_ANT_HOME=%~dp0..
@@ -24,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
@@ -31,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.
@@ -78,21 +89,29 @@
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
+:runAntNoClasspath
+"%_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
+
:runAntWithClasspath
-"%_JAVACMD%" %ANT_OPTS% -classpath "%ANT_HOME%\lib\ant-launcher.jar"
"-Dant.home=%ANT_HOME%" org.apache.tools.ant.launch.Launcher %ANT_ARGS% -lib
"%CLASSPATH%" %ANT_CMD_LINE_ARGS%
+"%_JAVACMD%" %ANT_OPTS% -classpath "%ANT_HOME%\lib\ant-launcher.jar"
"-Dant.home=%ANT_HOME%" org.apache.tools.ant.launch.Launcher %ANT_ARGS% -cp
"%CLASSPATH%" %ANT_CMD_LINE_ARGS%
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
:runAntWithJikesAndClasspath
-"%_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% -lib "%CLASSPATH%"
%ANT_CMD_LINE_ARGS%
+"%_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% -cp "%CLASSPATH%"
%ANT_CMD_LINE_ARGS%
goto end
:end
@@ -100,6 +119,7 @@
set ANT_CMD_LINE_ARGS=
if "%OS%"=="Windows_NT" @endlocal
+if "%OS%"=="WINNT" @endlocal
:mainEnd
if exist "%HOME%\antrc_post.bat" call "%HOME%\antrc_post.bat"
Modified: cocoon/branches/BRANCH_2_1_X/tools/bin/antRun.bat
URL:
http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/tools/bin/antRun.bat?rev=165389&r1=165388&r2=165389&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/tools/bin/antRun.bat (original)
+++ cocoon/branches/BRANCH_2_1_X/tools/bin/antRun.bat Sat Apr 30 00:27:51 2005
@@ -1,7 +1,7 @@
@echo off
REM
-REM Copyright 2001-2002,2004 The Apache Software Foundation
+REM Copyright 2001-2002,2004-2005 The Apache Software Foundation
REM
REM Licensed under the Apache License, Version 2.0 (the "License");
REM you may not use this file except in compliance with the License.
@@ -18,6 +18,7 @@
REM
if "%OS%"=="Windows_NT" @setlocal
+if "%OS%"=="WINNT" @setlocal
if ""%1""=="""" goto runCommand
@@ -42,4 +43,5 @@
%ANT_RUN_CMD%
if "%OS%"=="Windows_NT" @endlocal
+if "%OS%"=="WINNT" @endlocal
Modified: cocoon/branches/BRANCH_2_1_X/tools/lib/ant-junit.jar
URL:
http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/tools/lib/ant-junit.jar?rev=165389&r1=165388&r2=165389&view=diff
==============================================================================
Binary files - no diff available.
Modified: cocoon/branches/BRANCH_2_1_X/tools/lib/ant-launcher.jar
URL:
http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/tools/lib/ant-launcher.jar?rev=165389&r1=165388&r2=165389&view=diff
==============================================================================
Binary files - no diff available.
Modified: cocoon/branches/BRANCH_2_1_X/tools/lib/ant-trax.jar
URL:
http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/tools/lib/ant-trax.jar?rev=165389&r1=165388&r2=165389&view=diff
==============================================================================
Binary files - no diff available.
Modified: cocoon/branches/BRANCH_2_1_X/tools/lib/ant.jar
URL:
http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/tools/lib/ant.jar?rev=165389&r1=165388&r2=165389&view=diff
==============================================================================
Binary files - no diff available.
