cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anto...@apache.org
Subject svn commit: r748739 - in /cocoon/branches/BRANCH_2_1_X: ./ tools/bin/ tools/lib/
Date Fri, 27 Feb 2009 23:29:04 GMT
Author: antonio
Date: Fri Feb 27 23:29:03 2009
New Revision: 748739

URL: http://svn.apache.org/viewvc?rev=748739&view=rev
Log:

<action dev="AG" type="update">
  Updated ant to 1.7.1. This ant detects correctly java 1.6.
</action>

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/ant.cmd
    cocoon/branches/BRANCH_2_1_X/tools/bin/antRun
    cocoon/branches/BRANCH_2_1_X/tools/bin/antRun.bat
    cocoon/branches/BRANCH_2_1_X/tools/bin/antRun.pl
    cocoon/branches/BRANCH_2_1_X/tools/bin/antenv.cmd
    cocoon/branches/BRANCH_2_1_X/tools/bin/complete-ant-cmd.pl
    cocoon/branches/BRANCH_2_1_X/tools/bin/envset.cmd
    cocoon/branches/BRANCH_2_1_X/tools/bin/lcp.bat
    cocoon/branches/BRANCH_2_1_X/tools/bin/runant.pl
    cocoon/branches/BRANCH_2_1_X/tools/bin/runant.py
    cocoon/branches/BRANCH_2_1_X/tools/bin/runrc.cmd
    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/viewvc/cocoon/branches/BRANCH_2_1_X/status.xml?rev=748739&r1=748738&r2=748739&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/status.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/status.xml Fri Feb 27 23:29:03 2009
@@ -186,6 +186,9 @@
     <action dev="all" type="update">
       Starting with 2.1.12 the minimum required Java version will be 1.4.2.
     </action>
+    <action dev="AG" type="update">
+      Updated ant to 1.7.1. This ant detects correctly java 1.6.
+    </action>
     <action dev="JH" type="update" fixes-bug="COCOON-1887" due-to="Andrew Stevens" due-to-email="stevensa@users.sourceforge.net">
       Change HostSelector to be case-insensitive according to RFC3986 section 3.2.2.
     </action>

Modified: cocoon/branches/BRANCH_2_1_X/tools/bin/ant
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/tools/bin/ant?rev=748739&r1=748738&r2=748739&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/tools/bin/ant (original)
+++ cocoon/branches/BRANCH_2_1_X/tools/bin/ant Fri Feb 27 23:29:03 2009
@@ -1,19 +1,19 @@
 #! /bin/sh
 
-#   Licensed to the Apache Software Foundation (ASF) under one or more
-#   contributor license agreements.  See the NOTICE file distributed with
-#   this work for additional information regarding copyright ownership.
-#   The ASF licenses this file to You under the Apache License, Version 2.0
-#   (the "License"); you may not use this file except in compliance with
-#   the License.  You may obtain a copy of the License at
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
 #
-#       http://www.apache.org/licenses/LICENSE-2.0
+#     http://www.apache.org/licenses/LICENSE-2.0
 #
-#   Unless required by applicable law or agreed to in writing, software
-#   distributed under the License is distributed on an "AS IS" BASIS,
-#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#   See the License for the specific language governing permissions and
-#   limitations under the License.
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 
 # Extract launch and ant arguments, (see details below).
 ant_exec_args=
@@ -44,9 +44,11 @@
   rpm_mode=false
   usejikes=$use_jikes_default
 else
-  # load system-wide ant configuration
-  if [ -f "/etc/ant.conf" ] ; then
-    . /etc/ant.conf
+  # load system-wide ant configuration (ONLY if ANT_HOME has NOT been set)
+  if [ -z "$ANT_HOME" -o "$ANT_HOME" = "/usr/share/ant" ]; then
+      if [ -f "/etc/ant.conf" ] ; then
+          . /etc/ant.conf
+      fi
   fi
 
   # load user ant configuration
@@ -106,7 +108,7 @@
   ANT_HOME=`dirname "$PRG"`/..
 
   # make it fully qualified
-  ANT_HOME=`cd "$ANT_HOME" && pwd`
+  ANT_HOME=`cd "$ANT_HOME" > /dev/null && pwd`
 fi
 
 # For Cygwin, ensure paths are in UNIX format before anything is touched
@@ -122,9 +124,11 @@
 
 if [ -z "$JAVACMD" ] ; then
   if [ -n "$JAVA_HOME"  ] ; then
