Skip to content

Commit 0c2498a

Browse files
author
Federico Fissore
committed
MacOSX: patched appbundler so that bundled JVM does NOT load jars from /Library/Java/Extensions
1 parent 8de4715 commit 0c2498a

File tree

3 files changed

+7
-6
lines changed

3 files changed

+7
-6
lines changed

build/build.xml

+6-5
Original file line numberDiff line numberDiff line change
@@ -275,13 +275,13 @@
275275
<mkdir dir="${staging_folder}/work" />
276276

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

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

286286
<bundleapp
287287
jvmRequired="1.8"
@@ -314,6 +314,7 @@
314314
<option value="-Dcom.apple.smallTabs=true"/>
315315
<option value="-Dcom.apple.macos.useScreenMenuBar=true"/>
316316
<option value="-DAPP_DIR=$APP_ROOT/Contents/Java"/>
317+
<option value="-Djava.ext.dirs=$JVM_RUNTIME/Contents/Home/jre/lib/ext/"/>
317318

318319
<!--
319320
<option value="-Dapple.awt.showGrowBox=false"/>

build/macosx/appbundler-1.0ea-arduino3.jar.zip.sha

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
89ef9e3ab1572e0bf2edfae2c9d6c0a03dcf2665

0 commit comments

Comments
 (0)