Changeset 30259 for gs2-extensions

Show
Ignore:
Timestamp:
21.09.2015 12:45:15 (4 years ago)
Author:
jmt12
Message:

Extending the install and uninstall targets to correctly call the respective enable/disable script and recompile the gs2build common-src library on change

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • gs2-extensions/tdb/trunk/build.xml

    r30246 r30259  
    33  <property environment="env"/> 
    44  <!-- Eventually install.lib needs to be OS aware --> 
     5  <property name="gsdl3home" value="${env.GSDL3SRCHOME}" /> 
    56  <property name="installdir" value="${basedir}/linux"/> 
    67  <property name="install.lib" value="${basedir}/linux/lib"/> 
    7   <property name="lib.jni" value="${basedir}/../../lib/jni"/> 
     8  <property name="lib.jni" value="${gsdl3home}/lib/jni"/> 
     9 
     10  <target name="help"> 
     11    <echo>Targets:</echo> 
     12    <echo /> 
     13    <echo> help      - this message</echo> 
     14    <echo> compile   - configure and compile TDB libraries, binaries, and</echo> 
     15    <echo>             drivers</echo> 
     16    <echo> install   - add TDB support to Greenstone2/Greenstone3</echo> 
     17    <echo> uninstall - remove TDB support from Greenstone2/Greenstone3</echo> 
     18    <echo> clean     - uninstall and remove compiled libraries, binaries,</echo> 
     19    <echo>             and drivers</echo> 
     20    <echo /> 
     21  </target> 
    822 
    923  <target name="compile"> 
     24    <echo message=" * Configure and compile TDB" /> 
    1025    <exec executable="/bin/bash"> 
    1126      <arg value="-c"/> 
     
    2338 
    2439  <target name="install" depends="compile"> 
    25     <echo>Install the TDBJava files into lib/jbi</echo> 
     40    <echo>Enable TDB support in Greenstone2 build library</echo> 
     41    <exec executable="/bin/bash"> 
     42      <arg value="-c"/> 
     43      <arg value="source setup.bash ; ./enable_tdb.sh "/> 
     44    </exec> 
     45    <echo>Reconfigure, recompile, and reinstall Greenstone2 build library"</echo> 
     46    <subant> 
     47      <fileset dir="${gsdl3home}" includes="build.xml" /> 
     48      <target name="configure-common-src" /> 
     49      <target name="compile-common-src" /> 
     50    </subant> 
     51    <echo>Install the TDBJava files into Greenstone3/lib/jni</echo> 
    2652    <copy file="${install.lib}/TDBJava.jar" todir="${lib.jni}"/> 
    2753    <copy file="${install.lib}/libTDBJava.so" todir="${lib.jni}"/> 
     
    3056 
    3157  <target name="uninstall"> 
     58    <echo>Remove TDB support in Greenstone2 build library</echo> 
     59    <exec executable="/bin/bash"> 
     60      <arg value="-c"/> 
     61      <arg value="source setup.bash ; ./disable_tdb.sh "/> 
     62    </exec> 
     63    <echo>Reconfigure, recompile, and reinstall Greenstone2 build library"</echo> 
     64    <subant> 
     65      <fileset dir="${gsdl3home}" includes="build.xml" /> 
     66      <target name="configure-common-src" /> 
     67      <target name="compile-common-src" /> 
     68    </subant> 
     69    <echo>Remove the TDBJava files from Greenstone3/lib/jni</echo> 
    3270    <delete file="${lib.jni}/TDBJava.jar" /> 
    3371    <delete file="${lib.jni}/libTDBJava.so" />