+    # IBM's JDK on AIX uses strange locations for the executables
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
-      # IBM's JDK on AIX uses strange locations for the executables
       JAVACMD="$JAVA_HOME/jre/sh/java"
+    elif [ -x "$JAVA_HOME/jre/bin/java" ] ; then
+      JAVACMD="$JAVA_HOME/jre/bin/java"
     else
       JAVACMD="$JAVA_HOME/bin/java"
     fi
@@ -145,12 +149,34 @@
 # Build local classpath using just the launcher in non-rpm mode or
 # use the Jpackage helper in rpm mode with basic and default jars
 # specified in the ant.conf configuration. Because the launcher is
-# used, libraries linked in ANT_HOME will also be include, but this
+# used, libraries linked in ANT_HOME/lib will also be included, but this
 # is discouraged as it is not java-version safe. A user should
 # request optional jars and their dependencies via the OPT_JAR_LIST
 # variable
-if $rpm_mode && [ -f /usr/bin/build-classpath ] ; then
+if $rpm_mode && [ -x /usr/bin/build-classpath ] ; then
   LOCALCLASSPATH="$(/usr/bin/build-classpath ant ant-launcher jaxp_parser_impl xml-commons-apis)"
+
+  # If no optional jars have been specified then build the default list
+  if [ -z "$OPT_JAR_LIST" ] ; then
+    for file in /etc/ant.d/*; do
+      if [ -f "$file" ]; then
+        case "$file" in
+        *~) ;;
+        *#*) ;;
+        *.rpmsave) ;;
+        *.rpmnew) ;;
+        *)
+          for dep in `cat "$file"`; do
+            case "$OPT_JAR_LIST" in
+            *"$dep"*) ;;
+            *) OPT_JAR_LIST="$OPT_JAR_LIST${OPT_JAR_LIST:+ }$dep"
+            esac
+          done
+        esac
+      fi
+    done
+  fi
+
   # If the user requested to try to add some other jars to the classpath
   if [ -n "$OPT_JAR_LIST" ] ; then
     _OPTCLASSPATH="$(/usr/bin/build-classpath $OPT_JAR_LIST 2> /dev/null)"

Modified: cocoon/branches/BRANCH_2_1_X/tools/bin/ant.bat
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/tools/bin/ant.bat?rev=748739&r1=748738&r2=748739&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/tools/bin/ant.bat (original)
+++ cocoon/branches/BRANCH_2_1_X/tools/bin/ant.bat Fri Feb 27 23:29:03 2009
@@ -6,27 +6,56 @@
 REM  The ASF licenses this file to You under the Apache License, Version 2.0
 REM  (the "License"); you may not use this file except in compliance with
 REM  the License.  You may obtain a copy of the License at
-REM
+REM 
 REM      http://www.apache.org/licenses/LICENSE-2.0
-REM
+REM 
 REM  Unless required by applicable law or agreed to in writing, software
 REM  distributed under the License is distributed on an "AS IS" BASIS,
 REM  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 REM  See the License for the specific language governing permissions and
 REM  limitations under the License.
 
+REM This is an inordinately troublesome piece of code, particularly because it
+REM tries to work on both Win9x and WinNT-based systems. If we could abandon '9x
+REM support, things would be much easier, but sadly, it is not yet time.
+REM Be cautious about editing this, and only add WinNT specific stuff in code that
+REM only runs on WinNT.
+
+if "%HOME%"=="" goto homeDrivePathPre
 if exist "%HOME%\antrc_pre.bat" call "%HOME%\antrc_pre.bat"
 
+:homeDrivePathPre
+if "%HOMEDRIVE%%HOMEPATH%"=="" goto userProfilePre
+if "%HOMEDRIVE%%HOMEPATH%"=="%HOME%" goto userProfilePre
+if exist "%HOMEDRIVE%%HOMEPATH%\antrc_pre.bat" call "%HOMEDRIVE%%HOMEPATH%\antrc_pre.bat"
+
+:userProfilePre
+if "%USERPROFILE%"=="" goto alpha
+if "%USERPROFILE%"=="%HOME%" goto alpha
+if "%USERPROFILE%"=="%HOMEDRIVE%%HOMEPATH%" goto alpha
+if exist "%USERPROFILE%\antrc_pre.bat" call "%USERPROFILE%\antrc_pre.bat"
+
+:alpha
+
 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..
+if "%ANT_HOME%"=="" goto setDefaultAntHome
 
-if "%ANT_HOME%"=="" set ANT_HOME=%DEFAULT_ANT_HOME%
-set DEFAULT_ANT_HOME=
+:stripAntHome
+if not _%ANT_HOME:~-1%==_\ goto checkClasspath
+set ANT_HOME=%ANT_HOME:~0,-1%
+goto stripAntHome
 
+:setDefaultAntHome
+rem %~dp0 is expanded pathname of the current script under NT
+set ANT_HOME=%~dp0..
+
+:checkClasspath
 set _USE_CLASSPATH=yes
+rem CLASSPATH must not be used if it is equal to ""
+if "%CLASSPATH%"=="""" set _USE_CLASSPATH=no
+if "%CLASSPATH%"=="" set _USE_CLASSPATH=no
 
 rem Slurp the command line arguments. This loop allows for an unlimited number
 rem of arguments (up to the command line limit, anyway).
@@ -50,6 +79,15 @@
 rem and for NT handling to skip to.
 
 :doneStart
+
+if _USE_CLASSPATH==no goto findAntHome
+
+:stripClasspath
+if not _%CLASSPATH:~-1%==_\ goto findAntHome
+set CLASSPATH=%CLASSPATH:~0,-1%
+goto stripClasspath
+
+:findAntHome
 rem find ANT_HOME if it does not exist due to either an invalid value passed
 rem by the user or the %0 problem on Windows 9x
 if exist "%ANT_HOME%\lib\ant.jar" goto checkJava
@@ -91,37 +129,98 @@
 
 :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%
+:runAntWithClasspath
+"%_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%
+rem Check the error code of the Ant build
+if not "%OS%"=="Windows_NT" goto onError
+set ANT_ERROR=%ERRORLEVEL%
 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% -cp "%CLASSPATH%" %ANT_CMD_LINE_ARGS%
+rem Check the error code of the Ant build
+if not "%OS%"=="Windows_NT" goto onError
+set ANT_ERROR=%ERRORLEVEL%
 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
+if not _%JIKESPATH:~-1%==_\ goto checkJikesAndClasspath
+set JIKESPATH=%JIKESPATH:~0,-1%
+goto runAntWithJikes
+
+:checkJikesAndClasspath
+
+if "%_USE_CLASSPATH%"=="no" goto runAntWithJikesNoClasspath
 
 :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%  -cp "%CLASSPATH%"
%ANT_CMD_LINE_ARGS%
+rem Check the error code of the Ant build
+if not "%OS%"=="Windows_NT" goto onError
+set ANT_ERROR=%ERRORLEVEL%
 goto end
 
+: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%
+rem Check the error code of the Ant build
+if not "%OS%"=="Windows_NT" goto onError
+set ANT_ERROR=%ERRORLEVEL%
+goto end
+
+:onError
+rem Windows 9x way of checking the error code.  It matches via brute force.
+for %%i in (1 10 100) do set err%%i=
+for %%i in (0 1 2) do if errorlevel %%i00 set err100=%%i
+if %err100%==2 goto onError200
+if %err100%==0 set err100=
+for %%i in (0 1 2 3 4 5 6 7 8 9) do if errorlevel %err100%%%i0 set err10=%%i
+if "%err100%"=="" if %err10%==0 set err10=
+:onError1
+for %%i in (0 1 2 3 4 5 6 7 8 9) do if errorlevel %err100%%err10%%%i set err1=%%i
+goto onErrorEnd
+:onError200
+for %%i in (0 1 2 3 4 5) do if errorlevel 2%%i0 set err10=%%i
+if err10==5 for %%i in (0 1 2 3 4 5) do if errorlevel 25%%i set err1=%%i
+if not err10==5 goto onError1
+:onErrorEnd
+set ANT_ERROR=%err100%%err10%%err1%
+for %%i in (1 10 100) do set err%%i=
+
 :end
-set _JAVACMD=
-set ANT_CMD_LINE_ARGS=
+rem bug ID 32069: resetting an undefined env variable changes the errorlevel.
+if not "%_JAVACMD%"=="" set _JAVACMD=
+if not "%_ANT_CMD_LINE_ARGS%"=="" set ANT_CMD_LINE_ARGS=
+
+if "%ANT_ERROR%"=="0" goto mainEnd
 
+rem Set the return code if we are not in NT.  We can only set
+rem a value of 1, but it's better than nothing.
+if not "%OS%"=="Windows_NT" echo 1 > nul | choice /n /c:1
+
+rem Set the ERRORLEVEL if we are running NT.
+if "%OS%"=="Windows_NT" color 00
+
+goto omega
+
+:mainEnd
+
+rem If there were no errors, we run the post script.
 if "%OS%"=="Windows_NT" @endlocal
 if "%OS%"=="WINNT" @endlocal
 
-:mainEnd
+if "%HOME%"=="" goto homeDrivePathPost
 if exist "%HOME%\antrc_post.bat" call "%HOME%\antrc_post.bat"
 
+:homeDrivePathPost
+if "%HOMEDRIVE%%HOMEPATH%"=="" goto userProfilePost
+if "%HOMEDRIVE%%HOMEPATH%"=="%HOME%" goto userProfilePost
+if exist "%HOMEDRIVE%%HOMEPATH%\antrc_post.bat" call "%HOMEDRIVE%%HOMEPATH%\antrc_post.bat"
+
+:userProfilePost
+if "%USERPROFILE%"=="" goto omega
+if "%USERPROFILE%"=="%HOME%" goto omega
+if "%USERPROFILE%"=="%HOMEDRIVE%%HOMEPATH%" goto omega
+if exist "%USERPROFILE%\antrc_post.bat" call "%USERPROFILE%\antrc_post.bat"
+
+:omega
+

Modified: cocoon/branches/BRANCH_2_1_X/tools/bin/ant.cmd
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/tools/bin/ant.cmd?rev=748739&r1=748738&r2=748739&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/tools/bin/ant.cmd (original)
+++ cocoon/branches/BRANCH_2_1_X/tools/bin/ant.cmd Fri Feb 27 23:29:03 2009
@@ -1,18 +1,18 @@
 /* 
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-  
-        http://www.apache.org/licenses/LICENSE-2.0
-  
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
  
     Run ant
 */

