Changeset 13733


Ignore:
Timestamp:
2007-01-23T11:30:40+13:00 (17 years ago)
Author:
kjdon
Message:

updated for new indexers package. This works for when we have no collection building. Next we need to make it work when there is collection building

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/gsdl3/build.xml

    r13613 r13733  
    5151  <property name="src.home" value="${basedir}/src/java"/>
    5252  <property name="src.packages.home" value="${basedir}/src/packages"/>
     53  <property name="indexers.home" value="${basedir}/src/packages/indexers"/>
    5354  <property name="packages.home" value="${basedir}/packages"/>
    5455  <!-- this may be set in build.properties, eg if you move the web dir to
    … …  
    136137  <property name="gs2build.home" value="${basedir}/gs2build"/>
    137138  <property name="gli.home" value="${basedir}/gli"/>
    138   <property name="mg.home" value="${src.packages.home}/mg"/>
    139   <property name="mgpp.home" value="${src.packages.home}/mgpp"/>
     139  <property name="mg.home" value="${indexers.home}/mg"/>
     140  <property name="mgpp.home" value="${indexers.home}/mgpp"/>
    140141  <property name="javagdbm.home" value="${src.packages.home}/javagdbm"/>
    141   <property name="lucene.home" value="${gs2build.home}/src/java/org/nzdl/gsdl/LuceneWrap"/>
     142  <property name="lucene.home" value="${indexers.home}/lucene-gs"/>
    142143<!--  ==================== Compilation Control Options ==================== -->
    143144
    … …  
    216217 
    217218  <path id="local.tomcat.path">
    218     <pathelement location="${mysql.home}/bin"/>
    219219    <pathelement location="${basedir}/bin/script"/>
    220220    <pathelement location="${basedir}/bin"/>
    … …  
    335335    <fail if="java.too.old" message="You need Java 1.4 or greater to run Greenstone 3"/>
    336336   
    337     <available file="${src.packages.home}/mgpp/text" property="mgpp.present"/>
     337    <available file="${indexers.home}" property="indexers.present"/>
    338338    <available file="${basedir}/gli" property="gli.present"/>
    339339    <available file="${basedir}/gs2build" property="gs2build.present"/>
    340  <!--   <condition property="gsdl2.islocal">
    341       <or>
    342     <not>
    343       <isset property="gsdl2.installed.path"/>
    344     </not>
    345     <equals arg1="" arg2="${gsdl2.installed.path}"/>
    346       </or>
    347     </condition>-->
     340
    348341    <condition property="tomcat.islocal">
    349342      <or>
    … …  
    371364      <isset property="disable.collection.building"/>
    372365    </not>
    373     <!--<isset property="gsdl2.islocal"/>-->
    374    
    375366      </and>
    376367    </condition>
    … …  
    751742  </target>
    752743
    753    <target name="compile-core" depends="init,compile-lucene"
     744   <target name="compile-core" depends="init"
    754745    description="Compile only the Greenstone core">
    755746    <mkdir dir="${build.home}"/>
    … …  
    824815  <!-- these targets refer to the greenstone source packages - these need
    825816  updating less often, so are in  separate targets to the core -->
    826   <target name="prepare-packages" depends="init,prepare-mgpp,prepare-windows"/>
     817  <target name="prepare-packages" depends="init,prepare-indexers,prepare-windows"/>
    827818 
    828819  <target name="prepare-windows" depends="init" if="current.os.iswindows">
    … …  
    830821  </target>
    831822
    832   <target name="checkout-mgpp" depends="check-cvsroot,init" unless="nocvs.mode">
    833     <cvs command="checkout -P" package="mgpp" dest="${src.packages.home}"/>
    834   </target>
    835  
    836   <target name="prepare-mgpp" depends="init" unless="mgpp.present">
    837     <antcall target="checkout-mgpp"/>
     823  <target name="checkout-indexers" depends="check-cvsroot,init" unless="nocvs.mode">
     824    <cvs command="checkout -P" package="indexers" dest="${src.packages.home}"/>
     825  </target>
     826 
     827  <target name="prepare-indexers" depends="init" unless="indexers.present">
     828    <antcall target="checkout-indexers"/>
    838829  </target>
    839830
    … …  
    846837 
    847838  <target name="configure-packages" description="Configure only the packages.">
    848     <echo>
    849       Configuring MG
    850     </echo>
    851     <exec executable="${mg.home}/configure" os="${os.unix}"
    852       dir="${mg.home}">
    853       <arg value="--prefix=${basedir}"/>
    854       <arg value="--libdir=${lib.jni}"/>
    855     </exec>   
    856     <echo>
    857       Configuring MGPP
    858     </echo>
    859     <exec executable="${mgpp.home}/configure" os="${os.unix}"
    860       dir="${mgpp.home}">
    861       <arg value="--prefix=${basedir}"/>
    862       <arg value="--libdir=${lib.jni}"/>
    863     </exec>
    864839    <echo>
    865840      Configuring JavaGDBM
    … …  
    876851     <arg value="--with-gdbm=${gdbm.installed.path}"/>
    877852    </exec>   
    878 
     853   
     854    <echo>
     855      Configuring Indexers
     856    </echo>
     857    <exec executable="${indexers.home}/configure" os="${os.unix}"
     858      dir="${indexers.home}">
     859      <arg value="--prefix=${basedir}"/>
     860      <arg value="--libdir=${lib.jni}"/>
     861    </exec>         
    879862  </target>
    880863
    … …  
    882865
    883866  <target name="clean-packages-c++" depends="init">
    884     <!-- mg : just call the make target -->
    885     <exec executable="make" os="${os.unix}"
    886       dir="${mg.home}">
    887       <arg value="clean"/>
    888     </exec>
    889     <!-- mgpp -->
    890     <exec executable="make" os="${os.unix}"
    891       dir="${mgpp.home}">
    892       <arg value="clean"/>
    893     </exec>
    894867    <!-- javagdbm -->
    895868    <exec executable="make" os="${os.unix}"
    … …  
    897870      <arg value="clean"/>
    898871    </exec>
     872    <!-- Indexers -->
     873    <exec executable="make" os="${os.unix}"
     874      dir="${indexers.home}">
     875      <arg value="clean"/>
     876    </exec>
    899877  </target>
    900878   
    … …  
    902880    description="Clean only the C/C++ packages">
    903881    <exec executable="${compile.windows.c++.setup}"/>
    904     <exec executable="${mg.home}/winMake.bat" dir="${mg.home}">
     882<!--    <exec executable="${mg.home}/winMake.bat" dir="${mg.home}">
    905883      <arg value="clean"/>
    906884    </exec>
    907885    <exec executable="${mgpp.home}/winMake.bat" dir="${mgpp.home}">
    908886      <arg value="clean"/>
    909     </exec>
     887    </exec>-->
     888    <!-- Indexers -->
     889    <!-- TODO -->
    910890  </target>   
    911891
    912892  <target name="compile-packages"
     893    description="Compile only the source packages">
     894
     895   
     896    <!-- javagdbm -->
     897    <exec executable="make" os="${os.unix}"
     898      dir="${javagdbm.home}">
     899    </exec>
     900    <exec executable="make" os="${os.unix}"
     901      dir="${javagdbm.home}">
     902      <arg value="install"/>
     903    </exec>
     904    <!-- windows: just the java stuff. -->
     905    <exec executable="${javagdbm.home}/winMake.bat" os="${os.windows}"
     906      dir="${javagdbm.home}">
     907      <arg value="compile"/>
     908      <arg value="javaonly"/>
     909    </exec>
     910    <!-- install the jar file -->
     911    <copy file="${javagdbm.home}/javagdbm.jar" todir="${lib.jni}"/>
     912   
     913    <!-- Indexers -->
     914    <exec executable="make" os="${os.unix}"
     915      dir="${indexers.home}">
     916    </exec>
     917    <exec executable="make" os="${os.unix}"
     918      dir="${indexers.home}">
     919      <arg value="install"/>
     920    </exec>
     921    <!-- install the jar files -->
     922    <copy file="${mg.home}/mg.jar" todir="${lib.jni}"/>
     923    <copy file="${mgpp.home}/mgpp.jar" todir="${lib.jni}"/>
     924    <copy file="${lucene.home}/LuceneWrapper.jar" todir="${web.lib}"/>
     925
     926    <!-- TODO windows -->
     927  </target>
     928
     929  <target name="compile-packages-old"
    913930    description="Compile only the packages">
    914931    <echo>Compiling MG</echo>
    … …  
    928945    <!-- install the jar file -->
    929946    <copy file="${mg.home}/mg.jar" todir="${lib.jni}"/>
    930    
    931947    <!-- mgpp -->
    932948    <echo>Compiling MGPP</echo>
    … …  
    968984  <target name="compile-windows-c++-packages" depends="init" if="current.os.iswindows"
    969985    description="Compile only the C/C++ packages">
     986    <!-- TODO -->
    970987    <exec executable="${compile.windows.c++.setup}"/>
    971988    <exec executable="${mg.home}/winMake.bat" dir="${mg.home}">
    … …  
    11871204  </target>
    11881205 
    1189   <target name="compile-gs2build" depends="init,compile-windows-c++-gs2build,compile-lucene" if="collection.building.enabled">
     1206  <target name="compile-gs2build" depends="init,compile-windows-c++-gs2build" if="collection.building.enabled">
    11901207    <!-- gs2build -->
    11911208    <!--linux: make, make install -->
    … …  
    12551272    </echo>
    12561273  </target>
    1257  
    1258   <target name="compile-lucene" depends="init">
    1259     <mkdir dir="${gs2build.home}/bin/java"/>
    1260     <mkdir dir="${lucene.home}/classes"/>
    1261     <javac srcdir="${lucene.home}"
    1262       destdir="${lucene.home}/classes"
    1263       debug="${compile.debug}"
    1264       deprecation="${compile.deprecation}"
    1265       optimize="${compile.optimize}"
    1266       classpath="${lucene.home}:${lucene.home}/lib/lucene-core-2.0.0.jar"/>
    1267     <unjar src="${lucene.home}/lib/lucene-core-2.0.0.jar"
    1268       dest="${lucene.home}/classes"/>
    1269     <jar destfile="${lucene.home}/LuceneWrap.jar"
    1270       basedir="${lucene.home}/classes"/>
    1271     <copy file="${lucene.home}/LuceneWrap.jar" todir="${web.lib}"/>
    1272     <copy file="${lucene.home}/LuceneWrap.jar" todir="${gs2build.home}/bin/java"/>
    1273   </target>
    1274  
    1275   <target name="clean-lucene" depends="init">
    1276     <delete dir="${lucene.home}/classes"/>
    1277     <delete file="${lucene.home}/LuceneWrap.jar"/>
    1278   </target>
    1279  
     1274
    12801275</project>
    12811276
Note: See TracChangeset for help on using the changeset viewer.