Changeset 9712


Ignore:
Timestamp:
2005-04-18T15:50:31+12:00 (19 years ago)
Author:
kjdon
Message:

removed some of the mg and mgpp code - now do all of them through the makefiles

File:
1 edited

Legend:

Unmodified
Added
Removed

  • branches/ant-install-branch/gsdl3/build.xml

    r9711 r9712  
    795795    description="Update only the packages"/>
    796796
    797   <target name="cvsupdate-packages">
     797  <target name="cvsupdate-packages"> 
    798798    <cvs command="update -dP" dest="${packages.home}"/>
    799799  </target>
    … …  
    803803      Configuring MG
    804804    </echo>
    805     <exec executable="configure" os="Linux"
     805    <exec executable="configure" os="${os.linux}"
    806806      dir="${mg.home}">
    807807      <arg value="--prefix=${basedir}"/>
    … …  
    810810      Configuring MGPP
    811811    </echo>
    812     <exec executable="configure" os="Linux"
     812    <exec executable="configure" os="${os.linux}"
    813813      dir="${mgpp.home}">
    814814      <arg value="--prefix=${basedir}"/>
    … …  
    818818  <target name="clean-packages"
    819819    description="Clean only the packages">
    820     <!-- mg -->
    821     <exec executable="make" os="Linux"
     820    <!-- mg : just call the make target -->
     821    <exec executable="make" os="${os.linux}"
    822822      dir="${mg.home}">
    823823      <arg value="clean"/>
    824824    </exec>
    825     <delete dir="${mg.home}/java/classes"/>
    826     <delete file="${mg.home}/java/mg.jar"/>
    827     <delete file="${mg.home}/jni/org_greenstone_mg_MGWrapper.h"/>
    828     <delete file="${mg.home}/jni/org_greenstone_mg_MGPassesWrapper.h"/>
    829825    <!-- mgpp -->
    830     <exec executable="make" os="Linux"
     826    <exec executable="make" os="${os.linux}"
    831827      dir="${mg.home}">
    832828      <arg value="clean"/>
    833829    </exec>
    834     <delete dir="${mgpp.home}/java/classes"/>
    835     <delete file="${mgpp.home}/java/mgpp.jar"/>
    836     <delete file="${mgpp.home}/jni/org_greenstone_mgpp_MGPPWrapper.h"/>
    837     <delete file="${mgpp.home}/jni/org_greenstone_mgpp_MGPPPassesWrapper.h"/>
    838830    <!-- vishnu : just call the ant target -->
    839831    <ant antfile="${vishnu.home}/build.xml" dir="${vishnu.home}"
    … …  
    849841    <!-- mg -->
    850842    <echo>Compiling MG</echo>
    851     <!-- c code -->
    852     <!-- javacode -->
    853     <mkdir dir="${mg.home}/java/classes"/>
    854     <javac srcdir="${mg.home}/java"
    855       destdir="${mg.home}/java/classes"
    856       debug="${compile.debug}"
    857       deprecation="${compile.deprecation}"
    858       optimize="${compile.optimize}">
    859     </javac>
    860     <javah classpath="${mg.home}/java/classes"
    861       destdir="${mg.home}/jni">
    862       <class name="org.greenstone.mg.MGWrapper"/>
    863       <class name="org.greenstone.mg.MGPassesWrapper"/>
    864     </javah>
    865     <jar destfile="${mg.home}/java/mg.jar">
    866       <fileset dir="${mg.home}/java/classes"/>
    867       <manifest>
    868     <attribute name="Built-By" value="${user.name}" />
    869       </manifest>
    870     </jar>
    871843    <!-- make the c code -->
    872     <exec executable="make" os="Linux"
     844    <exec executable="make" os="${os.linux}"
    873845       dir="${mg.home}">
    874846    </exec>
    875     <exec executable="make" os="Linux"
     847    <exec executable="make" os="${os.linux}"
    876848      dir="${mg.home}">
    877849      <arg value="install"/>
    … …  
    880852    <!-- mgpp -->
    881853    <echo>Compiling MGPP</echo>
    882     <!-- javacode -->
    883     <mkdir dir="${mgpp.home}/java/classes"/>
    884     <javac srcdir="${mgpp.home}/java"
    885       destdir="${mgpp.home}/java/classes"
    886       debug="${compile.debug}"
    887       deprecation="${compile.deprecation}"
    888       optimize="${compile.optimize}">
    889     </javac>
    890     <javah classpath="${mgpp.home}/java/classes"
    891       destdir="${mgpp.home}/jni">
    892       <class name="org.greenstone.mgpp.MGPPWrapper"/>
    893       <class name="org.greenstone.mgpp.MGPPPassesWrapper"/>
    894     </javah>
    895     <jar destfile="${mgpp.home}/java/mgpp.jar">
    896       <fileset dir="${mgpp.home}/java/classes"/>
    897       <manifest>
    898     <attribute name="Built-By" value="${user.name}" />
    899       </manifest>
    900     </jar>
    901     <!-- c++ code -->
    902     <exec executable="make" os="Linux"
     854    <exec executable="make" os="${os.linux}"
    903855       dir="${mgpp.home}">
    904856    </exec>
    905     <exec executable="make" os="Linux"
     857    <exec executable="make" os="${os.linux}"
    906858      dir="${mgpp.home}">
    907859      <arg value="install"/>
Note: See TracChangeset for help on using the changeset viewer.