Changeset 2770

Show
Ignore:
Timestamp:
02/05/10 20:33:03
Author:
douglm
Message:

Make sure we preserve libraries in quickstart for the directory tools

Fix dirTools.xml to use them

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/build.xml

    r2746 r2770  
    211211                                build.testsuite,build.deployutil" 
    212212          description="builds the project"> 
    213     <copy toDir="${dist.home}" > 
     213    <mkdir dir="${dist.home}/tools" /> 
     214    <copy toDir="${dist.home}/tools" > 
    214215      <fileset dir="${org.bedework.project.bwtools}/dist" includes="*.jar" /> 
     216      <fileset dir="${org.bedework.project.bwtools}/lib" includes="*.jar" /> 
    215217    </copy> 
    216218  </target> 

  • trunk/build/dirTools.xml

    r2048 r2770  
    1212       ================================================================= --> 
    1313 
    14   <target name="dirToolInit" depends="init"> 
     14  <target name="dirToolInit" > 
    1515    <property name="app.dest.classes" 
    16               location="${dist.home}/temp/dirTool/classes" /> 
     16              location="${org.bedework.project.bedework}/dist/tools/classes" /> 
    1717 
    1818    <delete dir="${app.dest.classes}" /> 
    …… 
    2020 
    2121    <path id="run.classpath"> 
    22       <fileset dir="${org.bedework.project.bedework}/applib"> 
     22      <fileset dir="${org.bedework.project.bedework}/dist/tools"> 
    2323         <include name="*.jar"/> 
    2424      </fileset> 
    …… 
    3535  </target> 
    3636 
    37   <target name="initDir" depends="init" 
     37  <target name="initDir"  
    3838          description="Build and run directory init"> 
    3939    <antfetch antfile="${org.bedework.project.bwtools}/build.xml" inheritall="false"