You are viewing a plain text version of this content. The canonical link for it is here.
Posted to batik-commits@xmlgraphics.apache.org by ca...@apache.org on 2007/01/31 02:07:39 UTC

svn commit: r501667 - in /xmlgraphics/batik/trunk: build.xml sources/make-squiggle-app.sh.template

Author: cam
Date: Tue Jan 30 17:07:38 2007
New Revision: 501667

URL: http://svn.apache.org/viewvc?view=rev&rev=501667
Log:
Make the Squiggle.app in OS X use whatever JRE is given in $JAVA_HOME.

Modified:
    xmlgraphics/batik/trunk/build.xml
    xmlgraphics/batik/trunk/sources/make-squiggle-app.sh.template

Modified: xmlgraphics/batik/trunk/build.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/build.xml?view=diff&rev=501667&r1=501666&r2=501667
==============================================================================
--- xmlgraphics/batik/trunk/build.xml (original)
+++ xmlgraphics/batik/trunk/build.xml Tue Jan 30 17:07:38 2007
@@ -438,7 +438,10 @@
 </plist>]]></echo>
     <echo file="${app}/Contents/MacOS/Squiggle"><![CDATA[#!/bin/sh
 
-/usr/bin/java -Dcom.apple.mrj.application.apple.menu.about.name=Squiggle -jar "`dirname $0`/../Resources/batik-squiggle.jar"
+JAVA=/usr/bin/java
+[ -e "$JAVA_HOME/bin/java" ] && JAVA="$JAVA_HOME/bin/java"
+
+"$JAVA" -Dcom.apple.mrj.application.apple.menu.about.name=Squiggle -jar "`dirname $0`/../Resources/batik-squiggle.jar"
 ]]></echo>
     <chmod perm="a+x" file="${app}/Contents/MacOS/Squiggle"/>
     <copy todir="${app}/Contents/Resources">

Modified: xmlgraphics/batik/trunk/sources/make-squiggle-app.sh.template
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/make-squiggle-app.sh.template?view=diff&rev=501667&r1=501666&r2=501667
==============================================================================
--- xmlgraphics/batik/trunk/sources/make-squiggle-app.sh.template (original)
+++ xmlgraphics/batik/trunk/sources/make-squiggle-app.sh.template Tue Jan 30 17:07:38 2007
@@ -72,7 +72,10 @@
 cat >$MAC/Squiggle <<EOF
 #!/bin/sh
 
-/usr/bin/java -Dcom.apple.mrj.application.apple.menu.about.name=Squiggle -jar "\`dirname \$0\`/../Resources/batik-squiggle.jar"
+JAVA=/usr/bin/java
+[ -e "$JAVA_HOME/bin/java" ] && JAVA="$JAVA_HOME/bin/java"
+
+"$JAVA" -Dcom.apple.mrj.application.apple.menu.about.name=Squiggle -jar "\`dirname \$0\`/../Resources/batik-squiggle.jar"
 EOF
 chmod a+x $MAC/Squiggle