Changeset 16808

Show
Ignore:
Timestamp:
15.08.2008 13:27:45 (11 years ago)
Author:
oranfry
Message:

fixes to mark2

Location:
release-kits/mark2/ant-scripts
Files:
4 modified

Legend:

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

    r16741 r16808  
    1212 
    1313    <!-- CONSTANTS --> 
     14 
     15    <!-- the extra space for the dmg image (KB) --> 
     16    <property name="dmg.overhead" value="2048"/> 
    1417 
    1518    <!-- for the benefit of the shared scripts, set release-kit home --> 
  • release-kits/mark2/ant-scripts/compile.xml

    r16741 r16808  
    3636 
    3737    <target name="tweak-makefiles"> 
    38         <rsr file="${basedir}/gsdl/src/recpt/Makefile" pattern="^(LIBS =.*)-L${mark2.home}/mac/${processor}/gdbm/lib -lgdbm(.*)$" replacement="$1${mark2.home}/mac/${processor}/gdbm/lib/libgdbm.a$2" /> 
    39         <rsr file="${basedir}/gsdl/src/oaiservr/Makefile" pattern="^(LIBS =.*)-L${mark2.home}/mac/${processor}/gdbm/lib -lgdbm(.*)$" replacement="$1${mark2.home}/mac/${processor}/gdbm/lib/libgdbm.a$2" /> 
    40         <rsr file="${basedir}/gsdl/src/gdbmedit/db2txt/Makefile" pattern="^(LIBS =.*)-L${mark2.home}/mac/${processor}/gdbm/lib -lgdbm(.*)$" replacement="$1${mark2.home}/mac/${processor}/gdbm/lib/libgdbm.a$2" /> 
    41         <rsr file="${basedir}/gsdl/src/gdbmedit/txt2db/Makefile" pattern="^(LIBS =.*)-L${mark2.home}/mac/${processor}/gdbm/lib -lgdbm(.*)$" replacement="$1${mark2.home}/mac/${processor}/gdbm/lib/libgdbm.a$2" /> 
    42         <rsr file="${basedir}/gsdl/src/recpt/Makefile" pattern="^(LIBS =.*)-L(.)\(PACKAGES_DIR\)/expat/lib -lexpat(.*)$" replacement="$1$2(PACKAGES_DIR)/expat/lib/libexpat.a$3" /> 
    43         <rsr file="${basedir}/gsdl/src/oaiservr/Makefile" pattern="^(LIBS =.*)-L(.)\(PACKAGES_DIR\)/expat/lib -lexpat(.*)$" replacement="$1$2(PACKAGES_DIR)/expat/lib/libexpat.a$3" /> 
     38        <rsr file="${basedir}/gsdl/runtime-src/src/recpt/Makefile" pattern="^(LIBS =.*)-L${mark2.home}/mac/${processor}/gdbm/lib -lgdbm(.*)$" replacement="$1${mark2.home}/mac/${processor}/gdbm/lib/libgdbm.a$2" /> 
     39        <rsr file="${basedir}/gsdl/runtime-src/src/oaiservr/Makefile" pattern="^(LIBS =.*)-L${mark2.home}/mac/${processor}/gdbm/lib -lgdbm(.*)$" replacement="$1${mark2.home}/mac/${processor}/gdbm/lib/libgdbm.a$2" /> 
     40        <rsr file="${basedir}/gsdl/common-src/src/gdbmedit/db2txt/Makefile" pattern="^(LIBS =.*)-L${mark2.home}/mac/${processor}/gdbm/lib -lgdbm(.*)$" replacement="$1${mark2.home}/mac/${processor}/gdbm/lib/libgdbm.a$2" /> 
     41        <rsr file="${basedir}/gsdl/common-src/src/gdbmedit/txt2db/Makefile" pattern="^(LIBS =.*)-L${mark2.home}/mac/${processor}/gdbm/lib -lgdbm(.*)$" replacement="$1${mark2.home}/mac/${processor}/gdbm/lib/libgdbm.a$2" /> 
     42        <rsr file="${basedir}/gsdl/runtime-src/src/recpt/Makefile" pattern="^(LIBS =.*)-L(.)\(PACKAGES_DIR\)/expat/lib -lexpat(.*)$" replacement="$1$2(PACKAGES_DIR)/expat/lib/libexpat.a$3" /> 
     43        <rsr file="${basedir}/gsdl/runtime-src/src/oaiservr/Makefile" pattern="^(LIBS =.*)-L(.)\(PACKAGES_DIR\)/expat/lib -lexpat(.*)$" replacement="$1$2(PACKAGES_DIR)/expat/lib/libexpat.a$3" /> 
    4444    </target> 
    4545 
  • release-kits/mark2/ant-scripts/create-distribution.xml

    r16741 r16808  
    66        <antcall target="dist-set-version" /> 
    77        <antcall target="gli-set-version-numbers"> 
    8             <param name="glibasedir" value="${basedir}/distribution/greenstone3/gli"/> 
     8            <param name="glibasedir" value="${basedir}/distributions/web/gli"/> 
    99        </antcall> 
    1010        <antcall target="drop-in-binaries" /> 
     
    2525 
    2626    <target name="dist-set-version"> 
    27         <echo level="info">Setting version in src/lib/gsdlconf.h</echo> 
    28         <rsr file="${basedir}/distributions/web/src/lib/gsdlconf.h" pattern="(#define GSDL_VERSION) &quot;.*&quot;" replacement="$1 &quot;${version}&quot;" /> 
     27        <echo level="info">Setting version in common-src/src/lib/gsdlconf.h</echo> 
     28        <rsr file="${basedir}/distributions/web/common-src/src/lib/gsdlconf.h" pattern="(#define GSDL_VERSION) &quot;.*&quot;" replacement="$1 &quot;${version}&quot;" /> 
    2929 
    3030        <echo level="info">Setting version in Install.sh</echo> 
  • release-kits/mark2/ant-scripts/wrap.xml

    r16741 r16808  
    77        <mkdir dir="${basedir}/wrapped-installer"/> 
    88        <copy todir="${basedir}/wrapped-installer/Greenstone${version}.app"><fileset dir="${mark2.home}/mac/Wrapper.app"/></copy> 
    9         <copy todir="${basedir}/wrapped-installer/Greenstone${version}.app/Contents/Resources"><fileset dir="${mark2.home}/greenstone2/icon/icon.icns"/></copy> 
     9        <copy todir="${basedir}/wrapped-installer/Greenstone${version}.app/Contents/Resources" file="${mark2.home}/greenstone2/icon/icon.icns"/> 
    1010        <chmod file="${basedir}/wrapped-installer/Greenstone${version}.app/Contents/MacOS/JavaApplicationStub" perm="ug+x"/> 
    1111 
     
    2222                     <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