Ignore:
Timestamp:
2010-01-25T11:02:45+13:00 (14 years ago)
Author:
oranfry
Message:

fixes to rk2 for linux and mac

Location:
main/trunk/release-kits/kits/rk2/ant-scripts
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • 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"/>
Note: See TracChangeset for help on using the changeset viewer.