jvanzyl     02/02/21 19:47:15

  Modified:    .        .cvsignore build-bootstrap.sh build-bootstrap.xml
               src/templates/build test.sh
  Log:
  - the working bootstrap is all placed in the 'work' directory, just
    set $LIB_REPO and run ./build-bootstrap.sh and the maven JAR is built.
  
    i'll improve this more tomorrow, but compiling with options from the
    the property descriptor is fully functional.
  
  Revision  Changes    Path
  1.3       +1 -1      jakarta-turbine-maven/.cvsignore
  
  Index: .cvsignore
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-maven/.cvsignore,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- .cvsignore        20 Feb 2002 08:11:13 -0000      1.2
  +++ .cvsignore        22 Feb 2002 03:47:15 -0000      1.3
  @@ -1,4 +1,4 @@
  -bin
  +target
   work
   velocity.log
   maven.log
  
  
  
  1.3       +3 -4      jakarta-turbine-maven/build-bootstrap.sh
  
  Index: build-bootstrap.sh
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-maven/build-bootstrap.sh,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- build-bootstrap.sh        22 Feb 2002 03:32:54 -0000      1.2
  +++ build-bootstrap.sh        22 Feb 2002 03:47:15 -0000      1.3
  @@ -19,15 +19,14 @@
   # Bootstrap directory of classes needed to generate the
   # build system.
   rm -rf work
  -rm -rf bootstrap
  -mkdir bootstrap
  +mkdir work
   
   # Need Ant
  -CLASSPATH=$CLASSPATH:bootstrap:$ANT_HOME/lib/ant.jar
  +CLASSPATH=$CLASSPATH:work:$ANT_HOME/lib/ant.jar
   
   echo $CLASSPATH
   
  -$JAVA_HOME/bin/javac -classpath $CLASSPATH -d bootstrap \
  +$JAVA_HOME/bin/javac -classpath $CLASSPATH -d work \
       src/java/org/apache/maven/project/*.java \
       src/java/org/apache/maven/build/*.java
   
  
  
  
  1.5       +0 -1      jakarta-turbine-maven/build-bootstrap.xml
  
  Index: build-bootstrap.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-maven/build-bootstrap.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- build-bootstrap.xml       22 Feb 2002 03:32:54 -0000      1.4
  +++ build-bootstrap.xml       22 Feb 2002 03:47:15 -0000      1.5
  @@ -28,7 +28,6 @@
       />
   
       <copy tofile="work/project.xml" file="project-maven.xml"/>
  -    <copy tofile="work/maven.jar" file="target/maven.jar"/>
       <chmod file="work/test.sh" perm="+x"/>    
       <copy todir="work">
         <fileset dir=".">
  
  
  
  1.2       +1 -1      jakarta-turbine-maven/src/templates/build/test.sh
  
  Index: test.sh
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-maven/src/templates/build/test.sh,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- test.sh   22 Feb 2002 03:35:02 -0000      1.1
  +++ test.sh   22 Feb 2002 03:47:15 -0000      1.2
  @@ -16,6 +16,6 @@
     CLASSPATH=$CLASSPATH:${LIB_REPO}/${JAR}
   done
   
  -CLASSPATH=$CLASSPATH:maven.jar
  +CLASSPATH=$CLASSPATH:.
   
   ant
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>

Reply via email to