chrisg 02/04/01 15:48:29
Modified: . Tag: fop-0_20_2-maintain CHANGES build.bat build.sh
build.xml
contrib/servlet Tag: fop-0_20_2-maintain build.bat build.sh
docs/examples Tag: fop-0_20_2-maintain runtests.bat
runtests.sh
lib/bin Tag: fop-0_20_2-maintain antRun
Added: lib Tag: fop-0_20_2-maintain ant-1.4.1.jar
Removed: lib Tag: fop-0_20_2-maintain ant-1.3-optional.jar
ant.jar
Log:
Updated ant to version 1.4.1
Revision Changes Path
No revision
No revision
1.10.2.10 +2 -1 xml-fop/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/xml-fop/CHANGES,v
retrieving revision 1.10.2.9
retrieving revision 1.10.2.10
diff -u -r1.10.2.9 -r1.10.2.10
--- CHANGES 17 Mar 2002 23:37:06 -0000 1.10.2.9
+++ CHANGES 1 Apr 2002 23:48:28 -0000 1.10.2.10
@@ -4,7 +4,8 @@
- Moved from org.apache.log.Logger to org.apache.avalon.framework.logger.Logger
(this removes dependency from logkit)
Submitted by: Michael Gratton <[EMAIL PROTECTED]>
-
+- Updated ant to version 1.4.1 (Christian Geisert)
+ (ant-optional.jar is no longer needed)
==============================================================================
Done since 0.20.2 release
*** General
1.14.2.4 +1 -1 xml-fop/build.bat
Index: build.bat
===================================================================
RCS file: /home/cvs/xml-fop/build.bat,v
retrieving revision 1.14.2.3
retrieving revision 1.14.2.4
diff -u -r1.14.2.3 -r1.14.2.4
--- build.bat 17 Mar 2002 23:37:06 -0000 1.14.2.3
+++ build.bat 1 Apr 2002 23:48:28 -0000 1.14.2.4
@@ -6,7 +6,7 @@
if "%JAVA_HOME%" == "" goto error
set LIBDIR=lib
-set
LOCALCLASSPATH=%JAVA_HOME%\lib\tools.jar;%JAVA_HOME%\lib\classes.zip;%LIBDIR%\ant.jar;%LIBDIR%\ant-1.3-optional.jar;%LIBDIR%\batik.jar;%LIBDIR%\buildtools.jar;%LIBDIR%\xerces-1.2.3.jar;%LIBDIR%\xalan-2.0.0.jar;%LIBDIR%\xalanj1compat.jar;%LIBDIR%\bsf.jar
+set
LOCALCLASSPATH=%JAVA_HOME%\lib\tools.jar;%JAVA_HOME%\lib\classes.zip;%LIBDIR%\ant-1.4.1.jar;%LIBDIR%\batik.jar;%LIBDIR%\buildtools.jar;%LIBDIR%\xerces-1.2.3.jar;%LIBDIR%\xalan-2.0.0.jar;%LIBDIR%\xalanj1compat.jar;%LIBDIR%\bsf.jar
set
LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\jimi-1.0.jar;%LIBDIR%\avalon-framework-cvs-20020315.jar
set ANT_HOME=%LIBDIR%
1.15.2.4 +1 -1 xml-fop/build.sh
Index: build.sh
===================================================================
RCS file: /home/cvs/xml-fop/build.sh,v
retrieving revision 1.15.2.3
retrieving revision 1.15.2.4
diff -u -r1.15.2.3 -r1.15.2.4
--- build.sh 17 Mar 2002 23:37:06 -0000 1.15.2.3
+++ build.sh 1 Apr 2002 23:48:28 -0000 1.15.2.4
@@ -13,7 +13,7 @@
exit 1
fi
LIBDIR=lib
-LOCALCLASSPATH=$JAVA_HOME/lib/tools.jar:$JAVA_HOME/lib/classes.zip:$LIBDIR/ant.jar:$LIBDIR/ant-1.3-optional.jar:$LIBDIR/batik.jar:$LIBDIR/buildtools.jar:$LIBDIR/xerces-1.2.3.jar:$LIBDIR/xalan-2.0.0.jar:$LIBDIR/xalanj1compat.jar:$LIBDIR/bsf.jar
+LOCALCLASSPATH=$JAVA_HOME/lib/tools.jar:$JAVA_HOME/lib/classes.zip:$LIBDIR/ant-1.4.1.jar:$LIBDIR/batik.jar:$LIBDIR/buildtools.jar:$LIBDIR/xerces-1.2.3.jar:$LIBDIR/xalan-2.0.0.jar:$LIBDIR/xalanj1compat.jar:$LIBDIR/bsf.jar
LOCALCLASSPATH=$LOCALCLASSPATH:$LIBDIR/jimi-1.0.jar:$LIBDIR/avalon-framework-cvs-20020315.jar
ANT_HOME=$LIBDIR
1.44.2.10 +1 -1 xml-fop/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-fop/build.xml,v
retrieving revision 1.44.2.9
retrieving revision 1.44.2.10
diff -u -r1.44.2.9 -r1.44.2.10
--- build.xml 17 Mar 2002 23:37:06 -0000 1.44.2.9
+++ build.xml 1 Apr 2002 23:48:28 -0000 1.44.2.10
@@ -141,7 +141,7 @@
<include name="lib/batik.LICENSE.txt"/>
<include name="lib/avalon-framework-cvs-20020315.jar"/>
<include name="lib/avalon.LICENSE.txt"/>
- <include name="lib/ant.jar"/>
+ <include name="lib/ant-1.4.1.jar"/>
<include name="lib/ant.license.txt"/>
</fileset>
No revision
No revision
1.1.2.2 +1 -1 xml-fop/contrib/servlet/build.bat
Index: build.bat
===================================================================
RCS file: /home/cvs/xml-fop/contrib/servlet/build.bat,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- build.bat 27 Mar 2002 13:08:53 -0000 1.1.2.1
+++ build.bat 1 Apr 2002 23:48:28 -0000 1.1.2.2
@@ -6,7 +6,7 @@
if "%JAVA_HOME%" == "" goto error
set LIBDIR=../../lib
-set
LOCALCLASSPATH=%JAVA_HOME%\lib\tools.jar;%JAVA_HOME%\lib\classes.zip;%LIBDIR%\ant.jar;%LIBDIR%\ant-1.3-optional.jar;%LIBDIR%\buildtools.jar;%LIBDIR%\xerces-1.2.3.jar;%LIBDIR%\xalan-2.0.0.jar
+set
LOCALCLASSPATH=%JAVA_HOME%\lib\tools.jar;%JAVA_HOME%\lib\classes.zip;%LIBDIR%\ant-1.4.1.jar;%LIBDIR%\buildtools.jar;%LIBDIR%\xerces-1.2.3.jar;%LIBDIR%\xalan-2.0.0.jar
set ANT_HOME=%LIBDIR%
1.1.2.2 +1 -1 xml-fop/contrib/servlet/build.sh
Index: build.sh
===================================================================
RCS file: /home/cvs/xml-fop/contrib/servlet/build.sh,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- build.sh 27 Mar 2002 13:08:53 -0000 1.1.2.1
+++ build.sh 1 Apr 2002 23:48:28 -0000 1.1.2.2
@@ -13,7 +13,7 @@
exit 1
fi
LIBDIR=../../lib
-LOCALCLASSPATH=$JAVA_HOME/lib/tools.jar:$JAVA_HOME/lib/classes.zip:$LIBDIR/ant.jar:$LIBDIR/ant-1.3-optional.jar:$LIBDIR/buildtools.jar:$LIBDIR/xerces-1.2.3.jar:$LIBDIR/xalan-2.0.0.jar
+LOCALCLASSPATH=$JAVA_HOME/lib/tools.jar:$JAVA_HOME/lib/classes.zip:$LIBDIR/ant-1.4.1.jar:$LIBDIR/buildtools.jar:$LIBDIR/xerces-1.2.3.jar:$LIBDIR/xalan-2.0.0.jar
ANT_HOME=$LIBDIR
No revision
No revision
1.11.2.3 +1 -1 xml-fop/docs/examples/runtests.bat
Index: runtests.bat
===================================================================
RCS file: /home/cvs/xml-fop/docs/examples/runtests.bat,v
retrieving revision 1.11.2.2
retrieving revision 1.11.2.3
diff -u -r1.11.2.2 -r1.11.2.3
--- runtests.bat 17 Mar 2002 23:37:06 -0000 1.11.2.2
+++ runtests.bat 1 Apr 2002 23:48:28 -0000 1.11.2.3
@@ -7,7 +7,7 @@
set LIBDIR=..\..\lib
-set
LOCALCLASSPATH=%JAVA_HOME%\lib\tools.jar;%JAVA_HOME%\lib\classes.zip;%LIBDIR%\ant.jar;%LIBDIR%\batik.jar;%LIBDIR%\buildtools.jar;%LIBDIR%\xerces-1.2.3.jar;%LIBDIR%\xalan-2.0.0.jar;%LIBDIR%\xalanj1compat.jar;%LIBDIR%\bsf.jar;%LIBDIR%\avalon-framework-cvs-20020315.jar;%LIBDIR%\jimi-1.0.jar;%LIBDIR%\..\build\fop.jar
+set
LOCALCLASSPATH=%JAVA_HOME%\lib\tools.jar;%JAVA_HOME%\lib\classes.zip;%LIBDIR%\ant-1.4.1.jar;%LIBDIR%\batik.jar;%LIBDIR%\buildtools.jar;%LIBDIR%\xerces-1.2.3.jar;%LIBDIR%\xalan-2.0.0.jar;%LIBDIR%\xalanj1compat.jar;%LIBDIR%\bsf.jar;%LIBDIR%\avalon-framework-cvs-20020315.jar;%LIBDIR%\jimi-1.0.jar;%LIBDIR%\..\build\fop.jar
set ANT_HOME=%LIBDIR%
echo Starting Tests ...
1.8.2.3 +1 -1 xml-fop/docs/examples/runtests.sh
Index: runtests.sh
===================================================================
RCS file: /home/cvs/xml-fop/docs/examples/runtests.sh,v
retrieving revision 1.8.2.2
retrieving revision 1.8.2.3
diff -u -r1.8.2.2 -r1.8.2.3
--- runtests.sh 17 Mar 2002 23:37:06 -0000 1.8.2.2
+++ runtests.sh 1 Apr 2002 23:48:28 -0000 1.8.2.3
@@ -13,7 +13,7 @@
exit 1
fi
LIBDIR=../../lib
-LOCALCLASSPATH=$JAVA_HOME/lib/tools.jar:$JAVA_HOME/lib/classes.zip:$LIBDIR/ant.jar:$LIBDIR/batik.jar:$LIBDIR/buildtools.jar:$LIBDIR/xerces-1.2.3.jar:$LIBDIR/xalan-2.0.0.jar:$LIBDIR/xalanj1compat.jar:$LIBDIR/bsf.jar:$LIBDIR/avalon-framework-cvs-20020315.jar:$LIBDIR/jimi-1.0.jar:$LIBDIR/../build/fop.jar
+LOCALCLASSPATH=$JAVA_HOME/lib/tools.jar:$JAVA_HOME/lib/classes.zip:$LIBDIR/ant-1.4.1.jar:$LIBDIR/batik.jar:$LIBDIR/buildtools.jar:$LIBDIR/xerces-1.2.3.jar:$LIBDIR/xalan-2.0.0.jar:$LIBDIR/xalanj1compat.jar:$LIBDIR/bsf.jar:$LIBDIR/avalon-framework-cvs-20020315.jar:$LIBDIR/jimi-1.0.jar:$LIBDIR/../build/fop.jar
ANT_HOME=$LIBDIR
echo Building with classpath $CLASSPATH:$LOCALCLASSPATH
No revision
No revision
1.1.2.1 +1602 -0 xml-fop/lib/Attic/ant-1.4.1.jar
<<Binary file>>
No revision
No revision
1.2.8.1 +4 -8 xml-fop/lib/bin/antRun
Index: antRun
===================================================================
RCS file: /home/cvs/xml-fop/lib/bin/antRun,v
retrieving revision 1.2
retrieving revision 1.2.8.1
diff -u -r1.2 -r1.2.8.1
--- antRun 9 Aug 2000 19:04:49 -0000 1.2
+++ antRun 1 Apr 2002 23:48:29 -0000 1.2.8.1
@@ -1,13 +1,9 @@
#! /bin/sh
-#This file should be executable. -Steve
+
# Args: DIR command
-cd $1
-CMD=$2
+cd "$1"
+CMD="$2"
shift
shift
-if test -f $CMD.sh; then
- CMD="sh $CMD.sh"
-fi
-
-echo $CMD $@ | sh
+exec $CMD "$@"
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
