Changeset 13790

Timestamp:

2007-01-25T12:05:34+13:00 (17 years ago)

Author:

kjdon

Message:

made the installing jni files bit platform specific

File:

• trunk/gsdl3/build.xml (modified) (2 diffs)

trunk/gsdl3/build.xml

@@ -242 +242 @@
   <target name="test-setup">
     <echo>ant java version=${ant.java.version}</echo>
-    <echo>is linux : ${current.os.isunix}</echo>
+    <echo>is unix : ${current.os.isunix}</echo>
     <echo>is mac : ${current.os.ismac}</echo>
     <echo>is unixnotmac : ${current.os.isunixnotmac}</echo>
@@ -948 +948 @@
     <!-- install the jar and jni files -->
     <copy file="${mg.home}/mg.jar" todir="${lib.jni}"/>
+    <copy file="${mgpp.home}/mgpp.jar" todir="${lib.jni}"/>
+    <copy file="${lucene.home}/LuceneWrapper.jar" todir="${web.lib}"/>
+    <antcall target="install-jni-files"/>
+    <!-- TODO windows -->
+  </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-linux" depends="init" if="current.os.isunixnotmac">
     <copy file="${mg.home}/jni/libmgjni.so" todir="${lib.jni}"/>
     <copy file="${mg.home}/jni/libmgpassjni.so" todir="${lib.jni}"/>
-    <copy file="${mgpp.home}/mgpp.jar" todir="${lib.jni}"/>
     <copy file="${mgpp.home}/jni/libmgppjni.so" todir="${lib.jni}"/>
     <copy file="${mgpp.home}/jni/libmgpppassjni.so" todir="${lib.jni}"/>
-    <copy file="${lucene.home}/LuceneWrapper.jar" todir="${web.lib}"/>
-    
-    <!-- TODO windows -->
-  </target>
-
+  </target>
+  <target name="install-jni-files-windows" depends="init" if="current.os.iswindows">
+    <copy file="${mg.home}/jni/mgjni.dll" todir="${lib.jni}"/>
+    <copy file="${mg.home}/jni/mgpassjni.dll" todir="${lib.jni}"/>
+    <copy file="${mgpp.home}/jni/mgppjni.dll" todir="${lib.jni}"/>
+    <copy file="${mgpp.home}/jni/mgpppassjni.dll" todir="${lib.jni}"/>
+  </target>
+  <target name="install-jni-files-macos" depends="init" if="current.os.ismac">
+    <copy file="${mg.home}/jni/libmgjni.jnilib" todir="${lib.jni}"/>
+    <copy file="${mg.home}/jni/libmgpassjni.jnilib" todir="${lib.jni}"/>
+    <copy file="${mgpp.home}/jni/libmgppjni.jnilib" todir="${lib.jni}"/>
+    <copy file="${mgpp.home}/jni/libmgpppassjni.jnilib" todir="${lib.jni}"/>
+  </target>
+  
   <target name="compile-packages-old"
     description="Compile only the packages">