You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by da...@apache.org on 2001/10/10 15:45:47 UTC
cvs commit: jakarta-james/tools/lib ant.jar optional.jar
danny 01/10/10 06:45:47
Modified: . build.xml
tools/bin ant.bat ant antRun.bat lcp.bat runant.pl
tools/lib ant.jar optional.jar
Log:
Upgrade to ant 1.4. replaced deprecated fixCRLF attribute cr with new attribute eol
There may be unresoved issues with altered zip methods
Revision Changes Path
1.84 +6 -6 jakarta-james/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-james/build.xml,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- build.xml 2001/09/30 17:58:13 1.83
+++ build.xml 2001/10/10 13:45:46 1.84
@@ -2,7 +2,7 @@
<!-- ==========================================================================
- James build file $Revision: 1.83 $ Committed on $Date: 2001/09/30 17:58:13 $ by: $Author: danny $
+ James build file $Revision: 1.84 $ Committed on $Date: 2001/10/10 13:45:46 $ by: $Author: danny $
Authors:
Federico Barbieri <sc...@systemy.it>
@@ -400,8 +400,8 @@
<chmod dir="${dist.dir}" perm="go-rwx" />
<chmod file="${dist.dir}/bin/run.sh" perm="u+x"/>
- <fixcrlf srcdir="${dist.dir}" cr="add" includes="**/*.bat" />
- <fixcrlf srcdir="${dist.dir}" cr="remove" includes="**/*.sh" />
+ <fixcrlf srcdir="${dist.dir}" eol="crlf" includes="**/*.bat" />
+ <fixcrlf srcdir="${dist.dir}" eol="lf" includes="**/*.sh" />
</target>
@@ -666,8 +666,8 @@
</fileset>
</copy>
- <fixcrlf srcdir="${src.dist.dir}" includes="build.sh" cr="remove"/>
- <fixcrlf srcdir="${src.dist.dir}" includes="build.bat" cr="add"/>
+ <fixcrlf srcdir="${src.dist.dir}" includes="build.sh" eol="lf"/>
+ <fixcrlf srcdir="${src.dist.dir}" includes="build.bat" eol="crlf"/>
<chmod perm="+x">
<fileset dir="${src.dist.dir}">
@@ -675,7 +675,7 @@
</fileset>
</chmod>
- <fixcrlf srcdir="${src.dist.src}/java" includes="**/*.java" cr="remove"/>
+ <fixcrlf srcdir="${src.dist.src}/java" includes="**/*.java" eol="lf"/>
<chmod dir="${src.dist.dir}" perm="go-rwx" />
1.2 +21 -8 jakarta-james/tools/bin/ant.bat
Index: ant.bat
===================================================================
RCS file: /home/cvs/jakarta-james/tools/bin/ant.bat,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ant.bat 2001/02/18 10:24:21 1.1
+++ ant.bat 2001/10/10 13:45:46 1.2
@@ -10,15 +10,22 @@
set DEFAULT_ANT_HOME=%~dp0
rem : operator works similar to make : operator
-set DEFAULT_ANT_HOME=%DEFAULT_ANT_HOME:\bin\=%
+set DEFAULT_ANT_HOME=%DEFAULT_ANT_HOME%\..
-if %ANT_HOME%a==a set ANT_HOME=%DEFAULT_ANT_HOME%
+if "%ANT_HOME%"=="" set ANT_HOME=%DEFAULT_ANT_HOME%
set DEFAULT_ANT_HOME=
+rem Need to check if we are using the 4NT shell...
+if "%eval[2+2]" == "4" goto setup4NT
+
rem On NT/2K grab all arguments at once
set ANT_CMD_LINE_ARGS=%*
goto doneStart
+:setup4NT
+set ANT_CMD_LINE_ARGS=%$
+goto doneStart
+
:win9xStart
rem Slurp the command line arguments. This loop allows for an unlimited number of
rem agruments (up to the command line limit, anyway).
@@ -45,10 +52,16 @@
:checkSystemDrive
rem check for ant in root directory of system drive
-if not exist "%SystemDrive%\ant" goto noAntHome
+if not exist %SystemDrive%\ant\nul 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\nul goto noAntHome
+set ANT_HOME=C:\ant
+goto checkJava
+
:noAntHome
echo ANT_HOME is not set and ant could not be located. Please set ANT_HOME.
goto end
@@ -56,12 +69,12 @@
:checkJava
set _JAVACMD=%JAVACMD%
set LOCALCLASSPATH=%CLASSPATH%
-for %%i in ("%ANT_HOME%\lib\*.jar") do call "%ANT_HOME%\bin\lcp.bat" "%%i"
+for %%i in ("%ANT_HOME%\lib\*.jar") do call "%ANT_HOME%\bin\lcp.bat" %%i
if "%JAVA_HOME%" == "" goto noJavaHome
if "%_JAVACMD%" == "" set _JAVACMD=%JAVA_HOME%\bin\java
-if exist "%JAVA_HOME%\lib\tools.jar" call "%ANT_HOME%\bin\lcp.bat" "%JAVA_HOME%\lib\tools.jar"
-if exist "%JAVA_HOME%\lib\classes.zip" call "%ANT_HOME%\bin\lcp.bat" "%JAVA_HOME%\lib\classes.zip"
+if exist "%JAVA_HOME%\lib\tools.jar" call "%ANT_HOME%\bin\lcp.bat" %JAVA_HOME%\lib\tools.jar
+if exist "%JAVA_HOME%\lib\classes.zip" call "%ANT_HOME%\bin\lcp.bat" %JAVA_HOME%\lib\classes.zip
goto checkJikes
:noJavaHome
@@ -77,11 +90,11 @@
if not "%JIKESPATH%" == "" goto runAntWithJikes
:runAnt
-%_JAVACMD% -classpath %LOCALCLASSPATH% -Dant.home="%ANT_HOME%" %ANT_OPTS% org.apache.tools.ant.Main %ANT_CMD_LINE_ARGS%
+"%_JAVACMD%" -classpath "%LOCALCLASSPATH%" -Dant.home="%ANT_HOME%" %ANT_OPTS% org.apache.tools.ant.Main %ANT_CMD_LINE_ARGS%
goto end
:runAntWithJikes
-%_JAVACMD% -classpath %LOCALCLASSPATH% -Dant.home="%ANT_HOME%" -Djikes.class.path=%JIKESPATH% %ANT_OPTS% org.apache.tools.ant.Main %ANT_CMD_LINE_ARGS%
+"%_JAVACMD%" -classpath "%LOCALCLASSPATH%" -Dant.home="%ANT_HOME%" -Djikes.class.path="%JIKESPATH%" %ANT_OPTS% org.apache.tools.ant.Main %ANT_CMD_LINE_ARGS%
:end
set LOCALCLASSPATH=
1.2 +56 -29 jakarta-james/tools/bin/ant
Index: ant
===================================================================
RCS file: /home/cvs/jakarta-james/tools/bin/ant,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ant 2001/02/18 10:24:21 1.1
+++ ant 2001/10/10 13:45:46 1.2
@@ -4,23 +4,15 @@
. $HOME/.antrc
fi
-# Cygwin support. $cygwin _must_ be set to either true or false.
+# OS specific support. $var _must_ be set to either true or false.
+cygwin=false;
+darwin=false;
case "`uname`" in
CYGWIN*) cygwin=true ;;
- *) cygwin=false ;;
+ Darwin*) darwin=true ;;
esac
-# For Cygwin, ensure paths are in UNIX format before anything is touched
-if $cygwin; then
- [ -n "$ANT_HOME" ] &&
- ANT_HOME=`cygpath --unix "$ANT_HOME"`
- [ -n "$JAVA_HOME" ] &&
- JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
- [ -n "$CLASSPATH" ] &&
- CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
-fi
-
-if [ "$ANT_HOME" = "" ] ; then
+if [ -z "$ANT_HOME" ] ; then
# try to find ANT
if [ -d /opt/ant ] ; then
ANT_HOME=/opt/ant
@@ -48,16 +40,39 @@
fi
-if [ "$JAVA_HOME" != "" ] ; then
- if [ "$JAVACMD" = "" ] ; then
- JAVACMD=$JAVA_HOME/bin/java
- fi
-else
- if [ "$JAVACMD" = "" ] ; then
+# For Cygwin, ensure paths are in UNIX format before anything is touched
+if $cygwin ; then
+ [ -n "$ANT_HOME" ] &&
+ ANT_HOME=`cygpath --unix "$ANT_HOME"`
+ [ -n "$JAVA_HOME" ] &&
+ JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+ [ -n "$CLASSPATH" ] &&
+ CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
+fi
+
+if [ -z "$JAVACMD" ] ; then
+ if [ -n "$JAVA_HOME" ] ; then
+ 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
+ else
+ JAVACMD=$JAVA_HOME/bin/java
+ fi
+ else
JAVACMD=java
fi
fi
+if [ ! -x "$JAVACMD" ] ; then
+ echo "Error: JAVA_HOME is not defined correctly."
+ echo " We cannot execute $JAVACMD"
+ exit
+fi
+
+if [ -n "$CLASSPATH" ] ; then
+ LOCALCLASSPATH=$CLASSPATH
+fi
+
# add in the dependency .jar files
DIRLIBS=${ANT_HOME}/lib/*.jar
for i in ${DIRLIBS}
@@ -65,22 +80,34 @@
# if the directory is empty, then it will return the input string
# this is stupid, so case for it
if [ "$i" != "${DIRLIBS}" ] ; then
- LOCALCLASSPATH=$LOCALCLASSPATH:"$i"
+ if [ -z "$LOCALCLASSPATH" ] ; then
+ LOCALCLASSPATH=$i
+ else
+ LOCALCLASSPATH="$i":$LOCALCLASSPATH
+ fi
fi
done
-
-if [ "$CLASSPATH" != "" ] ; then
- LOCALCLASSPATH=$CLASSPATH:$LOCALCLASSPATH
-fi
-if [ "$JAVA_HOME" != "" ] ; then
- if test -f $JAVA_HOME/lib/tools.jar ; then
+if [ -n "$JAVA_HOME" ] ; then
+ if [ -f "$JAVA_HOME/lib/tools.jar" ] ; then
LOCALCLASSPATH=$LOCALCLASSPATH:$JAVA_HOME/lib/tools.jar
fi
- if test -f $JAVA_HOME/lib/classes.zip ; then
+ if [ -f "$JAVA_HOME/lib/classes.zip" ] ; then
LOCALCLASSPATH=$LOCALCLASSPATH:$JAVA_HOME/lib/classes.zip
fi
+
+ # OSX hack to make Ant work with jikes
+ if $darwin ; then
+ OSXHACK="/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Classes"
+ if [ -d ${OSXHACK} ] ; then
+ for i in ${OSXHACK}/*.jar
+ do
+ JIKESPATH=$JIKESPATH:$i
+ done
+ fi
+ fi
+
else
echo "Warning: JAVA_HOME environment variable is not set."
echo " If build fails because sun.* classes could not be found"
@@ -89,8 +116,8 @@
fi
# supply JIKESPATH to Ant as jikes.class.path
-if [ "$JIKESPATH" != "" ] ; then
- if [ "$ANT_OPTS" != "" ] ; then
+if [ -n "$JIKESPATH" ] ; then
+ if [ -n "$ANT_OPTS" ] ; then
ANT_OPTS="$ANT_OPTS -Djikes.class.path=$JIKESPATH"
else
ANT_OPTS=-Djikes.class.path=$JIKESPATH
1.2 +2 -0 jakarta-james/tools/bin/antRun.bat
Index: antRun.bat
===================================================================
RCS file: /home/cvs/jakarta-james/tools/bin/antRun.bat,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- antRun.bat 2001/02/18 10:24:21 1.1
+++ antRun.bat 2001/10/10 13:45:46 1.2
@@ -1,6 +1,8 @@
@echo off
+rem Change drive and directory to %1 (Win9X only for NT/2K use "cd /d")
cd %1
+%1\
set ANT_RUN_CMD=%2
shift
shift
1.2 +8 -1 jakarta-james/tools/bin/lcp.bat
Index: lcp.bat
===================================================================
RCS file: /home/cvs/jakarta-james/tools/bin/lcp.bat,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- lcp.bat 2001/02/18 10:24:21 1.1
+++ lcp.bat 2001/10/10 13:45:46 1.2
@@ -1,2 +1,9 @@
-set LOCALCLASSPATH=%1;%LOCALCLASSPATH%
+set _CLASSPATHCOMPONENT=%1
+:argCheck
+if %2a==a goto gotAllArgs
+shift
+set _CLASSPATHCOMPONENT=%_CLASSPATHCOMPONENT% %1
+goto argCheck
+:gotAllArgs
+set LOCALCLASSPATH=%_CLASSPATHCOMPONENT%;%LOCALCLASSPATH%
1.2 +44 -35 jakarta-james/tools/bin/runant.pl
Index: runant.pl
===================================================================
RCS file: /home/cvs/jakarta-james/tools/bin/runant.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- runant.pl 2001/02/18 10:24:21 1.1
+++ runant.pl 2001/10/10 13:45:46 1.2
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl
+#!/usr/bin/perl
#######################################################################
#
# runant.pl
@@ -44,9 +44,9 @@
my $HOME = $ENV{ANT_HOME};
if ($HOME eq "")
- {
+ {
die "\n\nANT_HOME *MUST* be set!\n\n";
- }
+ }
my $JAVACMD = $ENV{JAVACMD};
$JAVACMD = "java" if $JAVACMD eq "";
@@ -56,17 +56,17 @@
#here I assume ":" 'cept on win32 and dos. Add extra tests here as needed.
my $s=":";
if(($^O eq "MSWin32") || ($^O eq "dos"))
- {
- $s=";";
- }
+ {
+ $s=";";
+ }
#build up standard classpath
my $localpath=$ENV{CLASSPATH};
if ($localpath eq "")
- {
- print "warning: no initial classpath\n" if ($debug);
- $localpath="";
- }
+ {
+ print "warning: no initial classpath\n" if ($debug);
+ $localpath="";
+ }
#add jar files. I am sure there is a perl one liner to do this.
my $jarpattern="$HOME/lib/*.jar";
@@ -74,39 +74,39 @@
print "jarfiles=@jarfiles\n" if ($debug);
my $jar;
foreach $jar (@jarfiles )
- {
- $localpath.="$s$jar";
- }
+ {
+ $localpath.="$s$jar";
+ }
#if Java home is defined, look for tools.jar & classes.zip and add to classpath
my $JAVA_HOME = $ENV{JAVA_HOME};
if ($JAVA_HOME ne "")
- {
- my $tools="$JAVA_HOME/lib/tools.jar";
- if (-e "$tools")
- {
- $localpath .= "$s$tools";
- }
- my $classes="$JAVA_HOME/lib/classes.zip";
- if (-e $classes)
- {
- $localpath .= "$s$classes";
- }
- }
+ {
+ my $tools="$JAVA_HOME/lib/tools.jar";
+ if (-e "$tools")
+ {
+ $localpath .= "$s$tools";
+ }
+ my $classes="$JAVA_HOME/lib/classes.zip";
+ if (-e $classes)
+ {
+ $localpath .= "$s$classes";
+ }
+ }
else
- {
+ {
print "\n\nWarning: JAVA_HOME environment variable is not set.\n".
- "If the build fails because sun.* classes could not be found\n".
- "you will need to set the JAVA_HOME environment variable\n".
- "to the installation directory of java\n";
- }
+ "If the build fails because sun.* classes could not be found\n".
+ "you will need to set the JAVA_HOME environment variable\n".
+ "to the installation directory of java\n";
+ }
#jikes
my @ANT_OPTS=split $ENV{ANT_OPTS};
if($ENV{JIKESPATH} ne "")
- {
- push @ANT_OPTS, "-Djikes.class.path=$ENV{JIKESPATH}";
- }
+ {
+ push @ANT_OPTS, "-Djikes.class.path=$ENV{JIKESPATH}";
+ }
#construct arguments to java
@@ -117,6 +117,15 @@
push @ARGS, @ARGV;
print "\n $JAVACMD @ARGS\n\n" if ($debug);
-system $JAVACMD, @ARGS;
-
+my $returnValue = system $JAVACMD, @ARGS;
+if ($returnValue eq 0)
+ {
+ exit 0;
+ }
+else
+ {
+ # only 0 and 1 are widely recognized as exit values
+ # so change the exit value to 1
+ exit 1;
+ }
1.3 +1508 -1124jakarta-james/tools/lib/ant.jar
<<Binary file>>
1.2 +857 -601 jakarta-james/tools/lib/optional.jar
<<Binary file>>
---------------------------------------------------------------------
To unsubscribe, e-mail: james-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: james-dev-help@jakarta.apache.org