Ignore:
Timestamp:
2007-01-23T12:27:54+13:00 (17 years ago)
Author:
kjdon
Message:

made new indexers repository work when coll building is enabled - we set indexers.home to be gs2build/indexers, and copy java and jni files from there to gs3 places

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/gsdl3/build.xml

    r13733 r13739  
    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"/>
    5453  <property name="packages.home" value="${basedir}/packages"/>
    5554  <!-- this may be set in build.properties, eg if you move the web dir to
     
    6463  <!-- jni libraries and java wrappers go here -->
    6564  <property name="lib.jni" value="${basedir}/lib/jni"/>
    66  
     65   
    6766  <property name="javadocs" value="${basedir}/docs/javadoc"/>
    6867
     
    131130  </condition>
    132131 
     132  <condition property="independent-indexers">
     133    <isset property="disable.collection.building"/>
     134  </condition>
     135   
    133136  <!-- ============= Base dirs for each package and component ============ -->
    134137  <property name="applet.home" value="${src.home}/org/greenstone/applet"/>
     
    137140  <property name="gs2build.home" value="${basedir}/gs2build"/>
    138141  <property name="gli.home" value="${basedir}/gli"/>
     142  <property name="javagdbm.home" value="${src.packages.home}/javagdbm"/>
     143
     144  <!--<property name="indexers.home" value="${basedir}/src/packages/indexers">-->
     145  <condition property="indexers.home" value="${basedir}/src/packages/indexers">
     146    <isset property="disable.collection.building"/>
     147  </condition>
     148  <condition property="indexers.home" value="${gs2build.home}/indexers">
     149    <not>
     150      <isset property="disable.collection.building"/>
     151    </not>
     152  </condition>
     153
    139154  <property name="mg.home" value="${indexers.home}/mg"/>
    140155  <property name="mgpp.home" value="${indexers.home}/mgpp"/>
    141   <property name="javagdbm.home" value="${src.packages.home}/javagdbm"/>
    142156  <property name="lucene.home" value="${indexers.home}/lucene-gs"/>
     157
     158
    143159<!--  ==================== Compilation Control Options ==================== -->
    144160
     
    237253
    238254  <target name="prepare" depends="accept-properties,init,prepare-core,prepare-packages,prepare-gs2building,prepare-tomcat,prepare-axis,prepare-web,prepare-collections"
    239     description="Use this when you first checkout the code: 'ant prepare install'. This will do some additional cvs checkouts and downloads, so you need to be online to run this."/>
    240 
     255    description="Use this when you first checkout the code: 'ant prepare install'. This will do some additional cvs checkouts and downloads, so you need to be online to run this.">
     256    <!-- make sure .sh files are executable -->
     257    <chmod dir="${basedir}" perm="ugo+rx"
     258      includes="*.sh"/>
     259    <chmod dir="${basedir}/bin/script" perm="ugo+rx"
     260      includes="*.sh,*.pl"/>
     261  </target>
    241262  <target name="install" depends="init,configure,configure-c++,compile,deploy-localsite"
    242263    description="Install Greenstone 3. Use this when you first checkout the code: 'ant prepare install'."/>
     
    821842  </target>
    822843
    823   <target name="checkout-indexers" depends="check-cvsroot,init" unless="nocvs.mode">
     844  <target name="checkout-indexers" depends="check-cvsroot,init" if="independent-indexers" unless="nocvs.mode">
    824845    <cvs command="checkout -P" package="indexers" dest="${src.packages.home}"/>
    825846  </target>
    826847 
    827   <target name="prepare-indexers" depends="init" unless="indexers.present">
     848  <target name="prepare-indexers" depends="init" if="independent-indexers" unless="indexers.present">
    828849    <antcall target="checkout-indexers"/>
    829850  </target>
     
    836857  </target>
    837858 
    838   <target name="configure-packages" description="Configure only the packages.">
     859  <target name="configure-packages" depends="init,configure-javagdbm,configure-indexers"
     860    description="Configure only the packages."/>
     861 
     862  <target name="configure-javagdbm">
    839863    <echo>
    840864      Configuring JavaGDBM
     
    852876    </exec>   
    853877   
     878  </target>
     879  <target name="configure-indexers" depends="init" if="independent-indexers">
    854880    <echo>
    855881      Configuring Indexers
     
    912938   
    913939    <!-- Indexers -->
     940    <!-- this may be in gs2build - we will be recompiling, but never mind -->
    914941    <exec executable="make" os="${os.unix}"
    915942      dir="${indexers.home}">
     
    919946      <arg value="install"/>
    920947    </exec>
    921     <!-- install the jar files -->
     948    <!-- install the jar and jni files -->
    922949    <copy file="${mg.home}/mg.jar" todir="${lib.jni}"/>
     950    <copy file="${mg.home}/jni/libmgjni.so" todir="${lib.jni}"/>
     951    <copy file="${mg.home}/jni/libmgpassjni.so" todir="${lib.jni}"/>
    923952    <copy file="${mgpp.home}/mgpp.jar" todir="${lib.jni}"/>
     953    <copy file="${mgpp.home}/jni/libmgppjni.so" todir="${lib.jni}"/>
     954    <copy file="${mgpp.home}/jni/libmgpppassjni.so" todir="${lib.jni}"/>
    924955    <copy file="${lucene.home}/LuceneWrapper.jar" todir="${web.lib}"/>
    925 
     956   
    926957    <!-- TODO windows -->
    927958  </target>
Note: See TracChangeset for help on using the changeset viewer.