'refine windows_dist' does not work on MacOS Lion

[GoogleCodeExporter]

The current version of launch4j (3.0.1 and 3.0.2, too) does not work on MacOS 
Lion, see 
http://sourceforge.net/tracker/index.php?func=detail&aid=3385595&group_id=95944&
atid=613100

The launch4j CVS contains updated versions of the two binaries that cause 
problems, so changing method launch4j_prepare 'refine' from

launch4j_prepare() {
    tools_prepare

    if [ "$OS" = "macosx" ] ; then
        LAUNCH4J_URL="http://downloads.sourceforge.net/project/launch4j/launch4j-3/3.0.1/launch4j-3.0.1-macosx.tgz"
    elif [ "$OS" = "windows" ] ; then
        LAUNCH4J_URL="http://downloads.sourceforge.net/project/launch4j/launch4j-3/3.0.1/launch4j-3.0.1-win32.zip"
    elif [ "$OS" = "linux" ] ; then
        LAUNCH4J_URL="http://downloads.sourceforge.net/project/launch4j/launch4j-3/3.0.1/launch4j-3.0.1-linux.tgz"
    fi

    LAUNCH4J_FILE=`echo $LAUNCH4J_URL | sed 's|.*/||'`
    LAUNCH4J_DIR="launch4j"

    tool_download $LAUNCH4J_URL $LAUNCH4J_FILE $LAUNCH4J_DIR
}

to

launch4j_prepare() {
    tools_prepare

    if [ "$OS" = "macosx" ] ; then
        LAUNCH4J_URL="http://downloads.sourceforge.net/project/launch4j/launch4j-3/3.0.1/launch4j-3.0.1-macosx.tgz"
    elif [ "$OS" = "windows" ] ; then
        LAUNCH4J_URL="http://downloads.sourceforge.net/project/launch4j/launch4j-3/3.0.1/launch4j-3.0.1-win32.zip"
    elif [ "$OS" = "linux" ] ; then
        LAUNCH4J_URL="http://downloads.sourceforge.net/project/launch4j/launch4j-3/3.0.1/launch4j-3.0.1-linux.tgz"
    fi

    LAUNCH4J_FILE=`echo $LAUNCH4J_URL | sed 's|.*/||'`
    LAUNCH4J_DIR="launch4j"

    tool_download $LAUNCH4J_URL $LAUNCH4J_FILE $LAUNCH4J_DIR

    # launch4j 3.0.1 currently does not work on MacOS Lion so we patch it; the following two lines can be removed once we update to a more recent version of launch4j
    download "http://launch4j.cvs.sourceforge.net/viewvc/launch4j/launch4j/bin/bin-macosx-x86/windres" $ARIS_TOOLS_DIR/launch4j/bin/windres
    download "http://launch4j.cvs.sourceforge.net/viewvc/launch4j/launch4j/bin/bin-macosx-x86/ld" $ARIS_TOOLS_DIR/launch4j/bin/ld
}

makes it work.

Original issue reported on code.google.com by kaspar.f...@dreizak.com on 11 Apr 2012 at 10:16

[GoogleCodeExporter]

Thanks for the problem report and fix.  Any chance you could provide the fix in 
the form of a patch to minimize the chances that we screw it up when applying 
it?

Original comment by tfmorris on 11 Apr 2012 at 2:17

• Changed state: Accepted

[GoogleCodeExporter]

Here you go. Cheers!

Original comment by kaspar.f...@dreizak.com on 11 Apr 2012 at 2:28

Attachments:

• patch.diff

[GoogleCodeExporter]

Fixed in r2490.  I added a conditional to the patch so that it only executes on 
MacOS.  I also updated Launch4J from 3.0.1 to 3.0.2.

Original comment by tfmorris on 11 Apr 2012 at 4:56

• Changed state: Fixed

[GoogleCodeExporter]

Original comment by tfmorris on 18 Sep 2012 at 3:05

• Added labels: Milestone-2.6