s434730/RandomSec
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

issue 558 - update to Launch4J 3.0.2 and add MacOS Lion workaround (thanks to Kaspar Fischer)

Browse Source 
git-svn-id: http://google-refine.googlecode.com/svn/trunk@2490 7d457c2a-affb-35e4-300a-418c747d4874
This commit is contained in:
Tom Morris 2012-04-11 16:53:21 +00:00
parent b15fc020c6
commit db300c1dca
1 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
refine
View File

@ -326,17 +326,34 @@ launch4j_prepare() {
tools_prepare tools_prepare
if [ "$OS" = "macosx" ] ; then if [ "$OS" = "macosx" ] ; then
LAUNCH4J_URL="http://downloads.sourceforge.net/project/launch4j/launch4j-3/3.0.1/launch4j-3.0.1-macosx.tgz" LAUNCH4J_URL="http://downloads.sourceforge.net/project/launch4j/launch4j-3/3.0.2/launch4j-3.0.2-macosx.tgz"
elif [ "$OS" = "windows" ] ; then elif [ "$OS" = "windows" ] ; then
LAUNCH4J_URL="http://downloads.sourceforge.net/project/launch4j/launch4j-3/3.0.1/launch4j-3.0.1-win32.zip" LAUNCH4J_URL="http://downloads.sourceforge.net/project/launch4j/launch4j-3/3.0.2/launch4j-3.0.2-win32.zip"
elif [ "$OS" = "linux" ] ; then elif [ "$OS" = "linux" ] ; then
LAUNCH4J_URL="http://downloads.sourceforge.net/project/launch4j/launch4j-3/3.0.1/launch4j-3.0.1-linux.tgz" LAUNCH4J_URL="http://downloads.sourceforge.net/project/launch4j/launch4j-3/3.0.2/launch4j-3.0.2-linux.tgz"
fi fi
LAUNCH4J_FILE=`echo $LAUNCH4J_URL | sed 's|.*/||'` LAUNCH4J_FILE=`echo $LAUNCH4J_URL | sed 's|.*/||'`
LAUNCH4J_DIR="launch4j" LAUNCH4J_DIR="launch4j"
tool_download $LAUNCH4J_URL $LAUNCH4J_FILE $LAUNCH4J_DIR tool_download $LAUNCH4J_URL $LAUNCH4J_FILE $LAUNCH4J_DIR
# Workaround: launch4j 3.0.2 & earlier does not work on versions of MacOS
# without PPC support (e.g. Lion) so we patch it to include Intel binaries;
# the following lines can be removed once we update to a version of
# launch4j that fixes the issue (not available yet).
if [ "$OS" = "macosx" ] ; then
if [ ! -f "$REFINE_TOOLS_DIR/launch4j/bin/windres.bak" ] ; then
mv "$REFINE_TOOLS_DIR/launch4j/bin/windres" "$REFINE_TOOLS_DIR/launch4j/bin/windres.bak"
download "http://launch4j.cvs.sourceforge.net/viewvc/launch4j/launch4j/bin/bin-macosx-x86/windres" $REFINE_TOOLS_DIR/launch4j/bin/windres
chmod +x "$REFINE_TOOLS_DIR/launch4j/bin/windres"
fi
if [ ! -f "$REFINE_TOOLS_DIR/launch4j/bin/ld.bak" ] ; then
mv "$REFINE_TOOLS_DIR/launch4j/bin/ld" "$REFINE_TOOLS_DIR/launch4j/bin/ld.bak"
download "http://launch4j.cvs.sourceforge.net/viewvc/launch4j/launch4j/bin/bin-macosx-x86/ld" $REFINE_TOOLS_DIR/launch4j/bin/ld
chmod +x "$REFINE_TOOLS_DIR/launch4j/bin/ld"
fi
fi
} }
jarbundler_prepare() { jarbundler_prepare() {