ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ru...@locus.apache.org
Subject cvs commit: jakarta-ant/lib xml.jar projectx-tr2.jar
Date Fri, 14 Jan 2000 13:50:27 GMT
rubys       00/01/14 05:50:26

  Modified:    .        bootstrap.bat bootstrap.sh build.bat build.sh
                        build.xml
  Added:       lib      xml.jar
  Removed:     lib      projectx-tr2.jar
  Log:
  Allow jakarta-ant to be build into an "ANT_HOME" structure in place.
  Move implicit tasks into an explicit init target
  
  Revision  Changes    Path
  1.3       +1 -1      jakarta-ant/bootstrap.bat
  
  Index: bootstrap.bat
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/bootstrap.bat,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- bootstrap.bat	2000/01/13 18:08:19	1.2
  +++ bootstrap.bat	2000/01/14 13:50:24	1.3
  @@ -1,7 +1,7 @@
   @ECHO OFF
   echo BOOTSTRAPPING ANT DISTRIBUTION
   
  -set C=%CLASSPATH%;lib/projectx-tr2.jar
  +set C=%CLASSPATH%;lib/xml.jar
   set SRCDIR=src\main\org\apache\tools\ant
   set TMPDIR=tmp
   
  
  
  
  1.3       +1 -1      jakarta-ant/bootstrap.sh
  
  Index: bootstrap.sh
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/bootstrap.sh,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- bootstrap.sh	2000/01/13 18:08:19	1.2
  +++ bootstrap.sh	2000/01/14 13:50:24	1.3
  @@ -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}:lib/projectx-tr2.jar:src:${CLASSDIR}
  +CLASSPATH=${CLASSPATH}:lib/xml.jar:src:${CLASSDIR}
   
   mkdir -p ${CLASSDIR}
   
  
  
  
  1.3       +1 -1      jakarta-ant/build.bat
  
  Index: build.bat
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/build.bat,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- build.bat	2000/01/13 18:08:19	1.2
  +++ build.bat	2000/01/14 13:50:24	1.3
  @@ -1,3 +1,3 @@
   @echo off
   REM convience bat file to build with
  -java -classpath "%CLASSPATH%;lib\ant.jar;lib\projectx-tr2.jar" org.apache.tools.ant.Main
%1 %2 %3 %4 %5
  +java -classpath "%CLASSPATH%;lib\ant.jar;lib\xml.jar" org.apache.tools.ant.Main %1 %2 %3
%4 %5
  
  
  
  1.3       +1 -1      jakarta-ant/build.sh
  
  Index: build.sh
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/build.sh,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- build.sh	2000/01/13 18:08:19	1.2
  +++ build.sh	2000/01/14 13:50:24	1.3
  @@ -1,6 +1,6 @@
   #!/bin/sh
   
  -ADDL_CLASSPATH=./lib/ant.jar:./lib/projectx-tr2.jar
  +ADDL_CLASSPATH=./lib/ant.jar:./lib/xml.jar
   
   if [ "$CLASSPATH" != "" ] ; then
     CLASSPATH=$CLASSPATH:$ADDL_CLASSPATH
  
  
  
  1.3       +20 -10    jakarta-ant/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/build.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- build.xml	2000/01/13 18:08:19	1.2
  +++ build.xml	2000/01/14 13:50:24	1.3
  @@ -2,16 +2,18 @@
   
   <project name="Ant" default="main" basedir=".">
   
  -  <property name="src.dir" value="src/main"/>
  -  <property name="build.dir" value="build"/>
  -  <property name="dist.dir" value="${user.home}/opt"/>
  +  <target name="init">
  +    <property name="src.dir" value="src/main"/>
  +    <property name="build.dir" value="build"/>
  +    <property name="dist.dir" value="${user.home}/opt"/>
   
  -  <property name="classpath" value="lib/projectx-tr2.jar"/>
  -  <property name="manifest" value="src/etc/manifest"/>
  +    <property name="classpath" value="lib/xml.jar"/>
  +    <property name="manifest" value="src/etc/manifest"/>
     
  -  <property name="build.compiler" value="classic"/>
  +    <property name="build.compiler" value="classic"/>
  +  </target>
   
  -  <target name="main">
  +  <target name="main" depends="init">
       <mkdir dir="${build.dir}"/>
       <javac srcdir="${src.dir}" destdir="${build.dir}" classpath="${classpath}"
              debug="on" deprecation="on"/>
  @@ -21,13 +23,20 @@
        <jar jarfile="lib/ant.jar" basedir="${build.dir}" items="org" manifest="${manifest}"/>
     </target>
   
  +  <target name="home" depends="jar">
  +     <mkdir dir="bin"/>
  +     <copydir src="src/bin" dest="bin"/>
  +     <chmod perm="+x" src="${dist.dir}/ant/bin/ant"/>
  +     <chmod perm="+x" src="${dist.dir}/ant/bin/antRun"/>
  +  </target>
  +
     <target name="dist" depends="main">
        <mkdir dir="${dist.dir}/ant"/>
        <mkdir dir="${dist.dir}/ant/lib"/>
        <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="lib/projectx-tr2.jar" dest="${dist.dir}/ant/lib/xml.jar"/>
  +     <copyfile src="lib/xml.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"/>
  @@ -35,13 +44,14 @@
        <chmod perm="+x" src="${dist.dir}/ant/bin/antRun"/>
     </target>
   
  -  <target name="clean">
  +  <target name="clean" depends="init">
       <deltree dir="${build.dir}"/>
  +    <deltree dir="bin"/>
     </target>
   
     <!-- in progress !  -->
   
  -  <target name="get.snapshot">
  +  <target name="get.snapshot" depends="init">
       <get src="http://jakarta.apache.org/build/tmp/ant/ant.src.zip" dest="ant-src.zip"
/>
       <expand src="ant-src.zip" dest="." />
     </target>
  
  
  
  1.1                  jakarta-ant/lib/xml.jar
  
  	<<Binary file>>
  
  

Mime
View raw message