Changeset 28726 for other-projects


Ignore:
Timestamp:
12/02/13 13:48:23 (7 years ago)
Author:
ak19
Message:

Expeditee team (jts21) - Changes to make the Mac binary inside .app be self-extracting as well as include the JRE with it

Location:
other-projects/expeditee-release-kits
Files:
1 added
1 edited

Legend:

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

    r28725 r28726  
    6666            </exec>
    6767
    68         <!-- (linux) -->
    69         <else><if><bool><equals arg1="${rk.os}" arg2="linux"/></bool>
     68        <!-- (linux and mac) -->
     69        <else><if><bool><or><equals arg1="${rk.os}" arg2="linux"/><equals arg1="${rk.os}" arg2="mac"/></or></bool>
    7070            <!-- create the build directory -->
    7171            <mkdir dir="wrapped-installer"/>
     
    7373            <!-- copy the source into place -->
    7474            <copy todir="wrapped-installer" overwrite="true">
    75                 <fileset file="${rk.home}/shared/linux/wrapper.cpp"/>
     75                <fileset file="${rk.home}/shared/${rk.os}/wrapper.cpp"/>
    7676                <fileset dir="${rk.home}/shared/core/search4j" includes="libsearch4j.cpp,libsearch4j.h"/>
    7777            </copy>
    7878
    7979            <!-- copy bundled files into place -->
    80             <copy todir="wrapped-installer" file="${rk.home}/shared/linux/${java.installer}"/>
     80            <copy todir="wrapped-installer" file="${rk.home}/shared/${rk.os}/${java.installer}"/>
    8181            <copy tofile="wrapped-installer/${projectname}.jar" file="installer/${projectname}-${version}${version-extra}-${os.suffix}.jar"/>
    8282
     
    136136            <!-- link the compiled code and bundled files -->
    137137            <exec executable="g++" dir="wrapped-installer">
    138                 <arg line="-static -static-libgcc -o ../products/${projectname}-${version}${version-extra}-linux${extension-x64} wrapper.o libsearch4j.o ${projectname}.jar.o java.o"/>
     138                <arg line="-static -static-libgcc -o ../products/${projectname}-${version}${version-extra}-${rk.os}${extension-x64} wrapper.o libsearch4j.o ${projectname}.jar.o java.o"/>
    139139            </exec>
    140140
     141        </if></else></if>
    141142        <!-- (mac) -->
    142         <else><if><bool><equals arg1="${rk.os}" arg2="mac"/></bool>
    143 
    144             <!-- create and setup the build directory -->
    145             <delete dir="wrapped-installer"/>
    146             <mkdir dir="wrapped-installer"/>
     143        <if><bool><equals arg1="${rk.os}" arg2="mac"/></bool>
    147144
    148145            <!-- create app for main installer -->
    149             <copy todir="wrapped-installer/${projectname}${version}${version-extra}.app"><fileset dir="${rk.home}/shared/mac/Wrapper.app"/></copy>
     146            <copy todir="wrapped-installer/${projectname}${version}${version-extra}.app">
     147                <fileset dir="${rk.home}/shared/mac/Wrapper.app"/>
     148            </copy>
    150149            <copy todir="wrapped-installer/${projectname}${version}${version-extra}.app/Contents/Resources" file="${rk.home}/shared/core/icon/icon.icns"/>
    151150            <chmod file="wrapped-installer/${projectname}${version}${version-extra}.app/Contents/MacOS/JavaApplicationStub" perm="ug+x"/>
    152151
    153152            <!-- copy bundled files -->
    154             <copy todir="wrapped-installer/${projectname}${version}${version-extra}.app/Contents/Resources/Java" file="installer/${projectname}-${version}${version-extra}-${os.suffix}.jar"/>
     153            <!--
     154            <copy todir="wrapped-installer/${projectname}${version}${version-extra}.app/Contents/Resources/Java" file="../products/${projectname}-${version}${version-extra}-${rk.os}${extension-x64}"/>
    155155            <copy todir="wrapped-installer/${projectname}${version}${version-extra}.app/Contents/Resources/Java" file="${rk.home}/shared/mac/${java.installer}"/>
     156            -->
     157            <move todir="wrapped-installer/${projectname}${version}${version-extra}.app/Contents/Resources/Java" file="../products/${projectname}-${version}${version-extra}-${rk.os}${extension-x64}"/>
    156158
    157159            <!-- substitute in real values -->
     
    178180            <!-- unmount it-->
    179181            <exec executable="hdiutil" failonerror="true"><arg line="detach /Volumes/${dmg.name}"/></exec>
    180         </if></else></if></else></if>
    181 
     182        </if>
    182183
    183184    </target>
Note: See TracChangeset for help on using the changeset viewer.