Changeset 15044

Show
Ignore:
Timestamp:
05.03.2008 13:42:41 (11 years ago)
Author:
shaoqun
Message:

use install.flax set up in the build.properties file

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • greenstone3/trunk/build.xml

    r15042 r15044  
    280280  <!-- add comments about using xxx-core, xxx-packages if only want certain parts?? --> 
    281281 
    282   <target name="prepare" depends="accept-properties,init,prepare-core,prepare-packages,prepare-gs2building,prepare-tomcat,prepare-axis,prepare-web,prepare-collections,prepare-gdbm" 
     282  <target name="prepare" depends="accept-properties,init,prepare-core,prepare-packages,prepare-gs2building,prepare-tomcat,prepare-axis,prepare-web,prepare-collections,prepare-gdbm, prepare-flax" 
    283283    description="Use this when you first checkout the code: 'ant prepare install'. This will do some additional subversion checkouts and downloads, so you need to be online to run this."> 
    284284<!--  <target name="prepare" depends="accept-properties,init,prepare-core,prepare-packages,prepare-gs2building,prepare-tomcat,prepare-axis,prepare-web,prepare-collections" 
     
    14221422    </echo> 
    14231423  </target> 
    1424   <target name="checkout-flax" description="check out flax source code from another repository"> 
     1424  <target name="prepare-flax" description="check out flax source code from another repository" if="install.flax"> 
    14251425    <echo>checking out flax ...</echo> 
    14261426    <mkdir dir="${basedir}/src/java/org/flax"/> 
     
    14441444                destPath="${basedir}/flax-resources"/> 
    14451445    </svn> 
     1446     <echo>prepare flax files...</echo> 
    14461447    <move file="${basedir}/web/WEB-INF/web.xml" tofile="${basedir}/web/WEB-INF/web.xml.greenstone3backup"/> 
    14471448    <antcall target="flax-copy-files" /> 
     
    14571458    </delete> 
    14581459  </target> 
    1459     <target name="update-flax" description="update flax from repository"> 
     1460 
     1461  <target name="update-flax" description="update flax from repository"> 
    14601462      <echo>updating flax ...</echo> 
    14611463      <svn> 
     
    14671469        <svncall target="flax-copy-files" /> 
    14681470      </svn> 
    1469     </target> 
     1471   </target> 
    14701472 
    14711473   <target name="flax-copy-files" description="copy some flax files into the appropriate greenstone3 directories">