Changeset 30259 for gs2-extensions/tdb/trunk/build.xml

Timestamp:

2015-09-21T12:45:15+12:00 (9 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

File:

• gs2-extensions/tdb/trunk/build.xml (modified) (3 diffs)

gs2-extensions/tdb/trunk/build.xml

@@ -3 +3 @@
   <property environment="env"/>
   <!-- Eventually install.lib needs to be OS aware -->
+  <property name="gsdl3home" value="${env.GSDL3SRCHOME}" />
   <property name="installdir" value="${basedir}/linux"/>
   <property name="install.lib" value="${basedir}/linux/lib"/>
-  <property name="lib.jni" value="${basedir}/../../lib/jni"/>
+  <property name="lib.jni" value="${gsdl3home}/lib/jni"/>
+
+  <target name="help">
+    <echo>Targets:</echo>
+    <echo />
+    <echo> help      - this message</echo>
+    <echo> compile   - configure and compile TDB libraries, binaries, and</echo>
+    <echo>             drivers</echo>
+    <echo> install   - add TDB support to Greenstone2/Greenstone3</echo>
+    <echo> uninstall - remove TDB support from Greenstone2/Greenstone3</echo>
+    <echo> clean     - uninstall and remove compiled libraries, binaries,</echo>
+    <echo>             and drivers</echo>
+    <echo />
+  </target>
 
   <target name="compile">
+    <echo message=" * Configure and compile TDB" />
     <exec executable="/bin/bash">
       <arg value="-c"/>
@@ -23 +38 @@
 
   <target name="install" depends="compile">
-    <echo>Install the TDBJava files into lib/jbi</echo>
+    <echo>Enable TDB support in Greenstone2 build library</echo>
+    <exec executable="/bin/bash">
+      <arg value="-c"/>
+      <arg value="source setup.bash ; ./enable_tdb.sh "/>
+    </exec>
+    <echo>Reconfigure, recompile, and reinstall Greenstone2 build library"</echo>
+    <subant>
+      <fileset dir="${gsdl3home}" includes="build.xml" />
+      <target name="configure-common-src" />
+      <target name="compile-common-src" />
+    </subant>
+    <echo>Install the TDBJava files into Greenstone3/lib/jni</echo>
     <copy file="${install.lib}/TDBJava.jar" todir="${lib.jni}"/>
     <copy file="${install.lib}/libTDBJava.so" todir="${lib.jni}"/>
@@ -30 +56 @@
 
   <target name="uninstall">
+    <echo>Remove TDB support in Greenstone2 build library</echo>
+    <exec executable="/bin/bash">
+      <arg value="-c"/>
+      <arg value="source setup.bash ; ./disable_tdb.sh "/>
+    </exec>
+    <echo>Reconfigure, recompile, and reinstall Greenstone2 build library"</echo>
+    <subant>
+      <fileset dir="${gsdl3home}" includes="build.xml" />
+      <target name="configure-common-src" />
+      <target name="compile-common-src" />
+    </subant>
+    <echo>Remove the TDBJava files from Greenstone3/lib/jni</echo>
     <delete file="${lib.jni}/TDBJava.jar" />
     <delete file="${lib.jni}/libTDBJava.so" />