You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xmlbeans.apache.org by pc...@apache.org on 2004/03/15 06:48:48 UTC

cvs commit: xml-xmlbeans/v2/jam_old build.xml

pcal        2004/03/14 21:48:48

  Modified:    v2       build.xml
               v2/jam_old build.xml
  Log:
  clean up so jam build dir is still at top level
  
  Revision  Changes    Path
  1.49      +4 -3      xml-xmlbeans/v2/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/xml-xmlbeans/v2/build.xml,v
  retrieving revision 1.48
  retrieving revision 1.49
  diff -u -r1.48 -r1.49
  --- build.xml	9 Mar 2004 10:38:50 -0000	1.48
  +++ build.xml	15 Mar 2004 05:48:48 -0000	1.49
  @@ -780,9 +780,10 @@
     <target name='jam'>
       <ant dir='${jam_root}' target='clean' inheritAll='false' />
       <ant dir='${jam_root}' target='all' inheritAll='false' />
  -    <copy todir="build/classes/jam">
  -      <fileset dir="${jam_root}/build/classes" />
  -    </copy>
  +    <move todir="build/classes/jam">
  +      <fileset dir="build/jam/classes" />
  +    </move>
  +    <delete dir='build/jam'/>
     </target>
   
     <!-- marshal target =============================================== -->
  
  
  
  1.2       +7 -5      xml-xmlbeans/v2/jam_old/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/xml-xmlbeans/v2/jam_old/build.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- build.xml	9 Mar 2004 10:23:05 -0000	1.1
  +++ build.xml	15 Mar 2004 05:48:48 -0000	1.2
  @@ -5,8 +5,8 @@
   
     <property name='src_dir'     value='src'/>
     <property name='docs_dir'    value='docs'/>
  -  <property name='build_dir'   value='build'/>
  -  <property name='docbuild_dir'    value='build/docs'/>
  +  <property name='build_dir'   value='./../build/jam'/>
  +  <property name='docbuild_dir'    value='${build_dir}/docs'/>
     <property name='javadocbuild_dir'    value='${docbuild_dir}/javadocs'/>
     <property name='gen_dir'     value='${build_dir}/generatedsrc'/>
     <property name='classes_dir' value='${build_dir}/classes'/>
  @@ -16,6 +16,8 @@
   
     <target name='clean'>
       <delete dir='${build_dir}'/>
  +    <!-- delete the old location just in case someone still has it around -->
  +    <delete dir='build'/>  
     </target>
   
     <target name='all' depends='compile'/>
  @@ -79,8 +81,8 @@
     </target>
   
     <target name='jars' depends='all'>
  -    <jar jarfile='build/jam.jar'    basedir='${classes_dir}'/>
  -    <jar jarfile='build/jamsrc.jar' basedir='.' excludes='build/**'/>
  +    <jar jarfile='${build_dir}/jam.jar'    basedir='${classes_dir}'/>
  +    <jar jarfile='${build_dir}/jamsrc.jar' basedir='.' excludes='${build_dir}/**'/>
     </target>
   
     <target name='zip' depends='jars,docs'>
  @@ -88,7 +90,7 @@
       <delete file='${build_dir}/jam.zip'/>
       <mkdir  dir='${build_dir}/zip'/>
       <copy todir='${build_dir}/zip'>
  -      <fileset dir='build' casesensitive='yes'>
  +      <fileset dir='${build_dir}' casesensitive='yes'>
           <include name='jam.jar'/>
           <include name='jamsrc.jar'/>
           <include name='docs/**'/>
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: xmlbeans-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xmlbeans-cvs-help@xml.apache.org