Changeset 23493

Show
Ignore:
Timestamp:
16.12.2010 11:49:57 (9 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

Location:
main/trunk/release-kits
Files:
6 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/release-kits/bin/rk

    r21652 r23493  
    4141 
    4242#make sure ant has enough memory 
    43 export ANT_OPTS=-Xmx800M 
     43export ANT_OPTS=-Xmx1000M 
    4444 
    4545#create the command 
  • main/trunk/release-kits/kits/rk2/ant-scripts/compile.xml

    r23186 r23493  
    158158             
    159159            <mkdir dir="products"/> 
    160             <copy file="${basedir}/compiled/server.exe" tofile="${basedir}/products/server-${version}.exe"/> 
     160            <copy file="${basedir}/compiled/server.exe" tofile="${basedir}/products/server-${version}${version-extra}.exe"/> 
    161161            <move file="${basedir}/compiled/server.exe" todir="${basedir}/compiled/bin/windows"/> 
    162162 
  • main/trunk/release-kits/kits/rk2/ant-scripts/create-cdrom-components.xml

    r22325 r23493  
    136136            </exec> 
    137137            <exec executable="link" dir="cdrom/build"> 
    138                 <arg line="/OUT:../dist/Greenstone-${version}-windows.exe gdi32.lib advapi32.lib shell32.lib user32.lib wrapper.obj wrapper.RES"/> 
     138                <arg line="/OUT:../dist/Greenstone-${version}${version-extra}-windows.exe gdi32.lib advapi32.lib shell32.lib user32.lib wrapper.obj wrapper.RES"/> 
    139139            </exec> 
    140140 
     
    150150            <echo level="info">link the compiled code</echo> 
    151151            <exec executable="g++" dir="cdrom/build"> 
    152                 <arg line="-static -static-libgcc -o ../dist/Greenstone-${version}-linux wrapper.o"/> 
     152                <arg line="-static -static-libgcc -o ../dist/Greenstone-${version}${version-extra}-linux wrapper.o"/> 
    153153            </exec> 
    154154 
     
    158158            <mkdir dir="wrapped-installer/cdrom"/> 
    159159            <!-- create app for cdrom installer --> 
    160             <copy todir="cdrom/dist/Greenstone-${version}-MacOS.app"><fileset dir="${rk.home}/shared/mac/Wrapper.app"/></copy> 
    161             <copy todir="cdrom/dist/Greenstone-${version}-MacOS.app/Contents/Resources" file="${rk.home}/shared/core/icon/icon.icns"/> 
    162             <chmod file="cdrom/dist/Greenstone-${version}-MacOS.app/Contents/MacOS/JavaApplicationStub" perm="+x"/> 
     160            <copy todir="cdrom/dist/Greenstone-${version}${version-extra}-MacOS.app"><fileset dir="${rk.home}/shared/mac/Wrapper.app"/></copy> 
     161            <copy todir="cdrom/dist/Greenstone-${version}${version-extra}-MacOS.app/Contents/Resources" file="${rk.home}/shared/core/icon/icon.icns"/> 
     162            <chmod file="cdrom/dist/Greenstone-${version}${version-extra}-MacOS.app/Contents/MacOS/JavaApplicationStub" perm="+x"/> 
    163163 
    164164            <!-- copy bundled files --> 
    165             <copy todir="cdrom/dist/Greenstone-${version}-MacOS.app/Contents/Resources/Java" file="${basedir}/installer/cdrom.jar"/> 
     165            <copy todir="cdrom/dist/Greenstone-${version}${version-extra}-MacOS.app/Contents/Resources/Java" file="${basedir}/installer/cdrom.jar"/> 
    166166 
    167167            <!-- substitute in real values --> 
    168             <rsr file="cdrom/dist/Greenstone-${version}-MacOS.app/Contents/Info.plist" pattern="@jar@" replacement="cdrom.jar"/> 
    169             <rsr file="cdrom/dist/Greenstone-${version}-MacOS.app/Contents/Info.plist" pattern="@version@" replacement="${version}"/> 
     168            <rsr file="cdrom/dist/Greenstone-${version}${version-extra}-MacOS.app/Contents/Info.plist" pattern="@jar@" replacement="cdrom.jar"/> 
     169            <rsr file="cdrom/dist/Greenstone-${version}${version-extra}-MacOS.app/Contents/Info.plist" pattern="@version@" replacement="${version}"/> 
    170170             
    171171        </if></else></if></else></if> 
     
    176176        <!-- (windows) --> 
    177177        <if><bool><equals arg1="${rk.os}" arg2="windows"/></bool> 
    178             <tar destfile="products/cdrom-components-${version}-windows.tar.gz" compression="gzip"> 
     178            <tar destfile="products/cdrom-components-${version}${version-extra}-windows.tar.gz" compression="gzip"> 
    179179                <tarfileset dir="cdrom/dist"> 
    180180                    <include name="**/*"/> 
     
    183183                </tarfileset> 
    184184            </tar> 
    185             <tar destfile="products/cdrom-components-${version}-full-windows.tar.gz" compression="gzip"> 
     185            <tar destfile="products/cdrom-components-${version}${version-extra}-full-windows.tar.gz" compression="gzip"> 
    186186                <tarfileset dir="cdrom/dist"> 
    187187                    <include name="**/*"/> 
     
    195195            <exec dir="cdrom/dist" executable="bash"> 
    196196                <arg value="-c"/> 
    197                 <arg value="tar -czf ../../products/cdrom-components-${version}-${rk.os}.tar.gz *"/> 
     197                <arg value="tar -czf ../../products/cdrom-components-${version}${version-extra}-${rk.os}.tar.gz *"/> 
    198198            </exec> 
    199199        </if></else></if> 
  • main/trunk/release-kits/shared/core/ant-scripts/create-installer.xml

    r22356 r23493  
    120120        <rsr> 
    121121            <fileset dir="${basedir}/installer" includes="*.xml"/> 
    122             <job pattern="@version@" replacement="${version}"/> 
     122            <job pattern="@version@" replacement="${version}${version-extra}"/> 
    123123            <job pattern="@component.size.core@" replacement="${component.size.core}"/> 
    124124            <job pattern="@component.size.tomcat@" replacement="${component.size.tomcat}"/> 
     
    142142        <rsr> 
    143143            <fileset dir="${basedir}/installer/classes/resources" includes="*.properties"/> 
    144             <job pattern="@version@" replacement="${version}"/> 
     144            <job pattern="@version@" replacement="${version}${version-extra}"/> 
    145145            <job pattern="@version.major@" replacement="${version.major}"/> 
    146146            <job pattern="@java.min.version@" replacement="${java.min.version}"/> 
     
    167167 
    168168        <!-- create insaller jar with ant-installer's ant task --> 
    169         <installer file="installer/Greenstone-${version}-${os.suffix}.jar" 
     169        <installer file="installer/Greenstone-${version}${version-extra}-${os.suffix}.jar" 
    170170            compress="true" 
    171171            extractType="NonExtractor" 
  • 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> 
  • main/trunk/release-kits/shared/core/ant-scripts/wrap.xml

    r21725 r23493  
    4040                chunkSize="${resources.chunksize}"/> 
    4141            <rsplit 
    42                 resource="installer/Greenstone-${version}-${os.suffix}.jar" 
     42                resource="installer/Greenstone-${version}${version-extra}-${os.suffix}.jar" 
    4343                outputDir="wrapped-installer" 
    4444                resourceScript="wrapped-installer/wrapper.rc" 
     
    6363            <!-- link wrapper --> 
    6464            <exec executable="link" dir="wrapped-installer"> 
    65                 <arg line="/OUT:..\products\Greenstone-${version}-${os.suffix}.exe gdi32.lib advapi32.lib shell32.lib user32.lib libsearch4j.obj wrapper.obj wrapper.res"/> 
     65                <arg line="/OUT:..\products\Greenstone-${version}${version-extra}-${os.suffix}.exe gdi32.lib advapi32.lib shell32.lib user32.lib libsearch4j.obj wrapper.obj wrapper.res"/> 
    6666            </exec> 
    6767 
     
    7979            <!-- copy bundled files into place --> 
    8080            <copy todir="wrapped-installer" file="${rk.home}/shared/linux/${linux-java.installer}"/> 
    81             <copy tofile="wrapped-installer/greenstone.jar" file="installer/Greenstone-${version}-${os.suffix}.jar"/> 
     81            <copy tofile="wrapped-installer/greenstone.jar" file="installer/Greenstone-${version}${version-extra}-${os.suffix}.jar"/> 
    8282 
    8383            <!-- substitute in real values --> 
     
    122122            <!-- link the compiled code and bundled files --> 
    123123            <exec executable="g++" dir="wrapped-installer"> 
    124                 <arg line="-static -static-libgcc -o ../products/Greenstone-${version}-linux wrapper.o libsearch4j.o greenstone.jar.o java.o"/> 
     124                <arg line="-static -static-libgcc -o ../products/Greenstone-${version}${version-extra}-linux wrapper.o libsearch4j.o greenstone.jar.o java.o"/> 
    125125            </exec> 
    126126 
     
    133133 
    134134            <!-- create app for main installer --> 
    135             <copy todir="wrapped-installer/Greenstone${version}.app"><fileset dir="${rk.home}/shared/mac/Wrapper.app"/></copy> 
    136             <copy todir="wrapped-installer/Greenstone${version}.app/Contents/Resources" file="${rk.home}/shared/core/icon/icon.icns"/> 
    137             <chmod file="wrapped-installer/Greenstone${version}.app/Contents/MacOS/JavaApplicationStub" perm="ug+x"/> 
     135            <copy todir="wrapped-installer/Greenstone${version}${version-extra}.app"><fileset dir="${rk.home}/shared/mac/Wrapper.app"/></copy> 
     136            <copy todir="wrapped-installer/Greenstone${version}${version-extra}.app/Contents/Resources" file="${rk.home}/shared/core/icon/icon.icns"/> 
     137            <chmod file="wrapped-installer/Greenstone${version}${version-extra}.app/Contents/MacOS/JavaApplicationStub" perm="ug+x"/> 
    138138 
    139139            <!-- copy bundled files --> 
    140             <copy todir="wrapped-installer/Greenstone${version}.app/Contents/Resources/Java" file="installer/Greenstone-${version}-${os.suffix}.jar"/> 
     140            <copy todir="wrapped-installer/Greenstone${version}${version-extra}.app/Contents/Resources/Java" file="installer/Greenstone-${version}${version-extra}-${os.suffix}.jar"/> 
    141141 
    142142            <!-- substitute in real values --> 
    143             <rsr file="wrapped-installer/Greenstone${version}.app/Contents/Info.plist"> 
    144                 <job pattern="@jar@" replacement="Greenstone-${version}-${os.suffix}.jar"/> 
    145                 <job pattern="@version@" replacement="${version}"/> 
     143            <rsr file="wrapped-installer/Greenstone${version}${version-extra}.app/Contents/Info.plist"> 
     144                <job pattern="@jar@" replacement="Greenstone-${version}${version-extra}-${os.suffix}.jar"/> 
     145                <job pattern="@version@" replacement="${version}${version-extra}"/> 
    146146            </rsr> 
    147147 
     
    149149 
    150150            <!-- get size of app --> 
    151             <exec executable="du" dir="wrapped-installer" outputproperty="app.du"><arg line="-ks Greenstone${version}.app"/></exec> 
     151            <exec executable="du" dir="wrapped-installer" outputproperty="app.du"><arg line="-ks Greenstone${version}${version-extra}.app"/></exec> 
    152152            <exec executable="sed" inputstring="${app.du}" outputproperty="app.size"><arg line="-e 's/^\([0-9]*\).*$/\1/g'"/></exec> 
    153153            <math result="dmg.size" operand1="${app.size}" operation="+" operand2="${dmg.overhead}" datatype="int"/> 
    154154 
    155155            <!-- create disk image --> 
    156             <property name="dmg.name" value="Greenstone-${version}-${os.suffix}"/> 
     156            <property name="dmg.name" value="Greenstone-${version}${version-extra}-${os.suffix}"/> 
    157157            <exec dir="products" executable="hdiutil" failonerror="true"><arg line="create -ov -size ${dmg.size}k -fs HFS+ -volname ${dmg.name} ${dmg.name}.dmg"/></exec> 
    158158            <!-- mount it --> 
    159159            <exec executable="hdiutil" dir="products" failonerror="true"><arg line="attach ${dmg.name}.dmg"/></exec> 
    160160            <!-- copy file into it --> 
    161             <exec executable="cp"><arg line="-r wrapped-installer/Greenstone${version}.app /Volumes/${dmg.name}"/></exec> 
     161            <exec executable="cp"><arg line="-r wrapped-installer/Greenstone${version}${version-extra}.app /Volumes/${dmg.name}"/></exec> 
    162162            <!-- unmount it--> 
    163163            <exec executable="hdiutil" failonerror="true"><arg line="detach /Volumes/${dmg.name}"/></exec>