Changeset 14580

Show
Ignore:
Timestamp:
26.09.2007 09:13:34 (12 years ago)
Author:
oranfry
Message:

have the script change the gli version number just before comiling

Location:
greenstone3/branches/3.03
Files:
3 modified

Legend:

Unmodified
Added
Removed
  • greenstone3/branches/3.03/build.xml

    r14574 r14580  
    10591059 
    10601060  <target name="checkout-gs2build" depends="init" if="collection.building.enabled" unless="nocvs.mode"> 
    1061 <!--  <target name="checkout-gs2build" depends="check-cvsroot,init" if="collection.building.enabled" unless="nocvs.mode"> --> 
    10621061    <echo>checking out gs2build</echo> 
    10631062        <!-- svn checkouts --> 
     
    13081307    <!-- gli --> 
    13091308    <property name="gli.home" value="${basedir}/gli"/> 
     1309 
     1310        <!-- change the version number --> 
     1311        <rsr file="${gli.home}/src/org/greenstone/gatherer/Gatherer.java" pattern="^(.*)String\s*PROGRAM_VERSION\s*=\s*&quot;(.*)&quot;" replacement="$1String PROGRAM_VERSION = &quot;${app.version}&quot;"/> 
    13101312    <!-- linux --> 
    1311     <exec executable="makegli.sh" os="${os.unix}" dir="${gli.home}" 
    1312       resolveExecutable="true"/> 
     1313    <exec executable="makegli.sh" os="${os.unix}" dir="${gli.home}" resolveExecutable="true"/> 
    13131314    <!-- windows --> 
    1314     <exec executable="makegli.bat" os="${os.windows}" dir="${gli.home}" 
    1315       resolveExecutable="true"/> 
     1315    <exec executable="makegli.bat" os="${os.windows}" dir="${gli.home}" resolveExecutable="true"/> 
    13161316  </target> 
    13171317   
  • greenstone3/branches/3.03/src/java/org/greenstone/anttasks/RegexSearchReplace.java

    r14575 r14580  
    7070                line = line.replaceAll( pattern, replacement); 
    7171                out.write(line); 
     72                out.newLine(); 
    7273            } 
    7374            //close them both up