Changeset 23493 for main/trunk/release-kits/kits

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

Location:

main/trunk/release-kits/kits/rk2/ant-scripts

Files:

• compile.xml (modified) (1 diff)
• create-cdrom-components.xml (modified) (6 diffs)

main/trunk/release-kits/kits/rk2/ant-scripts/compile.xml

@@ -158 +158 @@
             
             <mkdir dir="products"/>
-            <copy file="${basedir}/compiled/server.exe" tofile="${basedir}/products/server-${version}.exe"/>
+            <copy file="${basedir}/compiled/server.exe" tofile="${basedir}/products/server-${version}${version-extra}.exe"/>
             <move file="${basedir}/compiled/server.exe" todir="${basedir}/compiled/bin/windows"/>
 

main/trunk/release-kits/kits/rk2/ant-scripts/create-cdrom-components.xml

@@ -136 +136 @@
             </exec>
             <exec executable="link" dir="cdrom/build">
-                <arg line="/OUT:../dist/Greenstone-${version}-windows.exe gdi32.lib advapi32.lib shell32.lib user32.lib wrapper.obj wrapper.RES"/>
+                <arg line="/OUT:../dist/Greenstone-${version}${version-extra}-windows.exe gdi32.lib advapi32.lib shell32.lib user32.lib wrapper.obj wrapper.RES"/>
             </exec>
 
@@ -150 +150 @@
             <echo level="info">link the compiled code</echo>
             <exec executable="g++" dir="cdrom/build">
-                <arg line="-static -static-libgcc -o ../dist/Greenstone-${version}-linux wrapper.o"/>
+                <arg line="-static -static-libgcc -o ../dist/Greenstone-${version}${version-extra}-linux wrapper.o"/>
             </exec>
 
@@ -158 +158 @@
             <mkdir dir="wrapped-installer/cdrom"/>
             <!-- create app for cdrom installer -->
-            <copy todir="cdrom/dist/Greenstone-${version}-MacOS.app"><fileset dir="${rk.home}/shared/mac/Wrapper.app"/></copy>
-            <copy todir="cdrom/dist/Greenstone-${version}-MacOS.app/Contents/Resources" file="${rk.home}/shared/core/icon/icon.icns"/>
-            <chmod file="cdrom/dist/Greenstone-${version}-MacOS.app/Contents/MacOS/JavaApplicationStub" perm="+x"/>
+            <copy todir="cdrom/dist/Greenstone-${version}${version-extra}-MacOS.app"><fileset dir="${rk.home}/shared/mac/Wrapper.app"/></copy>
+            <copy todir="cdrom/dist/Greenstone-${version}${version-extra}-MacOS.app/Contents/Resources" file="${rk.home}/shared/core/icon/icon.icns"/>
+            <chmod file="cdrom/dist/Greenstone-${version}${version-extra}-MacOS.app/Contents/MacOS/JavaApplicationStub" perm="+x"/>
 
             <!-- copy bundled files -->
-            <copy todir="cdrom/dist/Greenstone-${version}-MacOS.app/Contents/Resources/Java" file="${basedir}/installer/cdrom.jar"/>
+            <copy todir="cdrom/dist/Greenstone-${version}${version-extra}-MacOS.app/Contents/Resources/Java" file="${basedir}/installer/cdrom.jar"/>
 
             <!-- substitute in real values -->
-            <rsr file="cdrom/dist/Greenstone-${version}-MacOS.app/Contents/Info.plist" pattern="@jar@" replacement="cdrom.jar"/>
-            <rsr file="cdrom/dist/Greenstone-${version}-MacOS.app/Contents/Info.plist" pattern="@version@" replacement="${version}"/>
+            <rsr file="cdrom/dist/Greenstone-${version}${version-extra}-MacOS.app/Contents/Info.plist" pattern="@jar@" replacement="cdrom.jar"/>
+            <rsr file="cdrom/dist/Greenstone-${version}${version-extra}-MacOS.app/Contents/Info.plist" pattern="@version@" replacement="${version}"/>
             
         </if></else></if></else></if>
@@ -176 +176 @@
         <!-- (windows) -->
         <if><bool><equals arg1="${rk.os}" arg2="windows"/></bool>
-            <tar destfile="products/cdrom-components-${version}-windows.tar.gz" compression="gzip">
+            <tar destfile="products/cdrom-components-${version}${version-extra}-windows.tar.gz" compression="gzip">
                 <tarfileset dir="cdrom/dist">
                     <include name="**/*"/>
@@ -183 +183 @@
                 </tarfileset>
             </tar>
-            <tar destfile="products/cdrom-components-${version}-full-windows.tar.gz" compression="gzip">
+            <tar destfile="products/cdrom-components-${version}${version-extra}-full-windows.tar.gz" compression="gzip">
                 <tarfileset dir="cdrom/dist">
                     <include name="**/*"/>
@@ -195 +195 @@
             <exec dir="cdrom/dist" executable="bash">
                 <arg value="-c"/>
-                <arg value="tar -czf ../../products/cdrom-components-${version}-${rk.os}.tar.gz *"/>
+                <arg value="tar -czf ../../products/cdrom-components-${version}${version-extra}-${rk.os}.tar.gz *"/>
             </exec>
         </if></else></if>