Changeset 16772

Show
Ignore:
Timestamp:
14.08.2008 09:00:43 (11 years ago)
Author:
oranfry
Message:

fixes to mark3

Location:
release-kits/mark3
Files:
4 modified

Legend:

Unmodified
Added
Removed
  • release-kits/mark3/ant-scripts/build.xml

    r16754 r16772  
    1515    <property name="bundled.version.tomcat" value="5.5.25"/> 
    1616    <property name="bundled.version.ant" value="1.6.5"/> 
     17 
     18    <!-- the amount extra space to allocate in the dmgs in (KB) --> 
     19    <property name="dmg.overhead" value="4096"/> 
    1720 
    1821    <!-- for the benefit of the shared scripts, set release-kit home --> 
  • release-kits/mark3/ant-scripts/create-installer.xml

    r16744 r16772  
    33 
    44    <target name="create-installer"> 
    5         <antcall target="calculate-component-sizes"/> <!-- from rk3-targets --> 
    65        <antcall target="copy-installer-files"/> 
    76        <antcall target="make-installer-files-concrete"/> <!-- from rk3-targets --> 
  • release-kits/mark3/ant-scripts/wrap.xml

    r16744 r16772  
    77        <mkdir dir="${basedir}/wrapped-installer"/> 
    88        <copy todir="${basedir}/wrapped-installer/Greenstone${version}.app"><fileset dir="${mark3.home}/mac/Wrapper.app"/></copy> 
    9         <copy todir="${basedir}/wrapped-installer/Greenstone${version}.app/Contents/Resources"><fileset dir="${mark2.home}/greenstone3/icon/icon.icns"/></copy> 
     9        <copy todir="${basedir}/wrapped-installer/Greenstone${version}.app/Contents/Resources" file="${mark3.home}/greenstone3/icon/icon.icns"/> 
    1010        <chmod file="${basedir}/wrapped-installer/Greenstone${version}.app/Contents/MacOS/JavaApplicationStub" perm="ug+x"/> 
    1111 
     
    1717        <rsr file="${basedir}/wrapped-installer/Greenstone${version}.app/Contents/Info.plist" pattern="@version@" replacement="${version}"/> 
    1818 
    19                      <!-- get size of app --> 
    20                      <exec executable="du" dir="${basedir}/wrapped-installer" outputproperty="app.du"><arg line="-ks Greenstone${version}.app"/></exec> 
     19        <!-- get size of app --> 
     20        <exec executable="du" dir="${basedir}/wrapped-installer" outputproperty="app.du"><arg line="-ks Greenstone${version}.app"/></exec> 
    2121        <echo>app.du: ${app.du}</echo> 
    22                      <exec executable="sed" inputstring="${app.du}" outputproperty="app.size"><arg line="-e 's/^\([0-9]*\).*$/\1/g'"/></exec> 
     22        <exec executable="sed" inputstring="${app.du}" outputproperty="app.size"><arg line="-e 's/^\([0-9]*\).*$/\1/g'"/></exec> 
    2323        <echo>app.size: ${app.size}</echo> 
    24         <math result="dmg.size" operand1="${app.size}" operation="+" operand2="2048" datatype="int"/> 
     24        <math result="dmg.size" operand1="${app.size}" operation="+" operand2="${dmg.overhead}" datatype="int"/> 
    2525        <echo>dmg.size: ${dmg.size}</echo> 
    2626 
    2727        <!-- create disk image --> 
    28         <exec dir="${basedir}/wrapped-installer" executable="hdiutil"><arg line="create -size ${dmg.size}k -fs HFS+ -volname Greenstone${version} Greenstone${version}.dmg"/></exec> 
     28        <property name="dmg.name" value="Greenstone-${version}-MacOS-${processor}"/> 
     29        <exec dir="${basedir}/wrapped-installer" executable="hdiutil"><arg line="create -size ${dmg.size}k -fs HFS+ -volname ${dmg.name} ${dmg.name}.dmg"/></exec> 
    2930        <!-- mount it --> 
    30         <exec executable="hdiutil" dir="${basedir}/wrapped-installer"><arg line="attach Greenstone${version}.dmg"/></exec> 
     31        <exec executable="hdiutil" dir="${basedir}/wrapped-installer"><arg line="attach ${dmg.name}.dmg"/></exec> 
    3132        <!-- copy file into it --> 
    32         <exec executable="cp" dir="${basedir}/wrapped-installer"><arg line="-r Greenstone${version}.app /Volumes/Greenstone${version}"/></exec> 
     33        <exec executable="cp" dir="${basedir}/wrapped-installer"><arg line="-r Greenstone${version}.app /Volumes/${dmg.name}"/></exec> 
    3334        <!-- unmount it--> 
    34         <exec executable="hdiutil" dir="${basedir}/wrapped-installer"><arg line="detach /Volumes/Greenstone${version}"/></exec> 
     35        <exec executable="hdiutil" dir="${basedir}/wrapped-installer"><arg line="detach /Volumes/${dmg.name}"/></exec> 
    3536    </target> 
    3637 
  • release-kits/mark3/bin/mark3

    r16655 r16772  
    1313$toexec 
    1414 
     15return $? 
     16