Changeset 23847 for main/trunk/greenstone3

Timestamp:

2011-04-04T21:42:12+12:00 (13 years ago)

Author:

ak19

Message:

compile-javagdm target of build.xml now generates the necessary gdbmjava.dll in the lib/jni folder of GS3 toplevel.

File:

• main/trunk/greenstone3/build.xml (modified) (1 diff)

main/trunk/greenstone3/build.xml

@@ -1435 +1435 @@
     </exec>
 
-    <!-- windows: just the java stuff. -->
+    <!-- windows: just the java stuff. Calling without the "compile" argument first will run winMake.bat with "all" which will then perform both the compile AND link targets in jni/win32.mak (thereby also generating gdbmjava.dll). Then we run the same command with the "install" argument to copy the gdbmjava.dll into the correct location. -->
     <echo>Windows: compile javagdbm (java only)</echo>
+    <exec executable="${javagdbm.home}/winMake.bat" os="${os.windows}" dir="${javagdbm.home}" failonerror="true" />
     <exec executable="${javagdbm.home}/winMake.bat" os="${os.windows}" dir="${javagdbm.home}" failonerror="true">
-      <arg value="compile"/>
-      <arg value="javaonly"/>
+      <arg value="install"/>
     </exec>
 
     <!-- install the jar file -->
-    <echo>Install the javagdbm jar file</echo>
+    <echo>Install the javagdbm jar file ${javagdbm.home}/javagdbm.jar ${lib.jni}</echo>
     <copy file="${javagdbm.home}/javagdbm.jar" todir="${lib.jni}"/>
   </target>