conor 01/02/01 20:58:55
Modified: . bootstrap.bat bootstrap.sh build.sh
Log:
Build process tweaks. Source distribution now builds out of box on
Solaris.
Revision Changes Path
1.29 +2 -2 jakarta-ant/bootstrap.bat
Index: bootstrap.bat
===================================================================
RCS file: /home/cvs/jakarta-ant/bootstrap.bat,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- bootstrap.bat 2001/01/31 09:42:04 1.28
+++ bootstrap.bat 2001/02/02 04:58:54 1.29
@@ -18,8 +18,8 @@
echo.
echo ... Bootstrapping Ant Distribution
-if exist lib\ant.jar erase lib\ant.jar
-if exist lib\optional.jar erase lib\optional.jar
+if "%OS%" == "Windows_NT" if exist bootstrap rmdir/s/q bootstrap
+if not "%OS%" == "Windows_NT" if exist bootstrap deltree/y bootstrap
SET LOCALCLASSPATH=lib\parser.jar;lib\jaxp.jar
1.40 +2 -5 jakarta-ant/bootstrap.sh
Index: bootstrap.sh
===================================================================
RCS file: /home/cvs/jakarta-ant/bootstrap.sh,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- bootstrap.sh 2001/01/31 15:59:22 1.39
+++ bootstrap.sh 2001/02/02 04:58:54 1.40
@@ -39,11 +39,8 @@
echo ... Bootstrapping Ant Distribution
-if [ -f "lib/ant.jar" ] ; then
- rm lib/ant.jar
-fi
-if [ -f "lib/optional.jar" ] ; then
- rm lib/optional.jar
+if [ -d "bootstrap" ] ; then
+ rm -r bootstrap
fi
CLASSPATH=lib/parser.jar:lib/jaxp.jar:${CLASSPATH}
1.19 +4 -1 jakarta-ant/build.sh
Index: build.sh
===================================================================
RCS file: /home/cvs/jakarta-ant/build.sh,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- build.sh 2001/01/31 09:42:04 1.18
+++ build.sh 2001/02/02 04:58:54 1.19
@@ -1,12 +1,15 @@
#!/bin/sh
REALANTHOME=$ANT_HOME
-ANT_HOME=.
+ANT_HOME=bootstrap
export ANT_HOME
if test ! -f bootstrap/lib/ant.jar -o ! -x bootstrap/bin/ant -o ! -x
bootstrap/bin/antRun ; then
/bin/sh ./bootstrap.sh
fi
+
+CLASSPATH=$CLASSPATH:lib/parser.jar:lib/jaxp.jar
+export CLASSPATH
if [ "$REALANTHOME" != "" ] ; then
ANT_INSTALL="-Dant.install=$REALANTHOME"
