Changeset 22184 for main/trunk/greenstone3/build.xml

Timestamp:

2010-05-27T11:34:47+12:00 (14 years ago)

Author:

davidb

Message:

Some initial work on being able to support Greenstone 3 without using JNI

File:

• main/trunk/greenstone3/build.xml (modified) (14 diffs)

main/trunk/greenstone3/build.xml

@@ -218 +218 @@
   <condition property="static.arg" value="LDFLAGS=-static" else=" ">
     <isset property="compile.static"/>
+  </condition>
+
+  <condition property="gs2.opt.args" value= " " else="--disable-mg --disable-mgpp --disable-accentfold --disable-gdbm --disable-sqlite">
+    <istrue value="${with.jni}"/>
+  </condition>
+  <condition property="gs2.compile.target" value="with-jni" else="without-jni">
+    <istrue value="${with.jni}"/>
+  </condition>
+  <condition property="gs2.install.target" value="install-with-jni" else="install-without-jni">
+    <istrue value="${with.jni}"/>
+  </condition>
+  <condition property="gs2.windows.enablejni" value="1" else="0">
+    <istrue value="${with.jni}"/>
   </condition>
   
@@ -315 +328 @@
     <!-- mg and mgpp get installed into lib/jni but they may not be there yet
     so we add them in by name -->
+    <!-- *** is there any way to make this optional, based on ${with.jni}? -->
     <pathelement location="${lib.jni}/mg.jar"/>
     <pathelement location="${lib.jni}/mgpp.jar"/>
@@ -810 +824 @@
       <env key="CLASSPATH" path="${tomcat.classpath}"/>
       <env key="LD_LIBRARY_PATH" path="${env.LD_LIBRARY_PATH}:${lib.jni}"/>
-      <env key="DYLD_LIBRARY_PATH" path="${env.DYLD_LIBRARY_PATH}:${lib.jni}:${gdbm.home}/lib"/> <!-- for mac os --> <!-- need gdbm here??-->
+      <env key="DYLD_LIBRARY_PATH" path="${env.DYLD_LIBRARY_PATH}:${lib.jni}:${gdbm.home}/lib"/> <!-- for mac os --> <!-- need gdbm here these days ??-->
       <env key="WNHOME" path="${wn.home}"/>
     </exec>
@@ -1197 +1211 @@
     description="Configure only the packages."/>
   
-  <target name="configure-javagdbm">
+  <target name="configure-javagdbm" if="with.jni">
     <echo>
       Configuring JavaGDBM
@@ -1228 +1242 @@
   
   <target name="compile-packages" description="Compile only the source packages">
+    <!-- javagdbm -->
+    <antcall target="compile-javagdbm"/>
+    <!-- Search4j -->
+    <antcall target="compile-search4j"/>
+  </target>
+
+  <target name="compile-javagdbm" description="Compile JavaGDBM" if="with.jni">
     
     <!-- unix: -->
@@ -1246 +1267 @@
     <echo>Install the javagdbm jar file</echo>
     <copy file="${javagdbm.home}/javagdbm.jar" todir="${lib.jni}"/>
-
-
-    <!-- Search4j -->
-    <antcall target="compile-search4j"/>
   </target>
 
@@ -1288 +1305 @@
 
   <target name="install-auxiliary-jar-files" depends="init">
-    <copy file="${mg.home}/mg.jar" todir="${lib.jni}"/>
-    <copy file="${mgpp.home}/mgpp.jar" todir="${lib.jni}"/>
+
+    <if>
+      <bool><available file="${mg.home}/mg.jar"/></bool>
+      <copy file="${mg.home}/mg.jar" todir="${lib.jni}"/>
+    </if>
+
+    <if>
+      <bool><available file="${mgpp.home}/mg.jar"/></bool>
+      <copy file="${mgpp.home}/mgpp.jar" todir="${lib.jni}"/>
+    </if>
+
     <copy file="${lucene.home}/LuceneWrapper.jar" todir="${web.lib}"/>    
   </target>
   
-  <target name="install-jni-files" depends="init,install-jni-files-linux,install-jni-files-windows,install-jni-files-macos"/>
+  <target name="install-jni-files" depends="init,install-jni-files-linux,install-jni-files-windows,install-jni-files-macos" if="with.jni"/>
 
   <target name="install-jni-files-linux" depends="init" if="current.os.isunixnotmac">
@@ -1355 +1381 @@
       <arg value="--prefix=${gs2build.home}"/> <!-- what value to use?? -->
       <arg value="--bindir=${gs2build.home}/bin/${os.bin.dir}"/> <!-- what value to use?? -->
-      <arg value="--enable-jni"/>
+      <arg line="${gs2.opt.args}"/>
       <arg line="${static.arg}"/>
     </exec>
@@ -1389 +1415 @@
     <!-- unix: -->
     <exec executable="make" os="${os.unix}" dir="${common.src.home}" failonerror="true">
-      <arg value="with-jni"/>
+      <arg value="${gs2.compile.target}"/>
     </exec>
     <!-- windows: -->
@@ -1396 +1422 @@
       <arg value="win32.mak"/>
       <arg value="GSDLHOME=${gs2build.home}"/>
-      <arg value="ENABLE_JNI=1"/>
-      <arg value="USE_SQLITE=0"/>
+      <arg value="ENABLE_JNI=${gs2.windows.enablejni}"/>
+      <arg value="USE_SQLITE=0"/> <!-- Why is this not on by default? -->
     </exec>
   </target>
@@ -1431 +1457 @@
     <!-- unix: -->
     <exec executable="make" os="${os.unix}" dir="${common.src.home}" failonerror="true">
-      <arg value="install-with-jni"/>
+      <arg value="${gs2.install.target}"/>
     </exec>
       
@@ -1439 +1465 @@
       <arg value="win32.mak"/>
       <arg value="install"/>
-      <arg value="ENABLE_JNI=1"/>
-      <arg value="USE_SQLITE=0"/>
+      <arg value="ENABLE_JNI=${gs2.windows.enablejni}"/>
+      <arg value="USE_SQLITE=0"/> <!-- why is this not on by default? -->
     </exec>
 
@@ -1672 +1698 @@
       dir="${build.src.home}" failonerror="true">
       <arg value="--prefix=${gs2build.home}"/>
+      <arg line="${gs2.opt.args}"/>
       <arg line="${static.arg}"/>
     </exec>
@@ -1882 +1909 @@
     
 </project>
+