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/kits/rk2/ant-scripts
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • 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>