Changeset 29354 for other-projects

Show
Ignore:
Timestamp:
08.10.2014 19:15:02 (5 years ago)
Author:
ak19
Message:

Got Expeditee Mac installer working. Installer is read-only, and if a user attempts to run Expeditee from within the installer, an error message is displayed telling them to install it first.

Location:
other-projects/expeditee-release-kits
Files:
2 modified

Legend:

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

    r29353 r29354  
    184184            <property name="dmg.name" value="${projectname}-${version}${version-extra}-${os.suffix}"/> 
    185185            <exec dir="products" executable="hdiutil" failonerror="true"> 
    186                 <arg line="create -ov -size ${dmg.size}k -fs HFS+ -volname ${dmg.name} ${dmg.name}.dmg"/> 
     186                <arg line="create -ov -size ${dmg.size}k -fs HFS+ -volname ${dmg.name} building.dmg"/> 
    187187            </exec> 
    188188            <!-- mount it --> 
    189189            <exec executable="hdiutil" dir="products" failonerror="true"> 
    190                 <arg line="attach ${dmg.name}.dmg"/> 
     190                <arg line="attach building.dmg"/> 
    191191            </exec> 
    192192            <!-- copy file into it --> 
     
    215215            </exec> 
    216216            <!-- format as readonly --> 
    217             <exec executable="hdiutil" failonerror="true"> 
    218                 <arg line="convert ${dmg.name}.dmg -format UDRO -o ${dmg.name}.dmg"/> 
     217            <exec dir="products" executable="hdiutil" failonerror="true"> 
     218                <arg line="convert building.dmg -format UDRO -o ${dmg.name}.dmg"/> 
    219219            </exec> 
     220            <delete file="products/building.dmg" /> 
    220221 
    221222        </if></else></if></else></if> 
  • other-projects/expeditee-release-kits/shared/mac/Wrapper.app/Contents/MacOS/Expeditee

    r28727 r29354  
    44cd "$BINDIR/.." 
    55BASEDIR="`pwd`" 
    6 [[ -e "$BASEDIR/Resources/jre_bin" ]] && chmod +x "$BASEDIR/Resources/jre_bin" && "$BASEDIR/Resources/jre_bin" -o"$BASEDIR/Resources" && rm "$BASEDIR/Resources/jre_bin" 
    7 "$BASEDIR/Resources/jre/bin/java" -jar "$BASEDIR/Resources/Expeditee.jar" 
     6if [[ -w $BASEDIR ]]; then 
     7    [[ -e "$BASEDIR/Resources/jre_bin" ]] && chmod +x "$BASEDIR/Resources/jre_bin" && "$BASEDIR/Resources/jre_bin" -o"$BASEDIR/Resources" && rm "$BASEDIR/Resources/jre_bin" 
     8    "$BASEDIR/Resources/jre/bin/java" -jar "$BASEDIR/Resources/Expeditee.jar" 
     9else 
     10    # display error message 
     11    # see: https://developer.apple.com/library/mac/documentation/AppleScript/Conceptual/AppleScriptLangGuide/reference/ASLR_cmds.html#//apple_ref/doc/uid/TP40000983-CH216-SW11 
     12    osascript -e 'tell app "System Events" to display alert "To install Expeditee, drag and drop the app wherever you would like to install it (such as the Applications folder or your desktop).\nOnce Expeditee is installed, you can close this installer window and run Expeditee by double-clicking on the installed app" as warning giving up after 10' 
     13fi