Ignore:
Timestamp:
2007-01-25T12:05:34+13:00 (17 years ago)
Author:
kjdon
Message:

made the installing jni files bit platform specific

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/gsdl3/build.xml

    r13786 r13790  
    242242  <target name="test-setup">
    243243    <echo>ant java version=${ant.java.version}</echo>
    244     <echo>is linux : ${current.os.isunix}</echo>
     244    <echo>is unix : ${current.os.isunix}</echo>
    245245    <echo>is mac : ${current.os.ismac}</echo>
    246246    <echo>is unixnotmac : ${current.os.isunixnotmac}</echo>
     
    948948    <!-- install the jar and jni files -->
    949949    <copy file="${mg.home}/mg.jar" todir="${lib.jni}"/>
     950    <copy file="${mgpp.home}/mgpp.jar" todir="${lib.jni}"/>
     951    <copy file="${lucene.home}/LuceneWrapper.jar" todir="${web.lib}"/>
     952    <antcall target="install-jni-files"/>
     953    <!-- TODO windows -->
     954  </target>
     955
     956  <target name="install-jni-files" depends="init,install-jni-files-linux,install-jni-files-windows,install-jni-files-macos"/>
     957
     958  <target name="install-jni-files-linux" depends="init" if="current.os.isunixnotmac">
    950959    <copy file="${mg.home}/jni/libmgjni.so" todir="${lib.jni}"/>
    951960    <copy file="${mg.home}/jni/libmgpassjni.so" todir="${lib.jni}"/>
    952     <copy file="${mgpp.home}/mgpp.jar" todir="${lib.jni}"/>
    953961    <copy file="${mgpp.home}/jni/libmgppjni.so" todir="${lib.jni}"/>
    954962    <copy file="${mgpp.home}/jni/libmgpppassjni.so" todir="${lib.jni}"/>
    955     <copy file="${lucene.home}/LuceneWrapper.jar" todir="${web.lib}"/>
    956    
    957     <!-- TODO windows -->
    958   </target>
    959 
     963  </target>
     964  <target name="install-jni-files-windows" depends="init" if="current.os.iswindows">
     965    <copy file="${mg.home}/jni/mgjni.dll" todir="${lib.jni}"/>
     966    <copy file="${mg.home}/jni/mgpassjni.dll" todir="${lib.jni}"/>
     967    <copy file="${mgpp.home}/jni/mgppjni.dll" todir="${lib.jni}"/>
     968    <copy file="${mgpp.home}/jni/mgpppassjni.dll" todir="${lib.jni}"/>
     969  </target>
     970  <target name="install-jni-files-macos" depends="init" if="current.os.ismac">
     971    <copy file="${mg.home}/jni/libmgjni.jnilib" todir="${lib.jni}"/>
     972    <copy file="${mg.home}/jni/libmgpassjni.jnilib" todir="${lib.jni}"/>
     973    <copy file="${mgpp.home}/jni/libmgppjni.jnilib" todir="${lib.jni}"/>
     974    <copy file="${mgpp.home}/jni/libmgpppassjni.jnilib" todir="${lib.jni}"/>
     975  </target>
     976 
    960977  <target name="compile-packages-old"
    961978    description="Compile only the packages">
Note: See TracChangeset for help on using the changeset viewer.