Modified: cocoon/branches/BRANCH_2_1_X/tools/bin/antRun
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/tools/bin/antRun?rev=748739&r1=748738&r2=748739&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/tools/bin/antRun (original)
+++ cocoon/branches/BRANCH_2_1_X/tools/bin/antRun Fri Feb 27 23:29:03 2009
@@ -1,22 +1,19 @@
-#!/bin/sh
+#! /bin/sh
 
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
 #
-#  Licensed to the Apache Software Foundation (ASF) under one or more
-#  contributor license agreements.  See the NOTICE file distributed with
-#  this work for additional information regarding copyright ownership.
-#  The ASF licenses this file to You under the Apache License, Version 2.0
-#  (the "License"); you may not use this file except in compliance with
-#  the License.  You may obtain a copy of the License at
-# 
-#       http://www.apache.org/licenses/LICENSE-2.0
-# 
-#   Unless required by applicable law or agreed to in writing, software
-#   distributed under the License is distributed on an "AS IS" BASIS,
-#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#   See the License for the specific language governing permissions and
-#   limitations under the License.
-# 
+#     http://www.apache.org/licenses/LICENSE-2.0
 #
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 
 # Args: DIR command
 cd "$1"

Modified: cocoon/branches/BRANCH_2_1_X/tools/bin/antRun.bat
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/tools/bin/antRun.bat?rev=748739&r1=748738&r2=748739&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/tools/bin/antRun.bat (original)
+++ cocoon/branches/BRANCH_2_1_X/tools/bin/antRun.bat Fri Feb 27 23:29:03 2009
@@ -1,22 +1,19 @@
 @echo off
 
