Skip to content

Commit

Permalink
MacOSX: patched appbundler so that bundled JVM does NOT load jars fro…
Browse files Browse the repository at this point in the history
…m /Library/Java/Extensions
  • Loading branch information
Federico Fissore committed Aug 19, 2015
1 parent 8de4715 commit 0c2498a
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 6 deletions.
11 changes: 6 additions & 5 deletions build/build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -275,13 +275,13 @@
<mkdir dir="${staging_folder}/work" />

<antcall target="unzip">
<param name="archive_file" value="${staging_folder}/appbundler-1.0ea-arduino3.jar.zip" />
<param name="archive_url" value="http://downloads.arduino.cc/appbundler-1.0ea-arduino3.jar.zip" />
<param name="final_folder" value="${staging_folder}/appbundler-1.0ea-arduino3" />
<param name="dest_folder" value="${staging_folder}/appbundler-1.0ea-arduino3" />
<param name="archive_file" value="${staging_folder}/appbundler-1.0ea-arduino4.jar.zip" />
<param name="archive_url" value="http://downloads.arduino.cc/appbundler-1.0ea-arduino4.jar.zip" />
<param name="final_folder" value="${staging_folder}/appbundler-1.0ea-arduino4" />
<param name="dest_folder" value="${staging_folder}/appbundler-1.0ea-arduino4" />
</antcall>

<taskdef name="bundleapp" classname="com.oracle.appbundler.AppBundlerTask" classpath="${staging_folder}/appbundler-1.0ea-arduino3/appbundler-1.0ea-arduino3.jar"/>
<taskdef name="bundleapp" classname="com.oracle.appbundler.AppBundlerTask" classpath="${staging_folder}/appbundler-1.0ea-arduino4/appbundler-1.0ea-arduino4.jar"/>

<bundleapp
jvmRequired="1.8"
Expand Down Expand Up @@ -314,6 +314,7 @@
<option value="-Dcom.apple.smallTabs=true"/>
<option value="-Dcom.apple.macos.useScreenMenuBar=true"/>
<option value="-DAPP_DIR=$APP_ROOT/Contents/Java"/>
<option value="-Djava.ext.dirs=$JVM_RUNTIME/Contents/Home/jre/lib/ext/"/>

<!--
<option value="-Dapple.awt.showGrowBox=false"/>
Expand Down
1 change: 0 additions & 1 deletion build/macosx/appbundler-1.0ea-arduino3.jar.zip.sha

This file was deleted.

1 change: 1 addition & 0 deletions build/macosx/appbundler-1.0ea-arduino4.jar.zip.sha
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
89ef9e3ab1572e0bf2edfae2c9d6c0a03dcf2665

0 comments on commit 0c2498a

Please sign in to comment.