Return-Path: Delivered-To: apmail-xml-forrest-dev-archive@www.apache.org Received: (qmail 67631 invoked from network); 15 Feb 2004 11:31:43 -0000 Received: from daedalus.apache.org (HELO mail.apache.org) (208.185.179.12) by minotaur-2.apache.org with SMTP; 15 Feb 2004 11:31:43 -0000 Received: (qmail 20198 invoked by uid 500); 15 Feb 2004 11:31:42 -0000 Delivered-To: apmail-xml-forrest-dev-archive@xml.apache.org Received: (qmail 20154 invoked by uid 500); 15 Feb 2004 11:31:42 -0000 Mailing-List: contact forrest-cvs-help@xml.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: list-post: Reply-To: forrest-dev@xml.apache.org Delivered-To: mailing list forrest-cvs@xml.apache.org Received: (qmail 20139 invoked from network); 15 Feb 2004 11:31:42 -0000 Received: from unknown (HELO minotaur.apache.org) (209.237.227.194) by daedalus.apache.org with SMTP; 15 Feb 2004 11:31:42 -0000 Received: (qmail 67615 invoked by uid 1746); 15 Feb 2004 11:31:42 -0000 Date: 15 Feb 2004 11:31:42 -0000 Message-ID: <20040215113142.67614.qmail@minotaur.apache.org> From: antonio@apache.org To: xml-forrest-cvs@apache.org Subject: cvs commit: xml-forrest/legal LICENSE.ant X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N antonio 2004/02/15 03:31:41 Modified: tools/ant/bin runant.pl antRun runant.py ant.bat antRun.pl complete-ant-cmd.pl ant lcp.bat antRun.bat tools/ant/lib ant.jar ant-xalan2.jar ant-trax.jar ant-launcher.jar ant-apache-resolver.jar ant-nodeps.jar . status.xml legal LICENSE.ant Added: tools/ant/bin ant.cmd envset.cmd antenv.cmd runrc.cmd Log: Update to Ant 1.6.1 Revision Changes Path 1.6 +13 -2 xml-forrest/tools/ant/bin/runant.pl Index: runant.pl =================================================================== RCS file: /home/cvs//xml-forrest/tools/ant/bin/runant.pl,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- runant.pl 20 Dec 2003 07:24:57 -0000 1.5 +++ runant.pl 15 Feb 2004 11:31:40 -0000 1.6 @@ -1,7 +1,18 @@ #!/usr/bin/perl # -# Copyright (c) 2000-2003 The Apache Software Foundation. All rights -# reserved. +# Copyright 2000-2004 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. +# 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. # ####################################################################### # 1.4 +17 -3 xml-forrest/tools/ant/bin/antRun Index: antRun =================================================================== RCS file: /home/cvs//xml-forrest/tools/ant/bin/antRun,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- antRun 30 Oct 2002 09:08:27 -0000 1.3 +++ antRun 15 Feb 2004 11:31:40 -0000 1.4 @@ -1,7 +1,21 @@ -#! /bin/sh +#!/bin/sh -# Copyright (c) 2001-2002 The Apache Software Foundation. All rights -# reserved. +# +# Copyright 2001-2002,2004 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. +# 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. +# +# # Args: DIR command cd "$1" 1.4 +15 -3 xml-forrest/tools/ant/bin/runant.py Index: runant.py =================================================================== RCS file: /home/cvs//xml-forrest/tools/ant/bin/runant.py,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- runant.py 20 Dec 2003 07:24:57 -0000 1.3 +++ runant.py 15 Feb 2004 11:31:40 -0000 1.4 @@ -1,4 +1,19 @@ #!/usr/bin/python +# Copyright 2001,2003-2004 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. +# 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. +# + """ runant.py @@ -7,9 +22,6 @@ It runs ant with/out arguments, it should be quite portable (thanks to the python os library) This script has been tested with Python2.0/Win2K - - Copyright (c) 2001,2003 The Apache Software Foundation. All rights - reserved. created: 2001-04-11 author: Pierre Dittgen pierre.dittgen@criltelecom.com 1.11 +106 -95 xml-forrest/tools/ant/bin/ant.bat Index: ant.bat =================================================================== RCS file: /home/cvs//xml-forrest/tools/ant/bin/ant.bat,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- ant.bat 22 Dec 2003 06:40:15 -0000 1.10 +++ ant.bat 15 Feb 2004 11:31:40 -0000 1.11 @@ -1,95 +1,106 @@ -@echo off - -REM Copyright (c) 2001-2003 The Apache Software Foundation. All rights -REM reserved. - -if exist "%HOME%\forrestrc_pre.bat" call "%HOME%\forrestrc_pre.bat" - -if "%OS%"=="Windows_NT" @setlocal - -rem %~dp0 is expanded pathname of the current script under NT -set DEFAULT_ANT_HOME=%~dp0.. - -if "%ANT_HOME%"=="" set ANT_HOME=%DEFAULT_ANT_HOME% -set DEFAULT_ANT_HOME= - -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 -if ""%1""=="""" goto doneStart -shift -:setupArgs -if ""%1""=="""" goto doneStart -set ANT_CMD_LINE_ARGS=%ANT_CMD_LINE_ARGS% %1 -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. - -:doneStart -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 - -rem check for ant in Program Files -if not exist "%ProgramFiles%\ant" goto checkSystemDrive -set ANT_HOME=%ProgramFiles%\ant -goto checkJava - -:checkSystemDrive -rem check for ant in root directory of system drive -if not exist %SystemDrive%\ant\lib\ant.jar goto checkCDrive -set ANT_HOME=%SystemDrive%\ant -goto checkJava - -:checkCDrive -rem check for ant in C:\ant for Win9X users -if not exist C:\ant\lib\ant.jar goto noAntHome -set ANT_HOME=C:\ant -goto checkJava - -:noAntHome -echo ANT_HOME is set incorrectly or ant could not be located. Please set ANT_HOME. -goto end - -:checkJava -set _JAVACMD=%JAVACMD% - -if "%JAVA_HOME%" == "" goto noJavaHome -if not exist "%JAVA_HOME%\bin\java.exe" goto noJavaHome -if "%_JAVACMD%" == "" set _JAVACMD=%JAVA_HOME%\bin\java.exe -goto checkJikes - -:noJavaHome -if "%_JAVACMD%" == "" set _JAVACMD=java.exe - -:checkJikes -if not "%JIKESPATH%"=="" goto runAntWithJikes - -:runAnt -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 - -: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% -goto end - -:runAntWithJikes -if not "%CLASSPATH%"=="" goto 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% %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% -goto end - -:end -set _JAVACMD= -set ANT_CMD_LINE_ARGS= - -if "%OS%"=="Windows_NT" @endlocal - -:mainEnd -if exist "%HOME%\forrestrc_post.bat" call "%HOME%\forrest_post.bat" - +@echo off + +REM Copyright 2001,2004 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. +REM You may obtain a copy of the License at +REM +REM http://www.apache.org/licenses/LICENSE-2.0 +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. + +if exist "%HOME%\antrc_pre.bat" call "%HOME%\antrc_pre.bat" + +if "%OS%"=="Windows_NT" @setlocal + +rem %~dp0 is expanded pathname of the current script under NT +set DEFAULT_ANT_HOME=%~dp0.. + +if "%ANT_HOME%"=="" set ANT_HOME=%DEFAULT_ANT_HOME% +set DEFAULT_ANT_HOME= + +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 +if ""%1""=="""" goto doneStart +shift +:setupArgs +if ""%1""=="""" goto doneStart +set ANT_CMD_LINE_ARGS=%ANT_CMD_LINE_ARGS% %1 +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. + +:doneStart +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 + +rem check for ant in Program Files +if not exist "%ProgramFiles%\ant" goto checkSystemDrive +set ANT_HOME=%ProgramFiles%\ant +goto checkJava + +:checkSystemDrive +rem check for ant in root directory of system drive +if not exist %SystemDrive%\ant\lib\ant.jar goto checkCDrive +set ANT_HOME=%SystemDrive%\ant +goto checkJava + +:checkCDrive +rem check for ant in C:\ant for Win9X users +if not exist C:\ant\lib\ant.jar goto noAntHome +set ANT_HOME=C:\ant +goto checkJava + +:noAntHome +echo ANT_HOME is set incorrectly or ant could not be located. Please set ANT_HOME. +goto end + +:checkJava +set _JAVACMD=%JAVACMD% + +if "%JAVA_HOME%" == "" goto noJavaHome +if not exist "%JAVA_HOME%\bin\java.exe" goto noJavaHome +if "%_JAVACMD%" == "" set _JAVACMD=%JAVA_HOME%\bin\java.exe +goto checkJikes + +:noJavaHome +if "%_JAVACMD%" == "" set _JAVACMD=java.exe + +:checkJikes +if not "%JIKESPATH%"=="" goto runAntWithJikes + +:runAnt +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 + +: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% +goto end + +:runAntWithJikes +if not "%CLASSPATH%"=="" goto 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% %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% +goto end + +:end +set _JAVACMD= +set ANT_CMD_LINE_ARGS= + +if "%OS%"=="Windows_NT" @endlocal + +:mainEnd +if exist "%HOME%\antrc_post.bat" call "%HOME%\antrc_post.bat" + 1.4 +13 -2 xml-forrest/tools/ant/bin/antRun.pl Index: antRun.pl =================================================================== RCS file: /home/cvs//xml-forrest/tools/ant/bin/antRun.pl,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- antRun.pl 20 Dec 2003 07:24:57 -0000 1.3 +++ antRun.pl 15 Feb 2004 11:31:40 -0000 1.4 @@ -1,7 +1,18 @@ #!/usr/bin/perl # -# Copyright (c) 2001,2003 The Apache Software Foundation. All rights -# reserved. +# Copyright 2001,2003-2004 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. +# 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. # ####################################################################### # 1.2 +13 -2 xml-forrest/tools/ant/bin/complete-ant-cmd.pl Index: complete-ant-cmd.pl =================================================================== RCS file: /home/cvs//xml-forrest/tools/ant/bin/complete-ant-cmd.pl,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- complete-ant-cmd.pl 30 Oct 2002 09:08:27 -0000 1.1 +++ complete-ant-cmd.pl 15 Feb 2004 11:31:40 -0000 1.2 @@ -1,7 +1,18 @@ #!/usr/bin/perl # -# Copyright (c) 2001 The Apache Software Foundation. All rights -# reserved. +# Copyright 2001,2004 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. +# 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. # # A script to allow Bash or Z-Shell to complete an Ant command-line. # 1.9 +17 -6 xml-forrest/tools/ant/bin/ant Index: ant =================================================================== RCS file: /home/cvs//xml-forrest/tools/ant/bin/ant,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- ant 22 Dec 2003 06:40:15 -0000 1.8 +++ ant 15 Feb 2004 11:31:40 -0000 1.9 @@ -1,11 +1,22 @@ #! /bin/sh -# Copyright (c) 2001-2003 The Apache Software Foundation. All rights -# reserved. +# Copyright 2001-2004 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. +# 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. # load system-wide ant configuration -if [ -f "/etc/forrest.conf" ] ; then - . /etc/forrest.conf +if [ -f "/etc/ant.conf" ] ; then + . /etc/ant.conf fi # provide default values for people who don't use RPMs @@ -18,8 +29,8 @@ fi # load user ant configuration -if [ -f "$HOME/.forrestrc" ] ; then - . "$HOME/.forrestrc" +if [ -f "$HOME/.antrc" ] ; then + . "$HOME/.antrc" fi # OS specific support. $var _must_ be set to either true or false. 1.6 +30 -16 xml-forrest/tools/ant/bin/lcp.bat Index: lcp.bat =================================================================== RCS file: /home/cvs//xml-forrest/tools/ant/bin/lcp.bat,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- lcp.bat 13 Dec 2003 06:35:22 -0000 1.5 +++ lcp.bat 15 Feb 2004 11:31:40 -0000 1.6 @@ -1,16 +1,30 @@ -REM Copyright (c) 2001-2003 The Apache Software Foundation. All rights -REM reserved. - -set _CLASSPATHCOMPONENT=%1 -if ""%1""=="""" goto gotAllArgs -shift - -:argCheck -if ""%1""=="""" goto gotAllArgs -set _CLASSPATHCOMPONENT=%_CLASSPATHCOMPONENT% %1 -shift -goto argCheck - -:gotAllArgs -set LOCALCLASSPATH=%_CLASSPATHCOMPONENT%;%LOCALCLASSPATH% - +REM +REM Copyright 2001-2004 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. +REM You may obtain a copy of the License at +REM +REM http://www.apache.org/licenses/LICENSE-2.0 +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 + +set _CLASSPATHCOMPONENT=%1 +if ""%1""=="""" goto gotAllArgs +shift + +:argCheck +if ""%1""=="""" goto gotAllArgs +set _CLASSPATHCOMPONENT=%_CLASSPATHCOMPONENT% %1 +shift +goto argCheck + +:gotAllArgs +set LOCALCLASSPATH=%_CLASSPATHCOMPONENT%;%LOCALCLASSPATH% + 1.5 +45 -31 xml-forrest/tools/ant/bin/antRun.bat Index: antRun.bat =================================================================== RCS file: /home/cvs//xml-forrest/tools/ant/bin/antRun.bat,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- antRun.bat 13 Dec 2003 06:35:22 -0000 1.4 +++ antRun.bat 15 Feb 2004 11:31:40 -0000 1.5 @@ -1,31 +1,45 @@ -@echo off - -REM Copyright (c) 2001-2002 The Apache Software Foundation. All rights -REM reserved. - -if "%OS%"=="Windows_NT" @setlocal - -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"" -shift - -rem Slurp the command line arguments. This loop allows for an unlimited number -rem of agruments (up to the command line limit, anyway). -set ANT_RUN_CMD=%1 -if ""%1""=="""" goto runCommand -shift -:loop -if ""%1""=="""" goto runCommand -set ANT_RUN_CMD=%ANT_RUN_CMD% %1 -shift -goto loop - -:runCommand -rem echo %ANT_RUN_CMD% -%ANT_RUN_CMD% - -if "%OS%"=="Windows_NT" @endlocal - +@echo off + +REM +REM Copyright 2001-2002,2004 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. +REM You may obtain a copy of the License at +REM +REM http://www.apache.org/licenses/LICENSE-2.0 +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 ""%1""=="""" goto runCommand + +rem Change drive and directory to %1 +if "%OS%"=="Windows_NT" cd /d ""%1"" +if not "%OS%"=="Windows_NT" cd ""%1"" +shift + +rem Slurp the command line arguments. This loop allows for an unlimited number +rem of agruments (up to the command line limit, anyway). +set ANT_RUN_CMD=%1 +if ""%1""=="""" goto runCommand +shift +:loop +if ""%1""=="""" goto runCommand +set ANT_RUN_CMD=%ANT_RUN_CMD% %1 +shift +goto loop + +:runCommand +rem echo %ANT_RUN_CMD% +%ANT_RUN_CMD% + +if "%OS%"=="Windows_NT" @endlocal + 1.1 xml-forrest/tools/ant/bin/ant.cmd Index: ant.cmd =================================================================== /* Copyright (c) 2003 The Apache Software Foundation. All rights reserved. Run ant */ parse arg mode envarg '::' antarg if mode\='.' & mode\='..' & mode\='/' then do envarg = mode envarg mode = '' end if antarg = '' then do antarg = envarg envarg = '' end x = setlocal() env="OS2ENVIRONMENT" antenv = _getenv_('antenv') if _testenv_() = 0 then do interpret 'call "' || antenv || '"' '"' || envarg || '"' if _testenv_() = 0 then do say 'Ant environment is not set properly' x = endlocal() exit 16 end end if mode = '' then mode = _getenv_('ANT_MODE' '..') if mode \= '/' then do runrc = _getenv_('runrc') antrc = _getenv_('antrc' 'antrc.cmd') if mode = '..' then mode = '-r' else mode = '' interpret 'call "' || runrc || '"' antrc '"' || mode || '"' end settings = '-Dant.home=' || ANT_HOME '-Djava.home=' || JAVA_HOME java = _getenv_('javacmd' 'java') opts = value('ANT_OPTS',,env) args = value('ANT_ARGS',,env) lcp = value('LOCALCLASSPATH',,env) if lcp\='' then lcp = '-cp' lcp java opts lcp 'org.apache.tools.ant.Main' settings args antarg x = endlocal() return rc _testenv_: procedure expose env ANT_HOME JAVA_HOME ANT_HOME = value('ANT_HOME',,env) if ANT_HOME = '' then return 0 JAVA_HOME = value('JAVA_HOME',,env) if JAVA_HOME = '' then return 0 cp = translate(value('CLASSPATH',,env)) if pos(translate(ANT_HOME), cp) = 0 then return 0 if pos(translate(JAVA_HOME), cp) = 0 then return 0 return 1 _getenv_: procedure expose env parse arg envar default if default = '' then default = envar var = value(translate(envar),,env) if var = '' then var = default return var 1.1 xml-forrest/tools/ant/bin/envset.cmd Index: envset.cmd =================================================================== /* Copyright (c) 2003 The Apache Software Foundation. All rights reserved. SET environment variables First optional parameter: ; parameters are considered parts of a path variable, semicolons are appended to each element if not already present -D parameters are properties for Java or Makefile etc., -D will be prepended and the parameters will be separated by a space =D the same as above but equal sign is not required , parameters should be comma separated in the environment variable - parameters should be separated by the next parameter Other values mean that the first parameter is missing and the environment variable will be set to the space separated parameters Second parameter: name of the environment variable Next parameters: values ; implies that the equal sign is considered a part of the parameter and is not interpreted -D requires parameters in the form name=value. If the equal sign is not found, the parameters are changed to name=expanded_name Other options have optional equal sign. If it is found, only the part after the equal sign will be oprionally expanded. If the parameter is the minus sign, the next parameter will not be expanded. If the parameter is a single dot, it will be replaced with the value of the environment variable as it existed before envset was invoked. For other parameters the batch looks for the environment variable with the same name (in uppercase). If it is found, it forms the expanded_name. If the environment variable with such a name does not exist, the expanded_name will hold the parameter name without case conversion. */ parse arg mode envar args equal = 0 sep = ' ' /* Parse command line parameters */ select when mode='-' then do sep = envar parse var args envar args end when mode=';' then do sep = '' equal = -1 end when mode='-D' then equal = 1 when mode='=D' then mode = '-D' when mode=',' then sep = ',' otherwise args = envar args envar = mode mode = '' end env = 'OS2ENVIRONMENT' envar = translate(envar) orig = value(envar,,env) newval = '' expand = 1 /* for each parameter... */ do i = 1 to words(args) if expand > 0 & word(args, i) = '-' then expand = 0 else call addval word(args, i) end /* Optionally enclose path variable by quotes */ if mode = ';' & pos(' ', newval) > 0 then newval = '"' || newval || '"' /* Set the new value, 'SET' cannot be used since it does not allow '=' */ x = value(envar, newval, env) exit 0 addval: procedure expose sep equal orig expand newval mode env parse arg var if var = '.' then expvar = orig else do if equal >= 0 then do parse var var name '=' val if val = '' then var = name else var = val end if expand = 0 then expvar = var else expvar = value(translate(var),,env) if expvar = '' then expvar = var if equal >= 0 then do if val = '' then do parse var expvar key '=' val if val <> '' then name = key else do if equal > 0 then val = key else name = key end end else val = expvar if pos(' ', val) > 0 | pos('=', val) > 0 then val = '"' || val || '"' if val = '' then expvar = name else expvar = name || '=' || val end if mode = '-D' then expvar = '-D' || expvar if mode = ';' then do if right(expvar, 1) <> ';' then expvar = expvar || ';' end end if newval = '' then newval = expvar else newval = newval || sep || expvar expand = 1 return 1.1 xml-forrest/tools/ant/bin/antenv.cmd Index: antenv.cmd =================================================================== /* Copyright (c) 2003 The Apache Software Foundation. All rights reserved. Ant environment */ call RxFuncAdd "SysLoadFuncs", "RexxUtil", "SysLoadFuncs" call SysLoadFuncs /* Prepare the parameters for later use */ parse arg argv mode = '' args = '' opts = '' cp = '' lcp = '' do i = 1 to words(argv) param = word(argv, i) select when param='-lcp' then mode = 'l' when param='-cp' | param='-classpath' then mode = 'c' when abbrev('-opts', param, 4) then mode = 'o' when abbrev('-args', param, 4) then mode = 'a' otherwise select when mode = 'a' then args = space(args param, 1) when mode = 'c' then cp = space(cp param, 1) when mode = 'l' then lcp = space(lcp param, 1) when mode = 'o' then opts = space(opts param, 1) otherwise say 'Option' param 'ignored' end end end env="OS2ENVIRONMENT" antconf = _getenv_('antconf' 'antconf.cmd') runrc = _getenv_('runrc') interpret 'call "' || runrc || '"' '"' || antconf || '"' 'ETC' ANT_HOME = value('ANT_HOME',,env) JAVA_HOME = value('JAVA_HOME',,env) classpath = value('CLASSPATH',,env) classes = stream(JAVA_HOME || "\lib\classes.zip", "C", "QUERY EXISTS") if classes \= '' then classpath = prepend(classpath classes) classes = stream(JAVA_HOME || "\lib\tools.jar", "C", "QUERY EXISTS") if classes \= '' then classpath = prepend(classpath classes) mincp = classpath call SysFileTree ANT_HOME || '\lib\*.jar', 'jar', 'FO' do i = 1 to jar.0 nm = filespec('name', jar.i) if pos('ant-', nm) == 0 then classpath = prepend(classpath jar.i) end if length(classpath) > 512 then do say 'Classpath is too long, switching to the minimal version...' say '... some tasks will not work' classpath = mincp classpath = prepend(classpath ANT_HOME || '\lib\ant.jar') classpath = prepend(classpath ANT_HOME || '\lib\optional.jar') end 'SET CLASSPATH=' || classpath /* Setting classpathes, options and arguments */ envset = _getenv_('envset') if cp\='' then interpret 'call "' || envset || '"' '"; CLASSPATH"' '"' || cp || '"' if lcp\='' then interpret 'call "' || envset || '"' '"; LOCALCLASSPATH"' '"' || lcp || '"' if opts\='' then interpret 'call "' || envset || '"' '"-D ANT_OPTS"' '"' || opts || '"' if args\='' then interpret 'call "' || envset || '"' '"ANT_ARGS"' '"' || args || '"' exit 0 addpath: procedure parse arg path elem if elem = '' then do if path\='' & right(path, 1)\=';' then path = path || ';' return path end if substr(path, length(path)) = ';' then glue = '' else glue = ';' if pos(translate(elem), translate(path)) = 0 then path = path || glue || elem || ';' return path prepend: procedure parse arg path elem if elem = '' then do if path\='' & right(path, 1)\=';' then path = path || ';' return path end if pos(translate(elem), translate(path)) = 0 then path = elem || ';' || path return path _getenv_: procedure expose env parse arg envar default if default = '' then default = envar var = value(translate(envar),,env) if var = '' then var = default return var 1.1 xml-forrest/tools/ant/bin/runrc.cmd Index: runrc.cmd =================================================================== /* Copyright (c) 2003 The Apache Software Foundation. All rights reserved. Run RC file, name is in the first arg, second arg is either PATH ENV or -r or nothing */ parse arg name path rest if name = '' then do say 'RC file name is missing' exit 1 end if rest \= '' then do say 'Too many parameters' exit 1 end call runit name path exit 0 runit: procedure parse arg name path dir if path \= '' & path \= '-r' then do dir = value(translate(path),,'OS2ENVIRONMENT') if dir = '' then return dir = translate(dir, '\', '/') /* change UNIX-like path to OS/2 */ end if dir = '' then dir = directory() if path = '-r' then do /* recursive call */ subdir = filespec('path', dir) if subdir \= '\' then do subdir = left(subdir, length(subdir)-1) call runit name path filespec('drive', dir) || subdir end end /* Look for the file and run it */ if right(dir, 1) \= '\' then dir = dir || '\' rcfile = stream(dir || name, 'c', 'query exists') if rcfile \= '' then interpret 'call "' || rcfile || '"' return 1.7 +4655 -4486xml-forrest/tools/ant/lib/ant.jar <> 1.6 +22 -29 xml-forrest/tools/ant/lib/ant-xalan2.jar <> 1.6 +340 -340 xml-forrest/tools/ant/lib/ant-trax.jar <> 1.3 +53 -50 xml-forrest/tools/ant/lib/ant-launcher.jar <> 1.6 +31 -28 xml-forrest/tools/ant/lib/ant-apache-resolver.jar <> 1.2 +1993 -1934xml-forrest/tools/ant/lib/ant-nodeps.jar <> 1.286 +4 -1 xml-forrest/status.xml Index: status.xml =================================================================== RCS file: /home/cvs//xml-forrest/status.xml,v retrieving revision 1.285 retrieving revision 1.286 diff -u -r1.285 -r1.286 --- status.xml 9 Feb 2004 13:33:28 -0000 1.285 +++ status.xml 15 Feb 2004 11:31:41 -0000 1.286 @@ -29,6 +29,9 @@ + + Updated Ant 1.6.1 + Add i18n to tabs 1.2 +200 -45 xml-forrest/legal/LICENSE.ant Index: LICENSE.ant =================================================================== RCS file: /home/cvs//xml-forrest/legal/LICENSE.ant,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- LICENSE.ant 26 Feb 2002 23:50:24 -0000 1.1 +++ LICENSE.ant 15 Feb 2004 11:31:41 -0000 1.2 @@ -1,48 +1,203 @@ /* - * ============================================================================ - * The Apache Software License, Version 1.1 - * ============================================================================ - * - * Copyright (C) 1999 The Apache Software Foundation. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without modifica- - * tion, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * 3. The end-user documentation included with the redistribution, if any, must - * include the following acknowledgment: "This product includes software - * developed by the Apache Software Foundation (http://www.apache.org/)." - * Alternately, this acknowledgment may appear in the software itself, if - * and wherever such third-party acknowledgments normally appear. - * - * 4. The names "Ant" and "Apache Software Foundation" must not be used to - * endorse or promote products derived from this software without prior - * written permission. For written permission, please contact - * apache@apache.org. - * - * 5. Products derived from this software may not be called "Apache", nor may - * "Apache" appear in their name, without prior written permission of the - * Apache Software Foundation. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, - * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU- - * DING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON - * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * This software consists of voluntary contributions made by many individuals - * on behalf of the Apache Software Foundation. For more information on the - * Apache Software Foundation, please see . + * Apache License + * Version 2.0, January 2004 + * http://www.apache.org/licenses/ * + * TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + * + * 1. Definitions. + * + * "License" shall mean the terms and conditions for use, reproduction, + * and distribution as defined by Sections 1 through 9 of this document. + * + * "Licensor" shall mean the copyright owner or entity authorized by + * the copyright owner that is granting the License. + * + * "Legal Entity" shall mean the union of the acting entity and all + * other entities that control, are controlled by, or are under common + * control with that entity. For the purposes of this definition, + * "control" means (i) the power, direct or indirect, to cause the + * direction or management of such entity, whether by contract or + * otherwise, or (ii) ownership of fifty percent (50%) or more of the + * outstanding shares, or (iii) beneficial ownership of such entity. + * + * "You" (or "Your") shall mean an individual or Legal Entity + * exercising permissions granted by this License. + * + * "Source" form shall mean the preferred form for making modifications, + * including but not limited to software source code, documentation + * source, and configuration files. + * + * "Object" form shall mean any form resulting from mechanical + * transformation or translation of a Source form, including but + * not limited to compiled object code, generated documentation, + * and conversions to other media types. + * + * "Work" shall mean the work of authorship, whether in Source or + * Object form, made available under the License, as indicated by a + * copyright notice that is included in or attached to the work + * (an example is provided in the Appendix below). + * + * "Derivative Works" shall mean any work, whether in Source or Object + * form, that is based on (or derived from) the Work and for which the + * editorial revisions, annotations, elaborations, or other modifications + * represent, as a whole, an original work of authorship. For the purposes + * of this License, Derivative Works shall not include works that remain + * separable from, or merely link (or bind by name) to the interfaces of, + * the Work and Derivative Works thereof. + * + * "Contribution" shall mean any work of authorship, including + * the original version of the Work and any modifications or additions + * to that Work or Derivative Works thereof, that is intentionally + * submitted to Licensor for inclusion in the Work by the copyright owner + * or by an individual or Legal Entity authorized to submit on behalf of + * the copyright owner. For the purposes of this definition, "submitted" + * means any form of electronic, verbal, or written communication sent + * to the Licensor or its representatives, including but not limited to + * communication on electronic mailing lists, source code control systems, + * and issue tracking systems that are managed by, or on behalf of, the + * Licensor for the purpose of discussing and improving the Work, but + * excluding communication that is conspicuously marked or otherwise + * designated in writing by the copyright owner as "Not a Contribution." + * + * "Contributor" shall mean Licensor and any individual or Legal Entity + * on behalf of whom a Contribution has been received by Licensor and + * subsequently incorporated within the Work. + * + * 2. Grant of Copyright License. Subject to the terms and conditions of + * this License, each Contributor hereby grants to You a perpetual, + * worldwide, non-exclusive, no-charge, royalty-free, irrevocable + * copyright license to reproduce, prepare Derivative Works of, + * publicly display, publicly perform, sublicense, and distribute the + * Work and such Derivative Works in Source or Object form. + * + * 3. Grant of Patent License. Subject to the terms and conditions of + * this License, each Contributor hereby grants to You a perpetual, + * worldwide, non-exclusive, no-charge, royalty-free, irrevocable + * (except as stated in this section) patent license to make, have made, + * use, offer to sell, sell, import, and otherwise transfer the Work, + * where such license applies only to those patent claims licensable + * by such Contributor that are necessarily infringed by their + * Contribution(s) alone or by combination of their Contribution(s) + * with the Work to which such Contribution(s) was submitted. If You + * institute patent litigation against any entity (including a + * cross-claim or counterclaim in a lawsuit) alleging that the Work + * or a Contribution incorporated within the Work constitutes direct + * or contributory patent infringement, then any patent licenses + * granted to You under this License for that Work shall terminate + * as of the date such litigation is filed. + * + * 4. Redistribution. You may reproduce and distribute copies of the + * Work or Derivative Works thereof in any medium, with or without + * modifications, and in Source or Object form, provided that You + * meet the following conditions: + * + * (a) You must give any other recipients of the Work or + * Derivative Works a copy of this License; and + * + * (b) You must cause any modified files to carry prominent notices + * stating that You changed the files; and + * + * (c) You must retain, in the Source form of any Derivative Works + * that You distribute, all copyright, patent, trademark, and + * attribution notices from the Source form of the Work, + * excluding those notices that do not pertain to any part of + * the Derivative Works; and + * + * (d) If the Work includes a "NOTICE" text file as part of its + * distribution, then any Derivative Works that You distribute must + * include a readable copy of the attribution notices contained + * within such NOTICE file, excluding those notices that do not + * pertain to any part of the Derivative Works, in at least one + * of the following places: within a NOTICE text file distributed + * as part of the Derivative Works; within the Source form or + * documentation, if provided along with the Derivative Works; or, + * within a display generated by the Derivative Works, if and + * wherever such third-party notices normally appear. The contents + * of the NOTICE file are for informational purposes only and + * do not modify the License. You may add Your own attribution + * notices within Derivative Works that You distribute, alongside + * or as an addendum to the NOTICE text from the Work, provided + * that such additional attribution notices cannot be construed + * as modifying the License. + * + * You may add Your own copyright statement to Your modifications and + * may provide additional or different license terms and conditions + * for use, reproduction, or distribution of Your modifications, or + * for any such Derivative Works as a whole, provided Your use, + * reproduction, and distribution of the Work otherwise complies with + * the conditions stated in this License. + * + * 5. Submission of Contributions. Unless You explicitly state otherwise, + * any Contribution intentionally submitted for inclusion in the Work + * by You to the Licensor shall be under the terms and conditions of + * this License, without any additional terms or conditions. + * Notwithstanding the above, nothing herein shall supersede or modify + * the terms of any separate license agreement you may have executed + * with Licensor regarding such Contributions. + * + * 6. Trademarks. This License does not grant permission to use the trade + * names, trademarks, service marks, or product names of the Licensor, + * except as required for reasonable and customary use in describing the + * origin of the Work and reproducing the content of the NOTICE file. + * + * 7. Disclaimer of Warranty. Unless required by applicable law or + * agreed to in writing, Licensor provides the Work (and each + * Contributor provides its Contributions) on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + * implied, including, without limitation, any warranties or conditions + * of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + * PARTICULAR PURPOSE. You are solely responsible for determining the + * appropriateness of using or redistributing the Work and assume any + * risks associated with Your exercise of permissions under this License. + * + * 8. Limitation of Liability. In no event and under no legal theory, + * whether in tort (including negligence), contract, or otherwise, + * unless required by applicable law (such as deliberate and grossly + * negligent acts) or agreed to in writing, shall any Contributor be + * liable to You for damages, including any direct, indirect, special, + * incidental, or consequential damages of any character arising as a + * result of this License or out of the use or inability to use the + * Work (including but not limited to damages for loss of goodwill, + * work stoppage, computer failure or malfunction, or any and all + * other commercial damages or losses), even if such Contributor + * has been advised of the possibility of such damages. + * + * 9. Accepting Warranty or Additional Liability. While redistributing + * the Work or Derivative Works thereof, You may choose to offer, + * and charge a fee for, acceptance of support, warranty, indemnity, + * or other liability obligations and/or rights consistent with this + * License. However, in accepting such obligations, You may act only + * on Your own behalf and on Your sole responsibility, not on behalf + * of any other Contributor, and only if You agree to indemnify, + * defend, and hold each Contributor harmless for any liability + * incurred by, or claims asserted against, such Contributor by reason + * of your accepting any such warranty or additional liability. + * + * END OF TERMS AND CONDITIONS + * + * APPENDIX: How to apply the Apache License to your work. + * + * To apply the Apache License to your work, attach the following + * boilerplate notice, with the fields enclosed by brackets "[]" + * replaced with your own identifying information. (Don't include + * the brackets!) The text should be enclosed in the appropriate + * comment syntax for the file format. We also recommend that a + * file or class name and description of purpose be included on the + * same "printed page" as the copyright notice for easier + * identification within third-party archives. + * + * Copyright [yyyy] [name of copyright owner] + * + * Licensed 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. */