-REM
-REM Licensed to the Apache Software Foundation (ASF) under one or more
-REM contributor license agreements.  See the NOTICE file distributed with
-REM this work for additional information regarding copyright ownership.
-REM The ASF licenses this file to You under the Apache License, Version 2.0
-REM (the "License"); you may not use this file except in compliance with
-REM the License.  You may obtain a copy of the License at
-REM
+REM  Licensed to the Apache Software Foundation (ASF) under one or more
+REM  contributor license agreements.  See the NOTICE file distributed with
+REM  this work for additional information regarding copyright ownership.
+REM  The ASF licenses this file to You under the Apache License, Version 2.0
+REM  (the "License"); you may not use this file except in compliance with
+REM  the License.  You may obtain a copy of the License at
+REM 
 REM      http://www.apache.org/licenses/LICENSE-2.0
-REM
+REM 
 REM  Unless required by applicable law or agreed to in writing, software
 REM  distributed under the License is distributed on an "AS IS" BASIS,
 REM  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 REM  See the License for the specific language governing permissions and
 REM  limitations under the License.
-REM
-REM
 
 if "%OS%"=="Windows_NT" @setlocal
 if "%OS%"=="WINNT" @setlocal
@@ -24,12 +21,17 @@
 if ""%1""=="""" goto runCommand
 
 rem Change drive and directory to %1
-if "%OS%"=="Windows_NT" cd /d ""%1""
-if not "%OS%"=="Windows_NT" cd ""%1""
+if "%OS%"=="Windows_NT" goto nt_cd
+if "%OS%"=="WINNT" goto nt_cd
+cd ""%1""
+goto end_cd
+:nt_cd
+cd /d ""%1""
+:end_cd
 shift
 
 rem Slurp the command line arguments. This loop allows for an unlimited number
-rem of agruments (up to the command line limit, anyway).
+rem of arguments (up to the command line limit, anyway).
 set ANT_RUN_CMD=%1
 if ""%1""=="""" goto runCommand
 shift

