conor 01/01/30 22:15:06
Modified: . bootstrap.sh build.sh build.xml
Log:
Changes for Unix build process
Revision Changes Path
1.38 +6 -1 jakarta-ant/bootstrap.sh
Index: bootstrap.sh
===================================================================
RCS file: /home/cvs/jakarta-ant/bootstrap.sh,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- bootstrap.sh 2001/01/30 15:08:30 1.37
+++ bootstrap.sh 2001/01/31 06:15:01 1.38
@@ -2,6 +2,8 @@
# You will need to specify JAVA_HOME if compiling with 1.2 or later.
+unset CLASSPATH
+
if [ "$JAVA_HOME" != "" ] ; then
if [ -f $JAVA_HOME/lib/tools.jar ] ; then
CLASSPATH=$CLASSPATH:$JAVA_HOME/lib/tools.jar
@@ -59,6 +61,7 @@
export CLASSPATH
mkdir -p ${CLASSDIR}
+mkdir -p build
echo ... Compiling Ant Classes
@@ -77,8 +80,10 @@
echo ... Building Ant Distribution
+cp -r ${CLASSDIR} build
+
${JAVA_HOME}/bin/java -classpath ${CLASSPATH} org.apache.tools.ant.Main \
- -buildfile build.xml clean main bootstrap
+ -buildfile build.xml bootstrap
echo ... Cleaning Up Build Directories
1.17 +2 -2 jakarta-ant/build.sh
Index: build.sh
===================================================================
RCS file: /home/cvs/jakarta-ant/build.sh,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- build.sh 2001/01/30 15:08:29 1.16
+++ build.sh 2001/01/31 06:15:02 1.17
@@ -5,11 +5,11 @@
export ANT_HOME
if test ! -f lib/ant.jar -o ! -x bin/ant -o ! -x bin/antRun ; then
- ./bootstrap.sh
+ /bin/sh ./bootstrap.sh
fi
if [ "$REALANTHOME" != "" ] ; then
- ANT_INSTALL="-Dant.install $REALANTHOME"
+ ANT_INSTALL="-Dant.install=$REALANTHOME"
fi
bin/ant $ANT_INSTALL $*
1.123 +1 -0 jakarta-ant/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-ant/build.xml,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -r1.122 -r1.123
--- build.xml 2001/01/30 17:01:13 1.122
+++ build.xml 2001/01/31 06:15:03 1.123
@@ -345,6 +345,7 @@
<include name="build.sh"/>
<include name="bootstrap.bat"/>
<include name="bootstrap.sh"/>
+ <include name="build.xml"/>
</fileset>
</copy>
