Changeset 15124

Timestamp:

2008-03-23T15:57:45+13:00 (16 years ago)

Author:

shaoqun

Message:

add codes for flax and remove all annoying ^Ms

File:

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

greenstone3/trunk/build.xml

@@ -1 +1 @@
 <?xml version="1.0"?>
-
 <!-- ====================================================================== 
      March 2005                                                    
 
      Greenstone3 build and install script
-                   
+                  
      kjdon                                                                
      ====================================================================== -->
@@ -18 +17 @@
 
     <!-- ============ self defined tasks =================== -->
-
     <taskdef name="mysetproxy" classname="org.greenstone.anttasks.MySetProxy" classpath="${basedir}/lib/java/anttasks.jar"/>
     <taskdef name="getuserandpassword" classname="org.greenstone.anttasks.MyGetUserAndPassword" classpath="${basedir}/lib/java/anttasks.jar"/>
@@ -70 +68 @@
   <!-- other files needed by the servlet go here -->
   <property name="web.classes" value="${web.home}/WEB-INF/classes"/>
+  <!--- flax: the WordNet home -->
+  <property name="wn.home" value="${web.home}/WEB-INF/classes/flax/WordNet"/>
+
   <!-- jni libraries and java wrappers go here -->
   <property name="lib.jni" value="${basedir}/lib/jni"/>
@@ -256 +257 @@
     <pathelement path="${env.PATH}"/>
     <pathelement path="${env.Path}"/>
+    <pathelement path="${wn.home}/bin"/>
   </path>
 
@@ -296 +298 @@
     description="Configure the installation. Includes setting up config files. Should be re-run if you change the build.properties file."/>
 
-  <target name="clean" depends="init,clean-gdbm,clean-packages,clean-core,clean-gs2building"
+  <target name="clean" depends="init,clean-packages,clean-core,clean-gs2building"
     description="Remove all old compiled code. Includes core, packages and gs2building if necessary"/>
   
@@ -597 +599 @@
       <env key="LD_LIBRARY_PATH" path="${env.LD_LIBRARY_PATH}:${lib.jni}"/>
       <env key="DYLD_LIBRARY_PATH" path="${env.DYLD_LIBRARY_PATH}:${lib.jni}:${gdbm.installed.path}/lib"/> <!-- for mac os -->
+      <env key="WNHOME" path="${wn.home}"/>
     </exec>
     <exec executable="${catalina.home}/bin/startup.bat" os="${os.windows}" dir="${catalina.home}/bin" spawn="true">
@@ -1125 +1128 @@
             <export srcUrl="${svn.root}/gsdl/${branch.path}/WIN32cfg.h" destPath="gs2build/WIN32cfg.h"/>
         </svn>
-
   </target>
   
@@ -1136 +1138 @@
   <target name="prepare-gs2building" depends="init,prepare-gs2build,prepare-gli" if="collection.building.enabled">
   </target>
-
     <target name="checkout-gs2build" depends="init" if="collection.building.enabled" unless="nocvs.mode">
         <!-- please keep this function in sync with update-gs2build -->
@@ -1212 +1213 @@
             <export srcUrl="${svn.root}/gsdl/${branch.path}/WIN32cfg.h" destPath="gs2build/WIN32cfg.h"/>
         </svn>
-
     </target>
 
@@ -1492 +1492 @@
     <mkdir dir="${basedir}/web/interfaces/flax"/>
     <mkdir dir="${basedir}/web/sites/flax"/>
-     <mkdir dir="${basedir}/flax-resources"/>
+    <mkdir dir="${basedir}/flax-resources"/>
+    <mkdir dir="${basedir}/flax-lib"/>
     <svn>
       <checkout url="${flax.svn.root}/flax1.0/trunk/src/java/org/flax/"  
@@ -1506 +1507 @@
       <checkout url="${flax.svn.root}/flax1.0/trunk/flax-resources"
                 destPath="${basedir}/flax-resources"/>
+      <checkout url="${flax.svn.root}/flax1.0/trunk/lib"
+                destPath="${basedir}/flax-lib"/>
     </svn>
      <echo>prepare flax files...</echo>
@@ -1511 +1514 @@
     <antcall target="flax-copy-files" />
     <antcall target="unzip-flax-collections" />
+    <antcall target="unzip-flax-resources" />
    </target>
 
@@ -1537 +1541 @@
     </delete>
   </target>
+
+ <target name="unzip-flax-resources" >
+    <property name="classes.dir" value="${basedir}/web//WEB-INF/classes/flax"/>
+    <unzip dest="${classes.dir}">  
+      <fileset dir="${classes.dir}">
+    <include name="*.zip"/>
+       </fileset>    
+    </unzip>    
+    <delete>
+      <fileset dir="${classes.dir}" includes="*.zip"/>
+    </delete>
+  </target>
    
    <target name="flax-copy-files" description="copy some flax files into the appropriate greenstone3 directories">
@@ -1544 +1560 @@
            <copy file="${basedir}/web/WEB-INF/classes/flax/server-config.wsdd" todir="${basedir}/web/WEB-INF" overwrite="true" />
            <copy file="${basedir}/flax-resources/flax-build.xml" todir="${basedir}" overwrite="true" />
-   
+           <copy file="${basedir}/flax-lib/opennlp-tools-1.3.0.jar" todir="${basedir}/web/WEB-INF/lib" overwrite="true" />    
    </target>
       <!--install gdbm stuff -->
 
   <!-- downloads the gdbm library -->
-  <target name="prepare-gdbm" depends="init" if="install.gdbm"> 
+  <target name="prepare-gdbm" depends="init" if="install.gdbm">
       <get src="http://www.greenstone.org/gs3files/gdbm-1.8.3.tar.gz"
        dest="${src.packages.home}/gdbm-1.8.3.tar.gz"  usetimestamp="true"/>