Modified: cocoon/branches/BRANCH_2_1_X/tools/bin/antRun.pl
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/tools/bin/antRun.pl?rev=748739&r1=748738&r2=748739&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/tools/bin/antRun.pl (original)
+++ cocoon/branches/BRANCH_2_1_X/tools/bin/antRun.pl Fri Feb 27 23:29:03 2009
@@ -1,11 +1,11 @@
 #!/usr/bin/perl
 #
 # Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
+#  contributor license agreements.  See the NOTICE file distributed with
+#  this work for additional information regarding copyright ownership.
+#  The ASF licenses this file to You under the Apache License, Version 2.0
+#  (the "License"); you may not use this file except in compliance with
+#  the License.  You may obtain a copy of the License at
 #
 #      http://www.apache.org/licenses/LICENSE-2.0
 #

Modified: cocoon/branches/BRANCH_2_1_X/tools/bin/antenv.cmd
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/tools/bin/antenv.cmd?rev=748739&r1=748738&r2=748739&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/tools/bin/antenv.cmd (original)
+++ cocoon/branches/BRANCH_2_1_X/tools/bin/antenv.cmd Fri Feb 27 23:29:03 2009
@@ -1,20 +1,18 @@
 /* 
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-  
-        http://www.apache.org/licenses/LICENSE-2.0
-  
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
-    Ant environment
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 */
 
 '@echo off'

Modified: cocoon/branches/BRANCH_2_1_X/tools/bin/complete-ant-cmd.pl
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/tools/bin/complete-ant-cmd.pl?rev=748739&r1=748738&r2=748739&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/tools/bin/complete-ant-cmd.pl (original)
+++ cocoon/branches/BRANCH_2_1_X/tools/bin/complete-ant-cmd.pl Fri Feb 27 23:29:03 2009
@@ -1,11 +1,11 @@
 #!/usr/bin/perl
 #
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
+#  Licensed to the Apache Software Foundation (ASF) under one or more
+#  contributor license agreements.  See the NOTICE file distributed with
+#  this work for additional information regarding copyright ownership.
+#  The ASF licenses this file to You under the Apache License, Version 2.0
+#  (the "License"); you may not use this file except in compliance with
+#  the License.  You may obtain a copy of the License at
 #
 #      http://www.apache.org/licenses/LICENSE-2.0
 #

