Changeset 30276

Timestamp:

2015-09-28T11:12:29+13:00 (9 years ago)

Author:

jmt12

Message:

Lots of work to get this working properly in GS3. Includes generating java classes, manifest, and jar for TDBJava and then placing it in a different folder (web/WEB-INF/lib) than gdbmjava.jar (lib/jni). Broke a bunch of larger targets into several steps - especially where one step is expensive

File:

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

gs2-extensions/tdb/trunk/build.xml

@@ -4 +4 @@
   <!-- Eventually install.lib needs to be OS aware -->
   <property name="gsdl3home" value="${env.GSDL3SRCHOME}" />
+  <property name="classdir" value="${basedir}/build/classes"/>
   <property name="installdir" value="${basedir}/linux"/>
   <property name="install.lib" value="${basedir}/linux/lib"/>
-  <property name="lib.jni" value="${gsdl3home}/lib/jni"/>
+  <property name="jni.lib" value="${gsdl3home}/lib/jni"/>
+  <property name="web.lib" value="${gsdl3home}/web/WEB-INF/lib"/>
 
+  <path id="gsdl3jars">
+    <fileset dir="${web.lib}" includes="**/*.jar" />
+  </path>
+  
   <target name="help">
     <echo>Targets:</echo>
@@ -15 +21 @@
     <echo>             drivers</echo>
     <echo> install   - add TDB support to Greenstone2/Greenstone3</echo>
+    <echo> install-tdbjava - install just the TBDJava support into Greenstone3</echo>
     <echo> uninstall - remove TDB support from Greenstone2/Greenstone3</echo>
     <echo> clean     - uninstall and remove compiled libraries, binaries,</echo>
@@ -27 +34 @@
       <arg value="source setup.bash ; ./CASCADE-MAKE.sh"/>
     </exec>
+    <!-- Compile TDBJava within Ant -->
+    <mkdir dir="${classdir}" />
+    <javac srcdir="src/java" destdir="${classdir}" classpathref="gsdl3jars"
+       includeantruntime="false" />
+    <jar destfile="${install.lib}/TDBJava.jar" basedir="${classdir}">
+      <manifest>
+    <attribute name="Class-Path" value="gsdl3.jar log4j-1.2.8.jar" />
+      </manifest>
+    </jar>
   </target>
 
@@ -37 +53 @@
   </target>
 
-  <target name="install" depends="compile">
+  <target name="install-tdbjava">
+    <echo>Install the TDBJava files into ${jni.lib}</echo>
+    <copy file="${install.lib}/TDBJava.jar" todir="${web.lib}"/>
+    <copy file="${install.lib}/libTDBJava.so" todir="${jni.lib}"/>
+    <copy file="${install.lib}/libtdb.so" todir="${jni.lib}"/>
+  </target>
+
+  <target name="install" depends="compile,install-tdbjava">
     <echo>Enable TDB support in Greenstone2 build library</echo>
     <exec executable="/bin/bash">
@@ -49 +72 @@
       <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}"/>
-    <copy file="${install.lib}/libtdb.so" todir="${lib.jni}"/>
   </target>