Ignore:
Timestamp:
2010-12-16T11:49:57+13:00 (13 years ago)
Author:
sjm84
Message:

Split the version property into a version propery (e.g. 2.84) and version-extra property (e.g. RC1) to better support the creation of special greenstone versions (e.g. release candidates). The amount of memory used by the release kit was also increased from 800MB to 1000MB

File:
1 edited

Legend:

Unmodified
Added
Removed

  • main/trunk/release-kits/shared/core/ant-scripts/shared.xml

    r23242 r23493  
    9595        <property name="branch.tag.version" value="" />
    9696
     97        <property name="version-extra" value="" />
     98
    9799        <if><bool><equals arg1="${branch.tag.name}" arg2="trunk" /></bool>
    98100
    … …  
    188190
    189191        <!-- show important properties -->
    190         <echo level="info">Version (version): ${version}</echo>
     192        <echo level="info">Version (version): ${version}${version-extra}</echo>
    191193        <echo level="info">Major Version (version.major): ${version.major}</echo>
    192194        <echo level="info">Branch Path (branch.path): ${branch.path}</echo>
    … …  
    270272
    271273        <if><bool><available file="${gsdl.basedir}/common-src/src/lib/gsdlconf.h"/></bool>
    272             <rsr file="${gsdl.basedir}/common-src/src/lib/gsdlconf.h" pattern="(#define GSDL_VERSION) &quot;.*&quot;" replacement="$1 &quot;${version}&quot;" />
     274            <rsr file="${gsdl.basedir}/common-src/src/lib/gsdlconf.h" pattern="(#define GSDL_VERSION) &quot;.*&quot;" replacement="$1 &quot;${version}${version-extra}&quot;" />
    273275        </if>
    274276
    275277        <if><bool><available file="${gsdl.basedir}/etc/VERSION"/></bool>
    276             <rsr file="${gsdl.basedir}/etc/VERSION" pattern="(gsdl version: ).*" replacement="$1${version}" />
     278            <rsr file="${gsdl.basedir}/etc/VERSION" pattern="(gsdl version: ).*" replacement="$1${version}${version-extra}" />
    277279        </if>
    278280
    279281        <if><bool><available file="${gsdl.basedir}/lib/java/server.properties"/></bool>
    280             <rsr file="${gsdl.basedir}/lib/java/server.properties" pattern="^(Server2Control.Version[:=]).*" replacement="$1${version}" />
     282            <rsr file="${gsdl.basedir}/lib/java/server.properties" pattern="^(Server2Control.Version[:=]).*" replacement="$1${version}${version-extra}" />
    281283        </if>
    282284
    … …  
    296298            <rsr file="${gsdl.basedir}/READMEen.txt">
    297299                <job pattern="^(Date\s*)(.*)" replacement="$1${month.default} ${current.year}" />
    298                 <job pattern="^(Version\s*)(.*)" replacement="$1${version}" />
     300                <job pattern="^(Version\s*)(.*)" replacement="$1${version}${version-extra}" />
    299301            </rsr>
    300302        </if>
    … …  
    304306            <rsr file="${gsdl.basedir}/READMEar.txt">
    305307                <job pattern="(التاريخ : \s*)(.*)" replacement="$1${month.ar} ${current.year}"/>
    306                 <job pattern="(النسخه : \s*)(.*)" replacement="$1${version}"/>
     308                <job pattern="(النسخه : \s*)(.*)" replacement="$1${version}${version-extra}"/>
    307309            </rsr>
    308310        </if>
    … …  
    312314            <rsr file="${gsdl.basedir}/READMEes.txt">
    313315                <job pattern="^(Fecha\s*)(.*)" replacement="$1${month.es} de ${current.year}"/>
    314                 <job pattern="^(Versi.?n\s*)(.*)" replacement="$1${version}"/>
     316                <job pattern="^(Versi.?n\s*)(.*)" replacement="$1${version}${version-extra}"/>
    315317            </rsr>
    316318        </if>
    … …  
    320322            <rsr file="${gsdl.basedir}/READMEfr.txt">
    321323                <job pattern="^(Date\s*)(.*)" replacement="$1${month.fr} ${current.year}"/>
    322                 <job pattern="^(Version\s*)(.*)" replacement="$1${version}"/>
     324                <job pattern="^(Version\s*)(.*)" replacement="$1${version}${version-extra}"/>
    323325            </rsr>
    324326        </if>
    … …  
    328330            <rsr file="${gsdl.basedir}/READMEru.txt">
    329331                <job pattern="^(Дата\s*)(.*)" replacement="$1${month.ru} ${current.year}"/>
    330                 <job pattern="^(ВерсОя\s*)(.*)" replacement="$1${version}"/>
     332                <job pattern="^(ВерсОя\s*)(.*)" replacement="$1${version}${version-extra}"/>
    331333            </rsr>
    332334        </if>
    … …  
    355357            <!-- GLI GATHERER -->
    356358            <echo level="info">Changing version number in gli Gatherer</echo>
    357             <rsr file="${glibasedir}/src/org/greenstone/gatherer/Gatherer.java" pattern="^(.*)String\s*PROGRAM_VERSION\s*=\s*&quot;(.*)&quot;" replacement="$1String PROGRAM_VERSION = &quot;${version}&quot;"/>
     359            <rsr file="${glibasedir}/src/org/greenstone/gatherer/Gatherer.java" pattern="^(.*)String\s*PROGRAM_VERSION\s*=\s*&quot;(.*)&quot;" replacement="$1String PROGRAM_VERSION = &quot;${version}${version-extra}&quot;"/>
    358360
    359361            <!-- CONFIG XML FILES -->
    360362            <echo level="info">Changing configuration version in classes/xml/config.xml</echo>
    361             <rsr file="${glibasedir}/classes/xml/config.xml" pattern="^(\s*&lt;Configuration.* version=&quot;)[^&quot;]*(&quot;.*&gt;)" replacement="$1${version}$2"/>
     363            <rsr file="${glibasedir}/classes/xml/config.xml" pattern="^(\s*&lt;Configuration.* version=&quot;)[^&quot;]*(&quot;.*&gt;)" replacement="$1${version}${version-extra}$2"/>
    362364
    363365            <echo level="info">Changing configuration version in gli/classes/xml/configRemote.xml</echo>
    364             <rsr file="${glibasedir}/classes/xml/configRemote.xml" pattern="^(\s*&lt;Configuration.* version=&quot;)[^&quot;]*(&quot;.*&gt;)" replacement="$1${version}$2"/>
     366            <rsr file="${glibasedir}/classes/xml/configRemote.xml" pattern="^(\s*&lt;Configuration.* version=&quot;)[^&quot;]*(&quot;.*&gt;)" replacement="$1${version}${version-extra}$2"/>
    365367
    366368    </target>
Note: See TracChangeset for help on using the changeset viewer.