Changeset 28728 for other-projects

Show
Ignore:
Timestamp:
02.12.2013 16:57:33 (6 years ago)
Author:
ak19
Message:

Expeditee team (jts21). Modify release kits to generate a working Mac app (hopefully - to be tested)

Location:
other-projects/expeditee-release-kits
Files:
1 removed
3 modified

Legend:

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

    r28725 r28728  
    2222 
    2323        <!-- copy search4j --> 
    24         <if><bool><or><equals arg1="${rk.os}" arg2="mac"/><equals arg1="${rk.os}" arg2="linux"/></or></bool> 
     24        <if><bool><equals arg1="${rk.os}" arg2="linux"/></bool> 
    2525            <exec dir="${rk.home}/shared/core/search4j" executable="./configure" failonerror="true"/> 
    2626            <exec dir="${rk.home}/shared/core/search4j" executable="make" failonerror="true"/> 
     
    3131            <copy file="${rk.home}/shared/core/search4j/search4j.exe" todir="${basedir}/compiled/bin" /> 
    3232        </if> 
    33  
    3433        <!-- copy run scripts --> 
    35         <copy todir="${basedir}/compiled"> 
    36             <fileset dir="${rk.home}/scripts"> 
    37                 <include name="**" /> 
    38             </fileset> 
    39         </copy> 
     34        <if><bool><or><equals arg1="${rk.os}" arg2="linux"/><equals arg1="${rk.os}" arg2="windows"/></or></bool> 
     35            <copy todir="${basedir}/compiled"> 
     36                <fileset dir="${rk.home}/scripts"> 
     37                    <include name="**" /> 
     38                </fileset> 
     39            </copy> 
     40        </if> 
    4041    </target> 
    4142 
  • other-projects/expeditee-release-kits/kits/rke/ant-scripts/wrap.xml

    r28726 r28728  
    6666            </exec> 
    6767 
    68         <!-- (linux and mac) --> 
    69         <else><if><bool><or><equals arg1="${rk.os}" arg2="linux"/><equals arg1="${rk.os}" arg2="mac"/></or></bool> 
     68        <!-- (linux) --> 
     69        <else><if><bool><equals arg1="${rk.os}" arg2="linux"/></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/${rk.os}/wrapper.cpp"/> 
     75                <fileset file="${rk.home}/shared/linux/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/${rk.os}/${java.installer}"/> 
     80            <copy todir="wrapped-installer" file="${rk.home}/shared/linux/${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}-${rk.os}${extension-x64} wrapper.o libsearch4j.o ${projectname}.jar.o java.o"/> 
     138                <arg line="-static -static-libgcc -o ../products/${projectname}-${version}${version-extra}-linux${extension-x64} wrapper.o libsearch4j.o ${projectname}.jar.o java.o"/> 
    139139            </exec> 
    140140 
    141         </if></else></if> 
    142141        <!-- (mac) --> 
    143         <if><bool><equals arg1="${rk.os}" arg2="mac"/></bool> 
     142        <else><if><bool><equals arg1="${rk.os}" arg2="mac"/></bool> 
     143 
     144            <!-- create and setup the build directory --> 
     145            <mkdir dir="wrapped-installer"/> 
    144146 
    145147            <!-- create app for main installer --> 
    146             <copy todir="wrapped-installer/${projectname}${version}${version-extra}.app"> 
    147                 <fileset dir="${rk.home}/shared/mac/Wrapper.app"/> 
    148             </copy> 
     148            <copy todir="wrapped-installer/${projectname}${version}${version-extra}.app"><fileset dir="${rk.home}/shared/mac/Wrapper.app"/></copy> 
    149149            <copy todir="wrapped-installer/${projectname}${version}${version-extra}.app/Contents/Resources" file="${rk.home}/shared/core/icon/icon.icns"/> 
    150             <chmod file="wrapped-installer/${projectname}${version}${version-extra}.app/Contents/MacOS/JavaApplicationStub" perm="ug+x"/> 
     150            <chmod file="wrapped-installer/${projectname}${version}${version-extra}.app/Contents/MacOS/Expeditee" perm="ug+x"/> 
    151151 
    152152            <!-- copy bundled files --> 
    153             <!--  
    154             <copy todir="wrapped-installer/${projectname}${version}${version-extra}.app/Contents/Resources/Java" file="../products/${projectname}-${version}${version-extra}-${rk.os}${extension-x64}"/> 
    155             <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}"/> 
     153            <copy todir="wrapped-installer/${projectname}${version}${version-extra}.app/Contents/Resources"><fileset dir="compiled"/></copy> 
     154            <copy tofile="wrapped-installer/${projectname}${version}${version-extra}.app/Contents/Resources/jre_bin" file="${rk.home}/shared/mac/${java.installer}"/> 
    158155 
    159156            <!-- substitute in real values --> 
    160157            <rsr file="wrapped-installer/${projectname}${version}${version-extra}.app/Contents/Info.plist"> 
    161                 <job pattern="@jar@" replacement="${projectname}-${version}${version-extra}-${os.suffix}.jar"/> 
    162158                <job pattern="@projectname@" replacement="${projectname}"/> 
    163159                <job pattern="@version@" replacement="${version}${version-extra}"/> 
     
    180176            <!-- unmount it--> 
    181177            <exec executable="hdiutil" failonerror="true"><arg line="detach /Volumes/${dmg.name}"/></exec> 
    182         </if> 
     178        </if></else></if></else></if> 
     179 
    183180 
    184181    </target> 
  • other-projects/expeditee-release-kits/shared/mac/Wrapper.app/Contents/Info.plist

    r28727 r28728  
    44<dict> 
    55    <key>CFBundleName</key> 
    6     <string>Expeditee</string> 
     6    <string>@projectname@</string> 
    77    <key>CFBundleVersion</key> 
    8     <string></string> 
     8    <string>@version@</string> 
    99    <key>CFBundleAllowMixedLocalizations</key> 
    1010    <string>true</string>