Changeset 22976

Timestamp:

2010-09-28T10:24:24+13:00 (14 years ago)

Author:

davidb

Message:

Adjustment to arguments inside targets relating to building Greenstone without JNI support, i.e. for a 100% Java runtime

File:

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

main/trunk/greenstone3/build.xml

@@ -317 +317 @@
   </condition>
   <condition property="gs2.windows.enablejni" value="1" else="0">
+    <istrue value="${with.jni}"/>
+  </condition>
+  <condition property="gs2.windows.enablemg" value="1" else="0">
+    <istrue value="${with.jni}"/>
+  </condition>
+  <condition property="gs2.windows.enablemgpp" value="1" else="0">
+    <istrue value="${with.jni}"/>
+  </condition>
+  <!-- Should accent folding not also be set here ?? -->
+  <condition property="gs2.windows.usegdbm" value="1" else="0">
+    <istrue value="${with.jni}"/>
+  </condition>
+  <condition property="gs2.windows.usesqlite" value="1" else="0">
     <istrue value="${with.jni}"/>
   </condition>
@@ -1423 +1436 @@
   </target>
   
-  <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" depends="init" if="with.jni">
+    <antcall target="install-jni-files-linux"/>
+    <antcall target="install-jni-files-windows"/>
+    <antcall target="install-jni-files-macos"/>
+  </target>
 
   <target name="install-jni-files-linux" depends="init" if="current.os.isunixnotmac">
@@ -1532 +1549 @@
       <arg value="GSDLHOME=${gs2build.home}"/>
       <arg value="ENABLE_JNI=${gs2.windows.enablejni}"/>
-      <arg value="USE_SQLITE=0"/> <!-- Why is this not on by default? -->
+      <arg value="ENABLE_MG=${gs2.windows.enablemg}"/>
+      <arg value="ENABLE_MGPP=${gs2.windows.enablemgpp}"/>
+      <arg value="USE_GDBM=${gs2.windows.usegdbm}"/>
+      <arg value="USE_SQLITE=${gs2.windows.usesqlite}"/>
     </exec>
   </target>