Changeset 28725 for other-projects


Ignore:
Timestamp:
2013-12-02T13:39:38+13:00 (10 years ago)
Author:
ak19
Message:

Expeditee team (jts21). Some modifications before changing over to include the jre for mac in a self-extracting binary.

Location:
other-projects/expeditee-release-kits/kits/rke
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • other-projects/expeditee-release-kits/kits/rke/ant-scripts/compile.xml

    r28721 r28725  
    1111
    1212        <!-- we do not want the *.app folders if we are not mac-->
    13         <if><bool><not><equals arg1="${rk.os}" arg2="mac"/></not></bool>
    14             <!--<delete dir="${basedir}/compiled/client-gli.app"/>-->
    15         </if>
     13        <!--<if><bool><not><equals arg1="${rk.os}" arg2="mac"/></not></bool>
     14            <delete dir="${basedir}/compiled/client-gli.app"/>
     15        </if>-->
    1616        <ant dir="${basedir}/expeditee" antfile="${basedir}/expeditee/build.xml" target="inst6" />
    1717        <move todir="compiled">

  • other-projects/expeditee-release-kits/kits/rke/ant-scripts/init.xml

    r28720 r28725  
    158158            </if>
    159159        </if>
     160        <if><bool><equals arg1="${rk.os}" arg2="mac"/></bool>
     161            <property name="java.installer" value="jre_bin_x64"/>
     162            <property name="component.bytesize.java" value="158123846"/> <!-- set this to the size of the extracted archive -->
     163        </if>
    160164        <if><bool><equals arg1="${rk.os}" arg2="windows"/></bool>
    161165            <property name="java.installer" value="jre.exe"/>
    162             <property name="component.bytesize.java" value="75000000"/> <!-- set this to the size of the extract archive -->
    163         </if>
    164         <if><bool><equals arg1="${rk.os}" arg2="mac"/></bool>
    165             <echo>Mac has no java</echo>
     166            <property name="component.bytesize.java" value="75000000"/> <!-- set this to the size of the extracted archive -->
    166167        </if>
    167168       

  • other-projects/expeditee-release-kits/kits/rke/ant-scripts/wrap.xml

    r28717 r28725  
    2424                <job pattern="@java.installer@" replacement="${java.installer}"/>
    2525                <job pattern="@java.min.version@" replacement="${java.min.version}"/>
    26                 <job pattern="@bundled.version.java@" replacement="${bundled.version.windows-java}"/>
     26                <job pattern="@bundled.version.java@" replacement="${bundled.version.java}"/>
    2727                <job pattern="@java.extracted@" replacement="${java.extracted}"/>
    2828            </rsr>
    … …  
    153153            <!-- copy bundled files -->
    154154            <copy todir="wrapped-installer/${projectname}${version}${version-extra}.app/Contents/Resources/Java" file="installer/${projectname}-${version}${version-extra}-${os.suffix}.jar"/>
     155            <copy todir="wrapped-installer/${projectname}${version}${version-extra}.app/Contents/Resources/Java" file="${rk.home}/shared/mac/${java.installer}"/>
    155156
    156157            <!-- substitute in real values -->

  • other-projects/expeditee-release-kits/kits/rke/installer/antinstall-config.xml

    r28717 r28725  
    7373            force="true"/>
    7474
    75         <!-- if linux|windows -->
    7675        <target
    7776            target="Installing Java Runtime"
    … …  
    7978            displayText=""
    8079            defaultValue="true"/>
    81         <!-- /if -->
    8280
    8381        <!-- if windows -->
Note: See TracChangeset for help on using the changeset viewer.