Changeset 15044

Timestamp:

2008-03-05T13:42:41+13:00 (16 years ago)

Author:

shaoqun

Message:

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

File:

• greenstone3/trunk/build.xml (modified) (5 diffs)

greenstone3/trunk/build.xml

@@ -280 +280 @@
   <!-- add comments about using xxx-core, xxx-packages if only want certain parts?? -->
 
-  <target name="prepare" depends="accept-properties,init,prepare-core,prepare-packages,prepare-gs2building,prepare-tomcat,prepare-axis,prepare-web,prepare-collections,prepare-gdbm"
+  <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"
     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.">
 <!--  <target name="prepare" depends="accept-properties,init,prepare-core,prepare-packages,prepare-gs2building,prepare-tomcat,prepare-axis,prepare-web,prepare-collections"
@@ -1422 +1422 @@
     </echo>
   </target>
-  <target name="checkout-flax" description="check out flax source code from another repository">
+  <target name="prepare-flax" description="check out flax source code from another repository" if="install.flax">
     <echo>checking out flax ...</echo>
     <mkdir dir="${basedir}/src/java/org/flax"/>
@@ -1444 +1444 @@
                 destPath="${basedir}/flax-resources"/>
     </svn>
+     <echo>prepare flax files...</echo>
     <move file="${basedir}/web/WEB-INF/web.xml" tofile="${basedir}/web/WEB-INF/web.xml.greenstone3backup"/>
     <antcall target="flax-copy-files" />
@@ -1457 +1458 @@
     </delete>
   </target>
-    <target name="update-flax" description="update flax from repository">
+
+  <target name="update-flax" description="update flax from repository">
       <echo>updating flax ...</echo>
       <svn>
@@ -1467 +1469 @@
         <svncall target="flax-copy-files" />
       </svn>
-    </target>
+   </target>
 
    <target name="flax-copy-files" description="copy some flax files into the appropriate greenstone3 directories">