Changeset 21725

Show
Ignore:
Timestamp:
23.02.2010 17:09:47 (10 years ago)
Author:
oranfry
Message:

got rk2 and rk3 going on mac

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

Legend:

Unmodified
Added
Removed
  • main/trunk/release-kits/kits/rk2/ant-scripts/compile.xml

    r21658 r21725  
    9797        <!-- mac and linux: compile --> 
    9898        <if><bool><or><equals arg1="${rk.os}" arg2="mac"/><equals arg1="${rk.os}" arg2="linux"/></or></bool> 
    99  
    100             <!-- WORKAROUND: make common-src and reconfigure --> 
    101             <!-- this is a workaround to a problem with the gsdl build code --> 
    102             <!-- expat needs to be compiled before the perl XML Parser is configured --> 
    103             <exec dir="${basedir}/compiled/common-src" executable="make" failonerror="true"/> 
    104             <exec dir="${basedir}/compiled" executable="${basedir}/compiled/configure" failonerror="true"> 
    105                 <arg line="--enable-apache-httpd"/> 
    106                 <env key="LDFLAGS" value="-static"/> 
    107             </exec> 
    108             <!-- /WORKAROUND --> 
    10999 
    110100            <!-- make --> 
     
    236226 
    237227            <!-- grab ghostscript binaries --> 
    238             <delete dir="compiled/bin/darwin/imagemagick"/> 
     228            <delete dir="compiled/bin/darwin/ghostscript"/> 
    239229            <exec executable="svn"> 
    240230                <arg value="export"/> 
  • main/trunk/release-kits/kits/rk2/ant-scripts/create-cdrom-components.xml

    r21623 r21725  
    121121                <fileset dir="${rk.home}/shared/windows/wrapper"/> 
    122122                <fileset dir="${rk.home}/shared/greenstone2/wrapper" includes="*.bmp"/> 
    123                 <fileset dir="${rk.home}/shared/greenstone2/icon" includes="icon.ico"/> 
     123                <fileset dir="${rk.home}/shared/core/icon" includes="icon.ico"/> 
    124124                <fileset dir="${rk.home}/shared/core/search4j" includes="libsearch4j.cpp,libsearch4j.h"/> 
    125125            </copy> 
     
    154154            <!-- create app for cdrom installer --> 
    155155            <copy todir="cdrom/dist/Greenstone-${version}-MacOS.app"><fileset dir="${rk.home}/shared/mac/Wrapper.app"/></copy> 
    156             <copy todir="cdrom/dist/Greenstone-${version}-MacOS.app/Contents/Resources" file="${rk.home}/shared/greenstone2/icon/icon.icns"/> 
     156            <copy todir="cdrom/dist/Greenstone-${version}-MacOS.app/Contents/Resources" file="${rk.home}/shared/core/icon/icon.icns"/> 
    157157            <chmod file="cdrom/dist/Greenstone-${version}-MacOS.app/Contents/MacOS/JavaApplicationStub" perm="+x"/> 
    158158 
     
    179179            <exec dir="cdrom/dist" executable="bash"> 
    180180                <arg value="-c"/> 
    181                 <arg value="tar -czf ../../products/cdrom-components-${version}-linux.tar.gz *"/> 
     181                <arg value="tar -czf ../../products/cdrom-components-${version}-${rk.os}.tar.gz *"/> 
    182182            </exec> 
    183183        </if></else></if> 
  • main/trunk/release-kits/kits/rk3/ant-scripts/compile.xml

    r21652 r21725  
    8484 
    8585            <!-- grab ghostscript binaries --> 
    86             <delete dir="compiled/gs2build/bin/darwin/imagemagick"/> 
     86            <delete dir="compiled/gs2build/bin/darwin/ghostscript"/> 
    8787            <exec executable="svn"> 
    8888                <arg value="export"/> 
  • main/trunk/release-kits/shared/core/ant-scripts/wrap.xml

    r21658 r21725  
    155155            <!-- create disk image --> 
    156156            <property name="dmg.name" value="Greenstone-${version}-${os.suffix}"/> 
    157             <exec dir="products" executable="hdiutil"><arg line="create -ov -size ${dmg.size}k -fs HFS+ -volname ${dmg.name} ${dmg.name}.dmg"/></exec> 
     157            <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 --> 
    159             <exec executable="hdiutil" dir="products"><arg line="attach ${dmg.name}.dmg"/></exec> 
     159            <exec executable="hdiutil" dir="products" failonerror="true"><arg line="attach ${dmg.name}.dmg"/></exec> 
    160160            <!-- copy file into it --> 
    161161            <exec executable="cp"><arg line="-r wrapped-installer/Greenstone${version}.app /Volumes/${dmg.name}"/></exec> 
    162162            <!-- unmount it--> 
    163             <exec executable="hdiutil"><arg line="detach /Volumes/${dmg.name}"/></exec> 
     163            <exec executable="hdiutil" failonerror="true"><arg line="detach /Volumes/${dmg.name}"/></exec> 
    164164        </if></else></if></else></if> 
    165165