Show
Ignore:
Timestamp:
29.06.2009 15:57:11 (10 years ago)
Author:
kjdon
Message:

removed commented stuff from dist-tidy. changed the gs2build targets to build-src targets - no longer do top level clean, as we never did a top level configure so don't have the Makefiles.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • greenstone3/trunk/build.xml

    r19946 r19948  
    12811281  </target> 
    12821282 
    1283   <target name="clean-collection-building" depends="init,clean-gli,clean-gs2build"  
     1283  <target name="clean-collection-building" depends="init,clean-gli,clean-build-src"  
    12841284    description="Clean only the collection building components"  
    12851285    if="collection.building.enabled"/> 
    12861286 
    1287   <target name="distclean-collection-building" depends="init,clean-gli,clean-gs2build,distclean-gs2build"  
     1287  <target name="distclean-collection-building" depends="init,clean-build-src,distclean-build-src"  
    12881288    description="Distclean only the collection building components"  
    12891289    if="collection.building.enabled"/> 
     
    14631463   
    14641464  
    1465   <target name="clean-gs2build" depends="init" if="collection.building.enabled"> 
     1465  <target name="clean-build-src" depends="init" if="collection.building.enabled"> 
    14661466    <!-- unix:  --> 
    1467     <exec executable="make" os="${os.unix}" dir="${gs2build.home}" failonerror="true"> 
     1467    <exec executable="make" os="${os.unix}" dir="${build.src.home}" failonerror="true"> 
    14681468      <arg value="clean"/> 
    14691469    </exec> 
    14701470    <!-- windows: -->     
    1471     <exec executable="nmake" dir="${gs2build.home}" os="${os.windows}" failonerror="true"> 
     1471    <exec executable="nmake" dir="${build.src.home}" os="${os.windows}" failonerror="true"> 
    14721472      <arg value="/f"/> 
    14731473      <arg value="win32.mak"/> 
     
    14761476  </target> 
    14771477   
    1478  
    1479   <target name="distclean-gs2build" depends="init,clean-gs2build" if="collection.building.enabled"> 
    1480     <exec executable="make" os="${os.unix}" dir="${gs2build.home}" failonerror="true"> 
     1478   
     1479  <target name="distclean-build-src" depends="init,clean-build-src" if="collection.building.enabled"> 
     1480    <exec executable="make" os="${os.unix}" dir="${build.src.home}" failonerror="true"> 
    14811481      <arg value="distclean"/> 
    14821482    </exec> 
     
    16321632    <delete file="README-SVN.txt"/> 
    16331633 
    1634     <!-- delete some source files --> 
    1635 <!--    <delete dir="${gs2build.home}/source/src"/> 
    1636     <delete dir="${gs2build.home}/source/lib"/> 
    1637     <delete dir="${gs2build.home}/source/packages"/> 
    1638     <delete dir="${gs2build.home}/source/indexers"/>--> 
    1639  
    16401634    <delete dir="${basedir}/build"/> 
    1641     <delete dir="${basedir}/winutil"/> 
    16421635    <delete dir="${basedir}/dist-resources"/> 
    1643  <!--   <delete dir="${basedir}/gs2build/source"/>--> 
    1644  
    1645 <!--    <delete file="${basedir}/gs2build/WIN32cfg.h"/> 
    1646     <delete file="${basedir}/gs2build/win32.mak"/>--> 
    1647     <!-- add in linux configure/,make --> 
    16481636 
    16491637    <!-- create empty directories -->