Changeset 14484

Show
Ignore:
Timestamp:
06.09.2007 11:47:06 (12 years ago)
Author:
xiao
Message:

modified the target install-jni-files to copy separate libraries eg, libmgsearchjni.so and libmgretrieve.so into lib.jni.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • greenstone3/trunk/build.xml

    r14418 r14484  
    801801      <fileset dir="${build.home}"> 
    802802    <include name="org/greenstone/gsdl3/**"/> 
     803        <include name="org/flax/**"/> 
    803804    <exclude name="**/Test.class"/> 
    804805      </fileset> 
     
    991992  <target name="install-jni-files" depends="init,install-jni-files-linux,install-jni-files-windows,install-jni-files-macos"/> 
    992993 
    993   <target name="install-jni-files-linux" depends="init" if="current.os.isunixnotmac"> 
    994     <copy file="${mg.home}/jni/libmgjni.so" todir="${lib.jni}"/> 
    995     <copy file="${mg.home}/jni/libmgpassjni.so" todir="${lib.jni}"/> 
    996     <copy file="${mgpp.home}/jni/libmgppjni.so" todir="${lib.jni}"/> 
    997     <copy file="${mgpp.home}/jni/libmgpppassjni.so" todir="${lib.jni}"/> 
    998   </target> 
    999   <target name="install-jni-files-windows" depends="init" if="current.os.iswindows"> 
    1000     <copy file="${mg.home}/jni/mgjni.dll" todir="${lib.jni}"/> 
    1001     <copy file="${mg.home}/jni/mgpassjni.dll" todir="${lib.jni}"/> 
    1002     <copy file="${mgpp.home}/jni/mgppjni.dll" todir="${lib.jni}"/> 
    1003     <copy file="${mgpp.home}/jni/mgpppassjni.dll" todir="${lib.jni}"/> 
    1004   </target> 
    1005   <target name="install-jni-files-macos" depends="init" if="current.os.ismac"> 
    1006     <copy file="${mg.home}/jni/libmgjni.jnilib" todir="${lib.jni}"/> 
    1007     <copy file="${mg.home}/jni/libmgpassjni.jnilib" todir="${lib.jni}"/> 
    1008     <copy file="${mgpp.home}/jni/libmgppjni.jnilib" todir="${lib.jni}"/> 
    1009     <copy file="${mgpp.home}/jni/libmgpppassjni.jnilib" todir="${lib.jni}"/> 
    1010   </target> 
     994    <target name="install-jni-files-linux" depends="init" if="current.os.isunixnotmac"> 
     995    <copy file="${mg.home}/jni/libmgretrievejni.so" todir="${lib.jni}"/> 
     996    <copy file="${mg.home}/jni/libmgsearchjni.so" todir="${lib.jni}"/> 
     997     <copy file="${mg.home}/jni/libmgpassjni.so" todir="${lib.jni}"/> 
     998    <copy file="${mgpp.home}/jni/libmgppretrievejni.so" todir="${lib.jni}"/> 
     999    <copy file="${mgpp.home}/jni/libmgppsearchjni.so" todir="${lib.jni}"/> 
     1000     <copy file="${mgpp.home}/jni/libmgpppassjni.so" todir="${lib.jni}"/> 
     1001   </target> 
     1002   <target name="install-jni-files-windows" depends="init" if="current.os.iswindows"> 
     1003    <copy file="${mg.home}/jni/mgretrievejni.dll" todir="${lib.jni}"/> 
     1004    <copy file="${mg.home}/jni/mgsearchjni.dll" todir="${lib.jni}"/> 
     1005     <copy file="${mg.home}/jni/mgpassjni.dll" todir="${lib.jni}"/> 
     1006    <copy file="${mg.home}/jni/mgppretrievejni.dll" todir="${lib.jni}"/> 
     1007    <copy file="${mg.home}/jni/mgppsearchjni.dll" todir="${lib.jni}"/> 
     1008     <copy file="${mgpp.home}/jni/mgpppassjni.dll" todir="${lib.jni}"/> 
     1009   </target> 
     1010   <target name="install-jni-files-macos" depends="init" if="current.os.ismac"> 
     1011    <copy file="${mg.home}/jni/libmgretrievejni.jnilib" todir="${lib.jni}"/> 
     1012    <copy file="${mg.home}/jni/libmgsearchjni.jnilib" todir="${lib.jni}"/> 
     1013     <copy file="${mg.home}/jni/libmgpassjni.jnilib" todir="${lib.jni}"/> 
     1014    <copy file="${mg.home}/jni/libmgppretrievejni.jnilib" todir="${lib.jni}"/> 
     1015    <copy file="${mg.home}/jni/libmgppsearchjni.jnilib" todir="${lib.jni}"/> 
     1016     <copy file="${mgpp.home}/jni/libmgpppassjni.jnilib" todir="${lib.jni}"/> 
     1017   </target> 
    10111018  
    10121019  <!-- ================== gs2building targets ===============-->