Changeset 18227

Show
Ignore:
Timestamp:
17.12.2008 14:58:01 (10 years ago)
Author:
oranfry
Message:

don't version build.properties any more, instead version build.properties.in and use it to create build.properties on the users computer as needed. This makes it harder to accidentally check in a personalised copy of build.properties into the repository and makes 'svn st' easier to read

Location:
greenstone3/trunk
Files:
1 added
1 modified

Legend:

Unmodified
Added
Removed
  • greenstone3/trunk/build.xml

    r18184 r18227  
    4848 
    4949  --> 
     50 
     51  <!-- create build.properties if it has not been created yet --> 
     52  <if> 
     53    <bool><not><available file="build.properties"/></not></bool> 
     54    <copy file="build.properties.in" tofile="build.properties"/> 
     55  </if> 
     56 
    5057   
    5158  <!--the first three properties have to be put on the top to be used by build.properties--> 
     
    12531260  <target name="compile-search4j"> 
    12541261 
    1255     <!-- windows --> 
     1262  <!-- windows --> 
    12561263    <exec executable="${src.packages.home}/search4j/compile.bat" os="${os.windows}" dir="${src.packages.home}/search4j"/> 
    12571264 
    1258     <!-- unix --> 
     1265  <!-- unix --> 
    12591266    <exec executable="${src.packages.home}/search4j/configure" os="${os.unix}" dir="${src.packages.home}/search4j"><arg line="--bindir=${basedir}/bin"/></exec> 
    12601267    <exec executable="make" os="${os.unix}" dir="${src.packages.home}/search4j"/> 
    12611268 
    1262     <!-- install --> 
     1269  <!-- install --> 
    12631270    <copy todir="bin"><fileset dir="${src.packages.home}/search4j" includes="search4j,search4j.exe"/></copy> 
    12641271    <if><bool><istrue value="${current.os.isunix}"/></bool> 
     
    13831390      dest="${gs2build.home}/common-src/indexers/packages/windows/iconv"/> 
    13841391  </target> 
    1385      
     1392   
    13861393  <!-- downloads a good XML-Parser --> 
    13871394  <target name="get-macos-extra" depends="init" if="need.macos.extra"> 
     
    15291536    <!-- run the setup script --> 
    15301537    <!-- <exec executable="${compile.windows.c++.setup}" os="${os.windows}"/>--> 
    1531      <!--Above does not work: even though vcvars.bat executes, the env changes it makes don't get saved. Need user to run vcvars.bat first before calling ant-->  
    1532     <exec executable="nmake" dir="${gs2build.home}" os="${os.windows}"> 
     1538    <!--Above does not work: even though vcvars.bat executes, the env changes it makes don't get saved. Need user to run vcvars.bat first before calling ant-->  
     1539    <exec executable="nmake" dir="${gs2build.home}" os="${os.windows}"> 
    15331540      <arg value="/f"/> 
    15341541      <arg value="win32.mak"/>