Modified: cocoon/branches/BRANCH_2_1_X/tools/bin/envset.cmd
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/tools/bin/envset.cmd?rev=748739&r1=748738&r2=748739&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/tools/bin/envset.cmd (original)
+++ cocoon/branches/BRANCH_2_1_X/tools/bin/envset.cmd Fri Feb 27 23:29:03 2009
@@ -1,19 +1,19 @@
 /*
 
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-  
-        http://www.apache.org/licenses/LICENSE-2.0
-  
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
 SET environment variables
 First optional parameter:

Modified: cocoon/branches/BRANCH_2_1_X/tools/bin/lcp.bat
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/tools/bin/lcp.bat?rev=748739&r1=748738&r2=748739&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/tools/bin/lcp.bat (original)
+++ cocoon/branches/BRANCH_2_1_X/tools/bin/lcp.bat Fri Feb 27 23:29:03 2009
@@ -1,13 +1,13 @@
 REM
-REM Licensed to the Apache Software Foundation (ASF) under one or more
-REM contributor license agreements.  See the NOTICE file distributed with
-REM this work for additional information regarding copyright ownership.
-REM The ASF licenses this file to You under the Apache License, Version 2.0
-REM (the "License"); you may not use this file except in compliance with
-REM the License.  You may obtain a copy of the License at
-REM
+REM  Licensed to the Apache Software Foundation (ASF) under one or more
+REM  contributor license agreements.  See the NOTICE file distributed with
+REM  this work for additional information regarding copyright ownership.
+REM  The ASF licenses this file to You under the Apache License, Version 2.0
+REM  (the "License"); you may not use this file except in compliance with
+REM  the License.  You may obtain a copy of the License at
+REM 
 REM      http://www.apache.org/licenses/LICENSE-2.0
-REM
+REM 
 REM  Unless required by applicable law or agreed to in writing, software
 REM  distributed under the License is distributed on an "AS IS" BASIS,
 REM  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -27,5 +27,5 @@
 goto argCheck
 
 :gotAllArgs
-set LOCALCLASSPATH=%_CLASSPATHCOMPONENT%;%LOCALCLASSPATH%
+set LOCALCLASSPATH=%LOCALCLASSPATH%;%_CLASSPATHCOMPONENT%
 

Modified: cocoon/branches/BRANCH_2_1_X/tools/bin/runant.pl
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/tools/bin/runant.pl?rev=748739&r1=748738&r2=748739&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/tools/bin/runant.pl (original)
+++ cocoon/branches/BRANCH_2_1_X/tools/bin/runant.pl Fri Feb 27 23:29:03 2009
@@ -1,11 +1,11 @@
 #!/usr/bin/perl
 #
 # Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
+#  contributor license agreements.  See the NOTICE file distributed with
+#  this work for additional information regarding copyright ownership.
+#  The ASF licenses this file to You under the Apache License, Version 2.0
+#  (the "License"); you may not use this file except in compliance with
+#  the License.  You may obtain a copy of the License at
 #
 #      http://www.apache.org/licenses/LICENSE-2.0
 #

Modified: cocoon/branches/BRANCH_2_1_X/tools/bin/runant.py
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/tools/bin/runant.py?rev=748739&r1=748738&r2=748739&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/tools/bin/runant.py (original)
+++ cocoon/branches/BRANCH_2_1_X/tools/bin/runant.py Fri Feb 27 23:29:03 2009
@@ -1,10 +1,10 @@
 #!/usr/bin/python
 # Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
+#  contributor license agreements.  See the NOTICE file distributed with
+#  this work for additional information regarding copyright ownership.
+#  The ASF licenses this file to You under the Apache License, Version 2.0
+#  (the "License"); you may not use this file except in compliance with
+#  the License.  You may obtain a copy of the License at
 #
 #      http://www.apache.org/licenses/LICENSE-2.0
 #
@@ -96,6 +96,7 @@
 
 if debug:
     print '\n%s\n\n' % (cmdline)
+sys.stdout.flush()
 
 # Run the biniou!
 os.system(cmdline)

Modified: cocoon/branches/BRANCH_2_1_X/tools/bin/runrc.cmd
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/tools/bin/runrc.cmd?rev=748739&r1=748738&r2=748739&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/tools/bin/runrc.cmd (original)
+++ cocoon/branches/BRANCH_2_1_X/tools/bin/runrc.cmd Fri Feb 27 23:29:03 2009
@@ -1,21 +1,21 @@
 /* 
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-  
-        http://www.apache.org/licenses/LICENSE-2.0
-  
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
-    Run RC file, name is in the first arg, second arg is either PATH
-    ENV  or -r or nothing 
+   Run RC file, name is in the first arg, second arg is either PATH
+   ENV  or -r or nothing 
 */
 
 parse arg name path rest

Modified: cocoon/branches/BRANCH_2_1_X/tools/lib/ant-junit.jar
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/tools/lib/ant-junit.jar?rev=748739&r1=748738&r2=748739&view=diff
==============================================================================
Binary files - no diff available.

Modified: cocoon/branches/BRANCH_2_1_X/tools/lib/ant-launcher.jar
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/tools/lib/ant-launcher.jar?rev=748739&r1=748738&r2=748739&view=diff
==============================================================================
Binary files - no diff available.

Modified: cocoon/branches/BRANCH_2_1_X/tools/lib/ant-trax.jar
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/tools/lib/ant-trax.jar?rev=748739&r1=748738&r2=748739&view=diff
==============================================================================
Binary files - no diff available.

Modified: cocoon/branches/BRANCH_2_1_X/tools/lib/ant.jar
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/tools/lib/ant.jar?rev=748739&r1=748738&r2=748739&view=diff
==============================================================================
Binary files - no diff available.



Mime
View raw message