You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@forrest.apache.org by an...@apache.org on 2003/12/20 08:24:59 UTC
cvs commit: xml-forrest/tools/ant/lib ant-nodeps.jar ant.jar ant-xalan2.jar ant-trax.jar ant-apache-resolver.jar ant-launcher.jar nodeps.jar
antonio 2003/12/19 23:24:58
Modified: tools/ant/bin runant.pl runant.py ant.bat antRun.pl ant
tools/ant/lib ant.jar ant-xalan2.jar ant-trax.jar
ant-apache-resolver.jar ant-launcher.jar
Added: tools/ant/lib ant-nodeps.jar
Removed: tools/ant/lib nodeps.jar
Log:
Update to Apache Ant 1.6.0
Revision Changes Path
1.5 +0 -1 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- runant.pl 4 Oct 2003 04:55:21 -0000 1.4
+++ runant.pl 20 Dec 2003 07:24:57 -0000 1.5
@@ -18,7 +18,6 @@
# the code is not included.
#
# created: 2000-8-24
-# last modified: $Date$
# author: Steve Loughran steve_l@sourceforge.net
#######################################################################
#
1.3 +2 -2 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- runant.py 4 Oct 2003 04:55:21 -0000 1.2
+++ runant.py 20 Dec 2003 07:24:57 -0000 1.3
@@ -76,8 +76,8 @@
CLASSPATH = os.environ['CLASSPATH']
# Builds the commandline
-cmdline = ('%s %s -classpath \"%s\" \"-Dant.home=%s\" %s ' + \
- 'org.apache.tools.ant.launch.Launcher %s -lib \"%s\" \"%s\"') \
+cmdline = ('%s %s -classpath %s -Dant.home=%s %s ' + \
+ 'org.apache.tools.ant.launch.Launcher %s -lib %s %s') \
% (JAVACMD, ANT_OPTS, LOCALCLASSPATH, ANT_HOME, OPTS, ANT_ARGS, \
CLASSPATH, string.join(sys.argv[1:], ' '))
1.7 +4 -3 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ant.bat 13 Dec 2003 06:35:22 -0000 1.6
+++ ant.bat 20 Dec 2003 07:24:57 -0000 1.7
@@ -3,7 +3,8 @@
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 exist "%HOME%\antrc_pre.bat" call "%HOME%\antrc_pre.bat"
+set ANT_VERSION=1.6.0
if "%OS%"=="Windows_NT" @setlocal
@@ -29,7 +30,7 @@
: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
+if exist "%ANT_HOME%\lib\ant-%ANT_VERSION%.jar" goto checkJava
rem check for ant in Program Files
if not exist "%ProgramFiles%\ant" goto checkSystemDrive
@@ -91,5 +92,5 @@
if "%OS%"=="Windows_NT" @endlocal
:mainEnd
-if exist "%HOME%\forrestrc_post.bat" call "%HOME%\forrestrc_post.bat"
+if exist "%HOME%\antrc_post.bat" call "%HOME%\antrc_post.bat"
1.3 +0 -1 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- antRun.pl 4 Oct 2003 04:55:21 -0000 1.2
+++ antRun.pl 20 Dec 2003 07:24:57 -0000 1.3
@@ -11,7 +11,6 @@
# this is akin to antRun.bat, and antRun the SH script
#
# created: 2001-10-18
-# last modified: $Date$
# author: Jeff Tulley jtulley@novell.com
#######################################################################
#be fussy about variables
1.6 +5 -5 xml-forrest/tools/ant/bin/ant
Index: ant
===================================================================
RCS file: /home/cvs//xml-forrest/tools/ant/bin/ant,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ant 4 Oct 2003 04:55:21 -0000 1.5
+++ ant 20 Dec 2003 07:24:57 -0000 1.6
@@ -4,8 +4,8 @@
# reserved.
# 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 +18,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.
@@ -34,7 +34,7 @@
;;
esac
-if [ -z "$ANT_HOME" ] ; then
+if [ -z "$ANT_HOME" -o ! -d "$ANT_HOME" ] ; then
# try to find ANT
if [ -d /opt/ant ] ; then
ANT_HOME=/opt/ant
1.6 +3697 -3748xml-forrest/tools/ant/lib/ant.jar
<<Binary file>>
1.5 +31 -2 xml-forrest/tools/ant/lib/ant-xalan2.jar
<<Binary file>>
1.5 +258 -241 xml-forrest/tools/ant/lib/ant-trax.jar
<<Binary file>>
1.5 +28 -41 xml-forrest/tools/ant/lib/ant-apache-resolver.jar
<<Binary file>>
1.2 +47 -49 xml-forrest/tools/ant/lib/ant-launcher.jar
<<Binary file>>
1.1 xml-forrest/tools/ant/lib/ant-nodeps.jar
<<Binary file>>
Re: cvs commit: xml-forrest/tools/ant/lib
Posted by David Crossley <cr...@indexgeo.com.au>.
Antonio Gallardo wrote:
> David Crossley dijo:
> > I am also worried about the same situation with Cocoon. Due to
> > the dos2unix problem there, we cannot tell what the changes were.
>
> Fixing done. I also checked the ant files in Cocoon and everything was
> well there. In Cocoon case there was not changes from the original ant
> files.
Many thanks for verifying this.
> BTW, why we need special files for forrest?
Not sure. I do not use it myself, but others might.
Using find and grep i see no other reference to "forrestrc".
However 'cvs log ant' gives a clue ...
----------------------------
revision 1.4
date: 2003/09/17 10:02:39; author: jefft; state: Exp; lines: +4 -4
Don't source /etc/antrc and ~/.antrc, as they may contain stuff that
breaks Forrest (in jpackage-derived RPMs). Thanks to Eric BURGHARD
----------------------------
Which lead to:
http://nagoya.apache.org/eyebrowse/ReadMsg?listName=forrest-dev@xml.apache.org&msgId=1039791
--David
Re: cvs commit: xml-forrest/tools/ant/lib
Posted by Antonio Gallardo <ag...@agsoftware.dnsalias.com>.
David Crossley dijo:
> I am also worried about the same situation with Cocoon. Due to
> the dos2unix problem there, we cannot tell what the changes were.
Fixing done. I also checked the ant files in Cocoon and everything was
well there. In Cocoon case there was not changes from the original ant
files.
BTW, why we need special files for forrest?
Best Regards,
Antonio Gallardo
Re: cvs commit: xml-forrest/tools/ant/lib
Posted by David Crossley <cr...@indexgeo.com.au>.
Antonio Gallardo wrote:
> David Crossley dijo:
<snip/>
> > Thanks for upgrading Ant Antonio. However i noticed some oddities.
> >
> > Are these changes (and some in other files) deliberate or
> > just some side-effect of the Ant upgrade.
>
> It looks to be a side efect. Again I just copy the files. This time the
> files I already did for Cocoon.
>
> Now I note the sideefect I accidentally introduced between .forrestrc and
> .antrc file. I will fix this back. Sorry for the caused problem.
Ah, that is what i suspected. Please note that there may be other
changes to the Forrest ant scripts that were also not intended.
I am also worried about the same situation with Cocoon. Due to
the dos2unix problem there, we cannot tell what the changes were.
--David
Re: cvs commit: xml-forrest/tools/ant/lib
Posted by Antonio Gallardo <ag...@agsoftware.dnsalias.com>.
David Crossley dijo:
>> antonio 2003/12/19 23:24:58
>> Log:
>> Update to Apache Ant 1.6.0
>>
> <snip/>
>> Index: ant
>> ===================================================================
>> RCS file: /home/cvs//xml-forrest/tools/ant/bin/ant,v
>> retrieving revision 1.5
>> retrieving revision 1.6
>> diff -u -r1.5 -r1.6
>> --- ant 4 Oct 2003 04:55:21 -0000 1.5
>> +++ ant 20 Dec 2003 07:24:57 -0000 1.6
>>
>> # load system-wide ant configuration
>> -if [ -f "/etc/forrest.conf" ] ; then
>> - . /etc/forrest.conf
>> +if [ -f "/etc/ant.conf" ] ; then
>> + . /etc/ant.conf
>> fi
>>
>> @@ -18,8 +18,8 @@
>>
>> # load user ant configuration
>> -if [ -f "$HOME/.forrestrc" ] ; then
>> - . "$HOME/.forrestrc"
>> +if [ -f "$HOME/.antrc" ] ; then
>> + . "$HOME/.antrc"
>> fi
>
> Thanks for upgrading Ant Antonio. However i noticed some oddities.
>
> Are these changes (and some in other files) deliberate or
> just some side-effect of the Ant upgrade.
Hi David:
It looks to be a side efect. Again I just copy the files. This time the
files I already did for Cocoon.
Now I note the sideefect I accidentally introduced between .forrestrc and
.antrc file. I will fix this back. Sorry for the caused problem.
Best Regards,
Antonio Gallardo.
Re: cvs commit: xml-forrest/tools/ant/lib
Posted by David Crossley <cr...@indexgeo.com.au>.
> antonio 2003/12/19 23:24:58
> Log:
> Update to Apache Ant 1.6.0
>
<snip/>
> Index: ant
> ===================================================================
> RCS file: /home/cvs//xml-forrest/tools/ant/bin/ant,v
> retrieving revision 1.5
> retrieving revision 1.6
> diff -u -r1.5 -r1.6
> --- ant 4 Oct 2003 04:55:21 -0000 1.5
> +++ ant 20 Dec 2003 07:24:57 -0000 1.6
>
> # load system-wide ant configuration
> -if [ -f "/etc/forrest.conf" ] ; then
> - . /etc/forrest.conf
> +if [ -f "/etc/ant.conf" ] ; then
> + . /etc/ant.conf
> fi
>
> @@ -18,8 +18,8 @@
>
> # load user ant configuration
> -if [ -f "$HOME/.forrestrc" ] ; then
> - . "$HOME/.forrestrc"
> +if [ -f "$HOME/.antrc" ] ; then
> + . "$HOME/.antrc"
> fi
Thanks for upgrading Ant Antonio. However i noticed some oddities.
Are these changes (and some in other files) deliberate or
just some side-effect of the Ant upgrade.
--David