Changeset 21593

Show
Ignore:
Timestamp:
25.01.2010 11:02:45 (9 years ago)
Author:
oranfry
Message:

fixes to rk2 for linux and mac

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

Legend:

Unmodified
Added
Removed
  • main/trunk/release-kits/build.xml

    r21523 r21593  
    1010        </ant> 
    1111    </target> 
     12    <target name="clean"> 
     13        <ant dir="shared/core/ant-tasks/greenstone" inheritAll="false" target="clean"> 
     14            <property name="crypt.jar" value="${basedir}/shared/core/lib/crypt.jar"/> 
     15        </ant> 
     16        <ant dir="shared/core/ant-installer" inheritAll="false" target="clean"> 
     17            <property name="antlib" value="${ant.home}/lib"/> 
     18        </ant> 
     19    </target> 
    1220 
    1321</project> 
  • main/trunk/release-kits/kits/rk2/ant-scripts/build.xml

    r21510 r21593  
    118118    <target name="make-common-src"> 
    119119        <exec dir="${basedir}/compiled/common-src" executable="make" failonerror="true"/> 
    120         <exec dir="${basedir}/compiled/common-src" executable="make" failonerror="true"><arg value="install"/></exec> 
     120        <!--<exec dir="${basedir}/compiled/common-src" executable="make" failonerror="true"><arg value="install"/></exec>--> 
    121121    </target> 
    122122 
  • main/trunk/release-kits/kits/rk2/ant-scripts/compile.xml

    r21521 r21593  
    136136    <target name="strip-execs"> 
    137137        <exec dir="${basedir}/compiled/bin/${os.shell}" executable="find" failonerror="true"> 
    138             <arg line="! -name . -type f -maxdepth 1 -exec strip {} &#59;"/> 
     138            <arg line=". ! -name . -type f -maxdepth 1 -exec strip {} &#59;"/> 
    139139        </exec> 
    140140    </target> 
     
    143143 
    144144        <!-- linux, mac --> 
    145         <if><bool><equals arg1="${rk.os}" arg2="linux"/></bool> 
     145        <if><bool><or><equals arg1="${rk.os}" arg2="linux"/><equals arg1="${rk.os}" arg2="mac"/></or></bool> 
    146146            <exec dir="${basedir}/compiled" executable="${rk.home}/kits/rk2/resources/build-demo.sh" failonerror="true"/> 
    147147 
  • main/trunk/release-kits/kits/rk2/ant-scripts/create-cdrom-components.xml

    r21521 r21593  
    145145        <!-- linux --> 
    146146        <else><if><bool><equals arg1="${rk.os}" arg2="linux"/></bool> 
    147             <copy file="${rk.home}/linux/wrapper.cpp" todir="cdrom/build" overwrite="true"/> 
     147            <copy file="${rk.home}/shared/linux/wrapper.cpp" todir="cdrom/build" overwrite="true"/> 
    148148 
    149149            <echo level="info">compile the cdrom wrapper</echo> 
  • main/trunk/release-kits/kits/rk2/ant-scripts/wrap.xml

    r21394 r21593  
    9898            </exec> 
    9999 
     100            <!-- figure out jar size (web jar) --> 
     101            <exec executable="ls" dir="wrapped-installer" outputproperty="greenstone2.jar.ls"><arg line="-l greenstone2.jar"/></exec> 
     102            <exec executable="sed" inputstring="${greenstone2.jar.ls}" outputproperty="greenstone2.jar.size"><arg line="-e 's/^[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *\([0-9]*\).*$/\1/g'"/></exec> 
     103 
     104            <!-- figure out java size --> 
     105            <exec executable="ls" dir="wrapped-installer" outputproperty="java.ls"><arg line="-l ${linux-java.installer}"/></exec> 
     106            <exec executable="sed" inputstring="${java.ls}" outputproperty="java.size"><arg line="-e 's/^[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *\([0-9]*\).*$/\1/g'"/></exec> 
     107 
    100108            <!-- creating wrapper header file --> 
    101109            <delete file="wrapper.h"/> 
  • main/trunk/release-kits/shared/core/ant-scripts/init.xml

    r21521 r21593  
    2424        <property name="basedir.local" refid="basedir.path"/> 
    2525 
    26         <!-- size of resource chunks (wrapper) --> 
     26        <!-- size of resource chunks (windows wrapper) --> 
    2727        <property name="resources.chunksize" value="8388608"/> 
    28          
     28 
     29        <!-- the extra space for the dmg image in KB (mac wrapper) --> 
     30            <property name="dmg.overhead" value="2048"/> 
     31 
    2932        <!-- current date and time --> 
    3033        <tstamp> 
     
    169172        </else></if></else></if></else></if></else></if> 
    170173 
    171         <!-- set os.suffix --> 
     174        <!-- set os.suffix and os.shell --> 
    172175        <if><bool><equals arg1="${rk.os}" arg2="mac"/></bool> 
    173176            <property name="os.suffix" value="MacOS-intel"/> 
     177            <property name="os.shell" value="darwin"/> 
    174178        </if> 
    175179        <property name="os.suffix" value="${rk.os}"/> 
     180        <property name="os.shell" value="${rk.os}"/> 
    176181 
    177182        <!-- show important properties -->