Changeset 13855


Ignore:
Timestamp:
2007-02-05T16:23:06+13:00 (17 years ago)
Author:
kjdon
Message:

removed some old windows-c++ stuff - if you want to compile on windows, you now need to have visual studio. main compile for windows does all the c++ stuff as well as java.

Location:
trunk/gsdl3
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/gsdl3/build.xml

    r13847 r13855  
    274274  <target name="clean" depends="init,clean-packages,clean-core,clean-gs2building"
    275275    description="Remove all old compiled code. Includes core, packages and gs2building if necessary"/>
    276   <target name="clean-windows-c++" depends="init,clean-windows-c++-gs2building,clean-windows-c++-packages"
    277     description="Remove C++ compiled code for Windows. Requires Microsoft Visual Studio"/>
    278276 
    279277  <target name="compile" depends="init,compile-web,compile-packages,compile-core,compile-gs2building"
    280278    description="Compile all the source code, includes core, packages and gs2building if necessary. Copy jar files and executables to their correct places."/>
    281  
    282   <target name="compile-windows-c++" depends="init,compile-windows-c++-gs2build,compile-windows-c++-packages"
    283     description="Compile the C/C++ code for Windows. Requires Microsoft Visual Studio"/>
    284  
     279   
    285280  <target name="update" depends="init,cvsupdate,clean,configure,configure-c++,compile"
    286281    description="Update (thru CVS) all the source (including core, packages and gs2building), then clean, configure and recompile."/>
    … …  
    939934    </exec>
    940935  </target>
     936 
    941937  <target name="clean-indexers" depends="init" if="independent-indexers">
    942938    <exec executable="make" os="${os.unix}"
    … …  
    944940      <arg value="clean"/>
    945941    </exec>
     942    <exec executable="${indexers.home}/winMake.bat" os="${os.windows}"
     943       dir="${indexers.home}">
     944       <arg value="clean"/>
     945    </exec>
     946
    946947  </target>
    947948   
    948   <target name="clean-windows-c++-packages" depends="init" if="current.os.iswindows"
    949     description="Clean only the C/C++ packages">
    950     <exec executable="${compile.windows.c++.setup}"/>
    951 <!--    <exec executable="${mg.home}/winMake.bat" dir="${mg.home}">
    952       <arg value="clean"/>
    953     </exec>
    954     <exec executable="${mgpp.home}/winMake.bat" dir="${mgpp.home}">
    955       <arg value="clean"/>
    956     </exec>-->
    957     <!-- Indexers -->
    958     <!-- TODO -->
    959   </target>   
    960 
    961949  <target name="compile-packages"
    962     description="Compile only the source packages">
    963 
    964    
     950    description="Compile only the source packages">   
    965951    <!-- javagdbm -->
    966952    <exec executable="make" os="${os.unix}"
    … …  
    993979       <arg value="all"/>
    994980    </exec>
     981    <exec executable="${indexers.home}/winMake.bat" os="${os.windows}"
     982       dir="${indexers.home}">
     983       <arg value="install"/>
     984    </exec>
    995985    <!-- install the jar and jni files -->
    996986    <copy file="${mg.home}/mg.jar" todir="${lib.jni}"/>
    … …  
    10201010    <copy file="${mgpp.home}/jni/libmgpppassjni.jnilib" todir="${lib.jni}"/>
    10211011  </target>
    1022 
    1023   <target name="compile-windows-c++-packages" depends="init" if="current.os.iswindows"
    1024     description="Compile only the C/C++ packages">
    1025     <!-- TODO -->
    1026     <exec executable="${compile.windows.c++.setup}"/>
    1027     <exec executable="${mg.home}/winMake.bat" dir="${mg.home}">
    1028       <env key="GSDL3HOME" value="${basedir}"/>
    1029     </exec>
    1030     <exec executable="${mg.home}/winMake.bat" dir="${mg.home}">
    1031       <arg value="install"/>
    1032       <env key="GSDL3HOME" value="${basedir}"/>
    1033     </exec>
    1034     <exec executable="${mgpp.home}/winMake.bat" dir="${mgpp.home}">
    1035       <env key="GSDL3HOME" value="${basedir}"/>
    1036     </exec>
    1037     <exec executable="${mgpp.home}/winMake.bat" dir="${mgpp.home}">
    1038       <arg value="install"/>
    1039       <env key="GSDL3HOME" value="${basedir}"/>
    1040     </exec>
    1041     <exec executable="${javagdbm.home}/winMake.bat" dir="${javagdbm.home}">
    1042       <env key="GSDL3HOME" value="${basedir}"/>
    1043     </exec>
    1044     <exec executable="${javagdbm.home}/winMake.bat" dir="${javagdbm.home}">
    1045       <arg value="install"/>
    1046       <env key="GSDL3HOME" value="${basedir}"/>
    1047     </exec>
    1048   </target>   
    1049  
     1012 
    10501013  <!-- ================== gs2building targets ===============-->
    10511014
    … …  
    11991162  </target>
    12001163 
    1201   <target name="clean-gs2build" depends="init,clean-windows-c++-gs2building" if="collection.building.enabled">
     1164  <target name="clean-gs2build" depends="init" if="collection.building.enabled">
    12021165    <!-- gs2build -->
    12031166    <!--linux:  -->
    … …  
    12061169    </exec>
    12071170    <!-- windows: -->   
    1208   </target>
    1209  
    1210   <target name="distclean-gs2build" depends="init" if="collection.building.enabled">
    1211     <!-- gs2build -->
    1212     <!--linux:  -->
    1213     <exec executable="make" os="${os.unix}" dir="${gs2build.home}">
    1214       <arg value="distclean"/>
    1215     </exec>
    1216     <!-- windows: -->   
    1217   </target>
    1218  
    1219   <target name="clean-windows-c++-gs2building" depends="init" if="collection.building.enabled.windows"
    1220     description="remove all object files and executables">
    12211171    <!-- run the setup script -->
    12221172    <exec executable="${compile.windows.c++.setup}"/>
    … …  
    12261176     <arg value="clean"/>
    12271177    </exec>
    1228   </target> 
    1229 
     1178  </target>
     1179 
     1180  <target name="distclean-gs2build" depends="init" if="collection.building.enabled">
     1181    <!-- gs2build -->
     1182    <!--linux:  -->
     1183    <exec executable="make" os="${os.unix}" dir="${gs2build.home}">
     1184      <arg value="distclean"/>
     1185    </exec>
     1186    <!-- windows: -->   
     1187  </target>
     1188 
    12301189  <target name="compile-gs2building" depends="init,compile-gs2build,compile-gli" if="collection.building.enabled"
    12311190    description="Compile only the Greenstone 2 building components">
    … …  
    12431202  </target>
    12441203 
    1245   <target name="compile-gs2build" depends="init,compile-windows-c++-gs2build" if="collection.building.enabled">
     1204  <target name="compile-gs2build" depends="init" if="collection.building.enabled">
    12461205    <!-- gs2build -->
    12471206    <!--linux: make, make install -->
    … …  
    12511210      <arg value="install"/>
    12521211    </exec>
    1253     <antcall target="install-macos-extra"/>
    1254   </target>
    1255  
    1256     <!-- windows: -->
    1257    <target name="compile-windows-c++-gs2build" depends="init" if="collection.building.enabled.windows"
    1258     description="Use this if you want to compile the C++ code for the gs2build package">
    12591212    <!-- run the setup script -->
    12601213    <exec executable="${compile.windows.c++.setup}"/>
    … …  
    12631216     <arg value="win32.mak"/>
    12641217    </exec>
    1265   </target>
     1218    <exec executable="nmake" dir="${gs2build.home}">
     1219     <arg value="/f"/>
     1220     <arg value="win32.mak"/>
     1221     <arg value="install"/>
     1222    </exec>
     1223    <antcall target="install-macos-extra"/>
     1224  </target>
     1225 
    12661226 
    12671227  <target name="gli" description="Run the Greenstone Librarian Interface" depends="init" if="collection.building.enabled">

  • trunk/gsdl3/dist-resources/dist-build.xml

    r13848 r13855  
    3030    <antcall target="get-windows-binaries"/>
    3131    <antcall target="rename-gs2build-files-windows"/>
    32     <antcall target="compile-windows-c++"/>
     32    <antcall target="compile-gs2build"/>
    3333    <antcall target="compile-packages"/>
    3434   </target>
Note: See TracChangeset for help on using the changeset viewer.