rubys 00/01/13 10:08:20
Modified: . bootstrap.bat bootstrap.sh build.bat build.sh
build.xml
Added: lib projectx-tr2.jar
Log:
Make system self contained, bootstrapable, and buildable on both
Windows and Unix platforms.
Revision Changes Path
1.2 +1 -1 jakarta-ant/bootstrap.bat
Index: bootstrap.bat
===================================================================
RCS file: /home/cvs/jakarta-ant/bootstrap.bat,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bootstrap.bat 2000/01/13 10:41:38 1.1
+++ bootstrap.bat 2000/01/13 18:08:19 1.2
@@ -1,7 +1,7 @@
@ECHO OFF
echo BOOTSTRAPPING ANT DISTRIBUTION
-set C=%CLASSPATH%;..\jakarta-tools\projectx-tr2.jar
+set C=%CLASSPATH%;lib/projectx-tr2.jar
set SRCDIR=src\main\org\apache\tools\ant
set TMPDIR=tmp
1.2 +1 -1 jakarta-ant/bootstrap.sh
Index: bootstrap.sh
===================================================================
RCS file: /home/cvs/jakarta-ant/bootstrap.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bootstrap.sh 2000/01/13 10:41:38 1.1
+++ bootstrap.sh 2000/01/13 18:08:19 1.2
@@ -5,7 +5,7 @@
SRCDIR=src/main/org/apache/tools/ant
CLASSDIR=classes
CLASSPATH=${CLASSPATH}:${JAVA_HOME}/lib/classes.zip:${JAVA_HOME}/lib/tools.jar
-CLASSPATH=${CLASSPATH}:../jakarta-tomcat/projectx-tr2.jar:src:${CLASSDIR}
+CLASSPATH=${CLASSPATH}:lib/projectx-tr2.jar:src:${CLASSDIR}
mkdir -p ${CLASSDIR}
1.2 +1 -1 jakarta-ant/build.bat
Index: build.bat
===================================================================
RCS file: /home/cvs/jakarta-ant/build.bat,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build.bat 2000/01/13 10:41:38 1.1
+++ build.bat 2000/01/13 18:08:19 1.2
@@ -1,3 +1,3 @@
@echo off
REM convience bat file to build with
-java -classpath
"%CLASSPATH%;..\jakarta-tools\ant.jar;..\jakarta-tools\projectx-tr2.jar"
org.apache.tools.ant.Main %1 %2 %3 %4 %5
+java -classpath "%CLASSPATH%;lib\ant.jar;lib\projectx-tr2.jar"
org.apache.tools.ant.Main %1 %2 %3 %4 %5
1.2 +1 -1 jakarta-ant/build.sh
Index: build.sh
===================================================================
RCS file: /home/cvs/jakarta-ant/build.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build.sh 2000/01/13 10:41:38 1.1
+++ build.sh 2000/01/13 18:08:19 1.2
@@ -1,6 +1,6 @@
#!/bin/sh
-ADDL_CLASSPATH=./../jakarta-tools/ant.jar:./../jakarta-tools/projectx-tr2.jar
+ADDL_CLASSPATH=./lib/ant.jar:./lib/projectx-tr2.jar
if [ "$CLASSPATH" != "" ] ; then
CLASSPATH=$CLASSPATH:$ADDL_CLASSPATH
1.2 +2 -3 jakarta-ant/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-ant/build.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build.xml 2000/01/13 10:41:38 1.1
+++ build.xml 2000/01/13 18:08:19 1.2
@@ -18,7 +18,7 @@
</target>
<target name="jar" depends="main">
- <jar jarfile="../ant.jar" basedir="${build.dir}" items="org"
manifest="${manifest}"/>
+ <jar jarfile="lib/ant.jar" basedir="${build.dir}" items="org"
manifest="${manifest}"/>
</target>
<target name="dist" depends="main">
@@ -27,8 +27,7 @@
<mkdir dir="${dist.dir}/ant/bin"/>
<mkdir dir="${dist.dir}/ant/docs"/>
<jar jarfile="${dist.dir}/ant/lib/ant.jar" basedir="${build.dir}"
items="org" manifest="${manifest}"/>
- <copyfile src="../projectx-tr2.jar" dest="${dist.dir}/ant/lib/xml.jar"/>
- <copyfile src="../moo.jar" dest="${dist.dir}/ant/lib/moo.jar"/>
+ <copyfile src="lib/projectx-tr2.jar"
dest="${dist.dir}/ant/lib/xml.jar"/>
<copyfile src="build.xml" dest="${dist.dir}/ant/lib/build.xml"/>
<copydir src="src/bin" dest="${dist.dir}/ant/bin"/>
<copydir src="docs" dest="${dist.dir}/ant/docs"/>
1.1 jakarta-ant/lib/projectx-tr2.jar
<<Binary file>>
