Show
Ignore:
Timestamp:
06.07.2009 15:50:30 (10 years ago)
Author:
ak19
Message:

Update to targets that do clean and distclean of build-src and common-src on Windows: need to pass in gsdlhome. And distclean on Windows just does clean.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • greenstone3/trunk/build.xml

    r19948 r19960  
    6060   
    6161  <!--the first three properties have to be put on the top to be used by build.properties--> 
    62   <property name="gs2build.home" value="${basedir}/gs2build"/> 
     62  <property name="gs2build.home" value="${basedir}${file.separator}gs2build"/> 
    6363  <property name="src.packages.home" value="${basedir}/src/packages"/> 
    6464  <property name="flax.svn.root" value="http://svn.greenstone.org/flax"/> 
     
    12451245      <arg value="win32.mak"/> 
    12461246      <arg value="clean"/> 
     1247      <arg value="GSDLHOME=${gs2build.home}"/> 
    12471248    </exec> 
    12481249  </target> 
    12491250  <target name="distclean-common-src" depends="init"> 
     1251    <!-- unix:  --> 
    12501252    <exec executable="make" os="${os.unix}" dir="${common.src.home}" failonerror="true"> 
    12511253      <arg value="distclean"/> 
     1254    </exec> 
     1255    <!-- windows: distclean = clean + remove configure products (remove makefiles). But on Windows there is no removing makefiles, so we just call clean -->     
     1256    <exec executable="nmake" dir="${common.src.home}" os="${os.windows}" failonerror="true"> 
     1257      <arg value="/f"/> 
     1258      <arg value="win32.mak"/> 
     1259      <arg value="clean"/> 
     1260      <arg value="GSDLHOME=${gs2build.home}"/> 
    12521261    </exec> 
    12531262  </target> 
     
    14731482      <arg value="win32.mak"/> 
    14741483      <arg value="clean"/> 
     1484      <arg value="GSDLHOME=${gs2build.home}"/> 
    14751485    </exec> 
    14761486  </target> 
     
    14781488   
    14791489  <target name="distclean-build-src" depends="init,clean-build-src" if="collection.building.enabled"> 
     1490    <!-- unix:  --> 
    14801491    <exec executable="make" os="${os.unix}" dir="${build.src.home}" failonerror="true"> 
    14811492      <arg value="distclean"/> 
     1493    </exec> 
     1494    <!-- windows: distclean = clean + remove configure products (remove makefiles). But on Windows there is no removing makefiles, so we just call clean -->     
     1495    <exec executable="nmake" dir="${build.src.home}" os="${os.windows}" failonerror="true"> 
     1496      <arg value="/f"/> 
     1497      <arg value="win32.mak"/> 
     1498      <arg value="clean"/> 
     1499      <arg value="GSDLHOME=${gs2build.home}"/> 
    14821500    </exec> 
    14831501  </target>