forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cross...@apache.org
Subject svn commit: r700693 - in /forrest/trunk: site-author/ tools/ant/bin/ tools/ant/lib/
Date Wed, 01 Oct 2008 06:53:17 GMT
Author: crossley
Date: Tue Sep 30 23:53:16 2008
New Revision: 700693

URL: http://svn.apache.org/viewvc?rev=700693&view=rev
Log:
Upgrade from Ant-1.6.5 to Ant-1.7.1 release.
Manually merged our old changes for the tools/ant/bin/* stuff.
Many of the changes were just to synchronise, and ease the diffs between us. They should have
no effect.

Added:
    forrest/trunk/tools/ant/lib/ant-testutil.jar   (with props)
    forrest/trunk/tools/ant/lib/apache-jakarta-oro-2.0.8.jar   (with props)
    forrest/trunk/tools/ant/lib/apache-jakarta-oro-2.0.8.jar.license.txt   (props changed)
      - copied unchanged from r699922, forrest/trunk/tools/ant/lib/oro-2.0.8.jar.license.txt
    forrest/trunk/tools/ant/lib/jsch-0.1.39.jar   (with props)
Removed:
    forrest/trunk/tools/ant/lib/ant-xalan2.jar
    forrest/trunk/tools/ant/lib/jsch-0.1.28.jar
    forrest/trunk/tools/ant/lib/oro-2.0.8.jar
    forrest/trunk/tools/ant/lib/oro-2.0.8.jar.license.txt
Modified:
    forrest/trunk/site-author/status.xml
    forrest/trunk/tools/ant/bin/ant
    forrest/trunk/tools/ant/bin/ant.bat
    forrest/trunk/tools/ant/bin/ant.cmd
    forrest/trunk/tools/ant/bin/antRun
    forrest/trunk/tools/ant/bin/antRun.bat
    forrest/trunk/tools/ant/bin/antRun.pl
    forrest/trunk/tools/ant/bin/antenv.cmd
    forrest/trunk/tools/ant/bin/complete-ant-cmd.pl
    forrest/trunk/tools/ant/bin/envset.cmd
    forrest/trunk/tools/ant/bin/lcp.bat
    forrest/trunk/tools/ant/bin/runant.pl
    forrest/trunk/tools/ant/bin/runant.py
    forrest/trunk/tools/ant/bin/runrc.cmd
    forrest/trunk/tools/ant/lib/ant-apache-oro.jar
    forrest/trunk/tools/ant/lib/ant-apache-resolver.jar
    forrest/trunk/tools/ant/lib/ant-commons-net.jar
    forrest/trunk/tools/ant/lib/ant-jsch.jar
    forrest/trunk/tools/ant/lib/ant-launcher.jar
    forrest/trunk/tools/ant/lib/ant-nodeps.jar
    forrest/trunk/tools/ant/lib/ant-trax.jar
    forrest/trunk/tools/ant/lib/ant.jar

Modified: forrest/trunk/site-author/status.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/site-author/status.xml?rev=700693&r1=700692&r2=700693&view=diff
==============================================================================
--- forrest/trunk/site-author/status.xml (original)
+++ forrest/trunk/site-author/status.xml Tue Sep 30 23:53:16 2008
@@ -151,6 +151,11 @@
         Added document to facilitate
         <link href="site:upgrading_09">upgrading to v0.9</link>
       </action>
+<!-- 2008-10 -->
+      <action context="code" type="update" dev="DC">
+        Updated to Apache-Ant-1.7.1 release.
+        Also jsch-0.1.28 to jsch-0.1.39 release.
+      </action>
 <!-- 2008-09 -->
       <action context="docs" type="add" dev="DC">
         Added new documents: <link href="site:forrestbot-svn">How to deploy

Modified: forrest/trunk/tools/ant/bin/ant
URL: http://svn.apache.org/viewvc/forrest/trunk/tools/ant/bin/ant?rev=700693&r1=700692&r2=700693&view=diff
==============================================================================
--- forrest/trunk/tools/ant/bin/ant (original)
+++ forrest/trunk/tools/ant/bin/ant Tue Sep 30 23:53:16 2008
@@ -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=
@@ -87,7 +87,7 @@
            ;;
 esac
 
-# Forrest uses its own packaged Ant, so don't use the system Ant libraries
+# Force Forrest's Ant to be used
 #if [ -z "$ANT_HOME" -o ! -d "$ANT_HOME" ] ; then
   ## resolve links - $0 may be a link to ant's home
   PRG="$0"
@@ -107,7 +107,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
@@ -123,9 +123,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
@@ -146,12 +148,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: forrest/trunk/tools/ant/bin/ant.bat
URL: http://svn.apache.org/viewvc/forrest/trunk/tools/ant/bin/ant.bat?rev=700693&r1=700692&r2=700693&view=diff
==============================================================================
--- forrest/trunk/tools/ant/bin/ant.bat (original)
+++ forrest/trunk/tools/ant/bin/ant.bat Tue Sep 30 23:53:16 2008
@@ -6,29 +6,58 @@
 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%\forrestrc_pre.bat" call "%HOME%\forrestrc_pre.bat"
+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%\forrestrc_pre.bat" call "%HOMEDRIVE%%HOMEPATH%\forrestrc_pre.bat"
+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
 
-REM Forrest uses its own packaged Ant, so don't use the system Ant libraries
-REM if "%ANT_HOME%"=="" set ANT_HOME=%DEFAULT_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).
@@ -52,6 +81,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
@@ -93,37 +131,100 @@
 
 :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%\forrestrc_post.bat" call "%HOME%\forrestrc_post.bat"
+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%\forrestrc_post.bat" call "%HOMEDRIVE%%HOMEPATH%\forrestrc_post.bat"
+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: forrest/trunk/tools/ant/bin/ant.cmd
URL: http://svn.apache.org/viewvc/forrest/trunk/tools/ant/bin/ant.cmd?rev=700693&r1=700692&r2=700693&view=diff
==============================================================================
--- forrest/trunk/tools/ant/bin/ant.cmd (original)
+++ forrest/trunk/tools/ant/bin/ant.cmd Tue Sep 30 23:53:16 2008
@@ -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: forrest/trunk/tools/ant/bin/antRun
URL: http://svn.apache.org/viewvc/forrest/trunk/tools/ant/bin/antRun?rev=700693&r1=700692&r2=700693&view=diff
==============================================================================
--- forrest/trunk/tools/ant/bin/antRun (original)
+++ forrest/trunk/tools/ant/bin/antRun Tue Sep 30 23:53:16 2008
@@ -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: forrest/trunk/tools/ant/bin/antRun.bat
URL: http://svn.apache.org/viewvc/forrest/trunk/tools/ant/bin/antRun.bat?rev=700693&r1=700692&r2=700693&view=diff
==============================================================================
--- forrest/trunk/tools/ant/bin/antRun.bat (original)
+++ forrest/trunk/tools/ant/bin/antRun.bat Tue Sep 30 23:53:16 2008
@@ -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: forrest/trunk/tools/ant/bin/antRun.pl
URL: http://svn.apache.org/viewvc/forrest/trunk/tools/ant/bin/antRun.pl?rev=700693&r1=700692&r2=700693&view=diff
==============================================================================
--- forrest/trunk/tools/ant/bin/antRun.pl (original)
+++ forrest/trunk/tools/ant/bin/antRun.pl Tue Sep 30 23:53:16 2008
@@ -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: forrest/trunk/tools/ant/bin/antenv.cmd
URL: http://svn.apache.org/viewvc/forrest/trunk/tools/ant/bin/antenv.cmd?rev=700693&r1=700692&r2=700693&view=diff
==============================================================================
--- forrest/trunk/tools/ant/bin/antenv.cmd (original)
+++ forrest/trunk/tools/ant/bin/antenv.cmd Tue Sep 30 23:53:16 2008
@@ -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: forrest/trunk/tools/ant/bin/complete-ant-cmd.pl
URL: http://svn.apache.org/viewvc/forrest/trunk/tools/ant/bin/complete-ant-cmd.pl?rev=700693&r1=700692&r2=700693&view=diff
==============================================================================
--- forrest/trunk/tools/ant/bin/complete-ant-cmd.pl (original)
+++ forrest/trunk/tools/ant/bin/complete-ant-cmd.pl Tue Sep 30 23:53:16 2008
@@ -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: forrest/trunk/tools/ant/bin/envset.cmd
URL: http://svn.apache.org/viewvc/forrest/trunk/tools/ant/bin/envset.cmd?rev=700693&r1=700692&r2=700693&view=diff
==============================================================================
--- forrest/trunk/tools/ant/bin/envset.cmd (original)
+++ forrest/trunk/tools/ant/bin/envset.cmd Tue Sep 30 23:53:16 2008
@@ -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: forrest/trunk/tools/ant/bin/lcp.bat
URL: http://svn.apache.org/viewvc/forrest/trunk/tools/ant/bin/lcp.bat?rev=700693&r1=700692&r2=700693&view=diff
==============================================================================
--- forrest/trunk/tools/ant/bin/lcp.bat (original)
+++ forrest/trunk/tools/ant/bin/lcp.bat Tue Sep 30 23:53:16 2008
@@ -1,15 +1,13 @@
-@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.
@@ -29,5 +27,5 @@
 goto argCheck
 
 :gotAllArgs
-set LOCALCLASSPATH=%_CLASSPATHCOMPONENT%;%LOCALCLASSPATH%
+set LOCALCLASSPATH=%LOCALCLASSPATH%;%_CLASSPATHCOMPONENT%
 

Modified: forrest/trunk/tools/ant/bin/runant.pl
URL: http://svn.apache.org/viewvc/forrest/trunk/tools/ant/bin/runant.pl?rev=700693&r1=700692&r2=700693&view=diff
==============================================================================
--- forrest/trunk/tools/ant/bin/runant.pl (original)
+++ forrest/trunk/tools/ant/bin/runant.pl Tue Sep 30 23:53:16 2008
@@ -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: forrest/trunk/tools/ant/bin/runant.py
URL: http://svn.apache.org/viewvc/forrest/trunk/tools/ant/bin/runant.py?rev=700693&r1=700692&r2=700693&view=diff
==============================================================================
--- forrest/trunk/tools/ant/bin/runant.py (original)
+++ forrest/trunk/tools/ant/bin/runant.py Tue Sep 30 23:53:16 2008
@@ -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: forrest/trunk/tools/ant/bin/runrc.cmd
URL: http://svn.apache.org/viewvc/forrest/trunk/tools/ant/bin/runrc.cmd?rev=700693&r1=700692&r2=700693&view=diff
==============================================================================
--- forrest/trunk/tools/ant/bin/runrc.cmd (original)
+++ forrest/trunk/tools/ant/bin/runrc.cmd Tue Sep 30 23:53:16 2008
@@ -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: forrest/trunk/tools/ant/lib/ant-apache-oro.jar
URL: http://svn.apache.org/viewvc/forrest/trunk/tools/ant/lib/ant-apache-oro.jar?rev=700693&r1=700692&r2=700693&view=diff
==============================================================================
Binary files - no diff available.

Modified: forrest/trunk/tools/ant/lib/ant-apache-resolver.jar
URL: http://svn.apache.org/viewvc/forrest/trunk/tools/ant/lib/ant-apache-resolver.jar?rev=700693&r1=700692&r2=700693&view=diff
==============================================================================
Files forrest/trunk/tools/ant/lib/ant-apache-resolver.jar (original) and forrest/trunk/tools/ant/lib/ant-apache-resolver.jar
Tue Sep 30 23:53:16 2008 differ

Modified: forrest/trunk/tools/ant/lib/ant-commons-net.jar
URL: http://svn.apache.org/viewvc/forrest/trunk/tools/ant/lib/ant-commons-net.jar?rev=700693&r1=700692&r2=700693&view=diff
==============================================================================
Binary files - no diff available.

Modified: forrest/trunk/tools/ant/lib/ant-jsch.jar
URL: http://svn.apache.org/viewvc/forrest/trunk/tools/ant/lib/ant-jsch.jar?rev=700693&r1=700692&r2=700693&view=diff
==============================================================================
Binary files - no diff available.

Modified: forrest/trunk/tools/ant/lib/ant-launcher.jar
URL: http://svn.apache.org/viewvc/forrest/trunk/tools/ant/lib/ant-launcher.jar?rev=700693&r1=700692&r2=700693&view=diff
==============================================================================
Files forrest/trunk/tools/ant/lib/ant-launcher.jar (original) and forrest/trunk/tools/ant/lib/ant-launcher.jar
Tue Sep 30 23:53:16 2008 differ

Modified: forrest/trunk/tools/ant/lib/ant-nodeps.jar
URL: http://svn.apache.org/viewvc/forrest/trunk/tools/ant/lib/ant-nodeps.jar?rev=700693&r1=700692&r2=700693&view=diff
==============================================================================
Files forrest/trunk/tools/ant/lib/ant-nodeps.jar (original) and forrest/trunk/tools/ant/lib/ant-nodeps.jar
Tue Sep 30 23:53:16 2008 differ

Added: forrest/trunk/tools/ant/lib/ant-testutil.jar
URL: http://svn.apache.org/viewvc/forrest/trunk/tools/ant/lib/ant-testutil.jar?rev=700693&view=auto
==============================================================================
Binary file - no diff available.

Propchange: forrest/trunk/tools/ant/lib/ant-testutil.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: forrest/trunk/tools/ant/lib/ant-trax.jar
URL: http://svn.apache.org/viewvc/forrest/trunk/tools/ant/lib/ant-trax.jar?rev=700693&r1=700692&r2=700693&view=diff
==============================================================================
Files forrest/trunk/tools/ant/lib/ant-trax.jar (original) and forrest/trunk/tools/ant/lib/ant-trax.jar
Tue Sep 30 23:53:16 2008 differ

Modified: forrest/trunk/tools/ant/lib/ant.jar
URL: http://svn.apache.org/viewvc/forrest/trunk/tools/ant/lib/ant.jar?rev=700693&r1=700692&r2=700693&view=diff
==============================================================================
Files forrest/trunk/tools/ant/lib/ant.jar (original) and forrest/trunk/tools/ant/lib/ant.jar
Tue Sep 30 23:53:16 2008 differ

Added: forrest/trunk/tools/ant/lib/apache-jakarta-oro-2.0.8.jar
URL: http://svn.apache.org/viewvc/forrest/trunk/tools/ant/lib/apache-jakarta-oro-2.0.8.jar?rev=700693&view=auto
==============================================================================
Binary file - no diff available.

Propchange: forrest/trunk/tools/ant/lib/apache-jakarta-oro-2.0.8.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Propchange: forrest/trunk/tools/ant/lib/apache-jakarta-oro-2.0.8.jar.license.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: forrest/trunk/tools/ant/lib/apache-jakarta-oro-2.0.8.jar.license.txt
------------------------------------------------------------------------------
    svn:mergeinfo = 

Added: forrest/trunk/tools/ant/lib/jsch-0.1.39.jar
URL: http://svn.apache.org/viewvc/forrest/trunk/tools/ant/lib/jsch-0.1.39.jar?rev=700693&view=auto
==============================================================================
Binary file - no diff available.

Propchange: forrest/trunk/tools/ant/lib/jsch-0.1.39.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream



Mime
View raw message