Skip to content

Commit ab1ee51

Browse files
cmagliecmaglie
committed
MacOSX: switched to appbundler for building distribution files (Haavar Valeur)
See arduino#1665
1 parent 777692a commit ab1ee51

File tree

2 files changed

+66
-39
lines changed

2 files changed

+66
-39
lines changed

‎app/src/processing/app/macosx/Platform.java

+5
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,11 @@ public void setLookAndFeel() throws Exception {
5252
UIManager.put("Component.visualMargin", new Insets(1, 1, 1, 1));
5353
}
5454

55+
public Platform() {
56+
// For more information see:
57+
// http://mail.openjdk.java.net/pipermail/macosx-port-dev/2013-January/005261.html
58+
Toolkit.getDefaultToolkit();
59+
}
5560

5661
public void init(Base base) {
5762
System.setProperty("apple.laf.useScreenMenuBar", "true");

‎build/build.xml

+61-39
Original file line numberDiff line numberDiff line change
@@ -207,23 +207,48 @@
207207
<target name="macosx-build" if="macosx" depends="revision-check, macosx-checkos, subprojects-build" description="Build Mac OS X version">
208208
<mkdir dir="macosx/work" />
209209

210-
<!-- assemble the pde -->
211-
<copy todir="macosx/work/Arduino.app">
212-
<fileset dir="macosx/template.app" includes="**"/>
213-
</copy>
214-
215-
<!-- <rename src="macosx/work/template.app"
216-
dest="macosx/work/Arduino.app" />
217-
<move file="macosx/work/template.app"
218-
tofile="macosx/work/Arduino.app" />-->
219-
220-
<chmod file="macosx/work/Arduino.app/Contents/MacOS/JavaApplicationStub" perm="755" />
221-
222-
<copy todir="macosx/work/Arduino.app/Contents/Resources/Java" flatten="true">
223-
<fileset refid="runtime.jars"/>
224-
</copy>
225-
226-
<copy todir="macosx/work/Arduino.app/Contents/Resources/Java">
210+
<get src="http://downloads.arduino.cc/appbundler-1.0-arduino.jar" dest="macosx" usetimestamp="true" skipexisting="true" />
211+
212+
<taskdef name="bundleapp" classname="com.oracle.appbundler.AppBundlerTask" classpath="macosx/appbundler-1.0-arduino.jar" />
213+
214+
<bundleapp outputdirectory="macosx/work"
215+
name="Arduino"
216+
displayname="Arduino"
217+
shortversion="${version}"
218+
icon="macosx/template.app/Contents/Resources/processing.icns"
219+
identifier="cc.arduino.Arduino"
220+
mainclassname="processing.app.Base">
221+
222+
<documentType name="Arduino Source File"
223+
icon="macosx/template.app/Contents/Resources/pde.icns"
224+
role="Editor">
225+
<extension>ino</extension>
226+
<extension>c</extension>
227+
<extension>cpp</extension>
228+
<extension>h</extension>
229+
<mimeType>text/plain</mimeType>
230+
<osType>TEXT</osType>
231+
</documentType>
232+
233+
<classpath file="../app/pde.jar" />
234+
<classpath file="../core/core.jar" />
235+
<classpath dir="../app/lib" includes="*.jar"/>
236+
237+
<option value="-Djavaroot=$APP_ROOT/Contents/Java"/>
238+
<option value="-Xms128M"/>
239+
<option value="-Xmx256M"/>
240+
<option value="-Dapple.laf.useScreenMenuBar=true"/>
241+
<option value="-Dapple.awt.showGrowBox=false"/>
242+
<option value="-Dcom.apple.smallTabs=true"/>
243+
<option value="-Dapple.awt.Antialiasing=false"/>
244+
<option value="-Dapple.awt.TextAntialiasing=true"/>
245+
<option value="-Dcom.apple.hwaccel=true"/>
246+
<option value="-Dapple.awt.use-file-dialog-packages=false"/>
247+
<option value="-Dapple.awt.graphics.UseQuartz=true"/>
248+
<option value="-Dapple.awt.application.name=Arduino"/>
249+
</bundleapp>
250+
251+
<copy todir="macosx/work/Arduino.app/Contents/Java">
227252
<fileset dir="shared" includes="lib/**" />
228253
<fileset file="shared/revisions.txt" />
229254
</copy>
@@ -235,22 +260,22 @@
235260
<arg value="-q" />
236261
<arg value="-n" />
237262
<arg value="-d" />
238-
<arg value="macosx/work/Arduino.app/Contents/Resources/Java/hardware" />
263+
<arg value="macosx/work/Arduino.app/Contents/Java/hardware" />
239264
<arg value="macosx/dist/tools-universal.zip" />
240265
</exec>
241266

242-
<copy todir="macosx/work/Arduino.app/Contents/Resources/Java/hardware/tools/">
267+
<copy todir="macosx/work/Arduino.app/Contents/Java/hardware/tools/">
243268
<fileset file="macosx/dist/bossac" />
244269
</copy>
245270

246-
<chmod file="macosx/work/Arduino.app/Contents/Resources/Java/hardware/tools/bossac" perm="+x" />
271+
<chmod file="macosx/work/Arduino.app/Contents/Java/hardware/tools/bossac" perm="+x" />
247272

248-
<copy todir="macosx/work/Arduino.app/Contents/Resources/Java/hardware/tools/avr/avr/include/avr">
273+
<copy todir="macosx/work/Arduino.app/Contents/Java/hardware/tools/avr/avr/include/avr">
249274
<fileset file="macosx/dist/eeprom.h" />
250275
</copy>
251276

252277
<antcall target="assemble">
253-
<param name="target.path" value="macosx/work/Arduino.app/Contents/Resources/Java" />
278+
<param name="target.path" value="macosx/work/Arduino.app/Contents/Java" />
254279
</antcall>
255280

256281
<antcall target="unzip-arm-toolchain">
@@ -260,20 +285,22 @@
260285
</antcall>
261286

262287
<delete includeEmptyDirs="true" quiet="true">
263-
<fileset dir="macosx/work/Arduino.app/Contents/Resources/Java/hardware/tools" includes="**/3.4.6/**/*"/>
264-
<fileset dir="macosx/work/Arduino.app/Contents/Resources/Java/hardware/tools" includes="**/3.4.6"/>
265-
<fileset dir="macosx/work/Arduino.app/Contents/Resources/Java/hardware/tools" includes="**/man/**/*"/>
266-
<fileset dir="macosx/work/Arduino.app/Contents/Resources/Java/hardware/tools" includes="**/man"/>
288+
<fileset dir="macosx/work/Arduino.app/Contents/Java/hardware/tools" includes="**/3.4.6/**/*"/>
289+
<fileset dir="macosx/work/Arduino.app/Contents/Java/hardware/tools" includes="**/3.4.6"/>
290+
<fileset dir="macosx/work/Arduino.app/Contents/Java/hardware/tools" includes="**/man/**/*"/>
291+
<fileset dir="macosx/work/Arduino.app/Contents/Java/hardware/tools" includes="**/man"/>
267292
</delete>
268293

269294
<get src="http://downloads.arduino.cc/libastylej-2.03.zip" dest="macosx" usetimestamp="true" skipexisting="true"/>
270295
<unzip src="macosx/libastylej-2.03.zip" dest="macosx" overwrite="true"/>
271-
<copy file="macosx/libastylej/libastylej.jnilib" todir="macosx/work/Arduino.app/Contents/Resources/Java/lib/" />
272-
<chmod perm="755" file="macosx/work/Arduino.app/Contents/Resources/Java/lib/libastylej.jnilib" />
296+
<copy file="macosx/libastylej/libastylej.jnilib" todir="macosx/work/Arduino.app/Contents/Java/lib/" />
297+
<chmod perm="755" file="macosx/work/Arduino.app/Contents/Java/lib/libastylej.jnilib" />
273298
</target>
274299

275300
<target name="macosx-run" depends="macosx-build" description="Run Mac OS X version">
276-
<exec executable="macosx/work/Arduino.app/Contents/MacOS/JavaApplicationStub" spawn="true"/>
301+
<exec executable="open" dir="macosx/work">
302+
<arg value="Arduino.app"/>
303+
</exec>
277304
</target>
278305

279306
<target name="macosx-debug" depends="macosx-build" description="Run Mac OS X version">
@@ -339,18 +366,13 @@
339366
<!-- The ant copy command does not preserve permissions. -->
340367
<chmod file="macosx/work/Arduino.app/Contents/MacOS/JavaApplicationStub" perm="+x" />
341368
<chmod perm="+x">
342-
<fileset dir="macosx/work/Arduino.app/Contents/Resources/Java/hardware/tools/avr/bin" includes="**/*" />
343-
<fileset dir="macosx/work/Arduino.app/Contents/Resources/Java/hardware/tools/avr/avr/bin" includes="**/*" />
344-
<fileset dir="macosx/work/Arduino.app/Contents/Resources/Java/hardware/tools/avr/avr-3/bin" includes="**/*" />
345-
<fileset dir="macosx/work/Arduino.app/Contents/Resources/Java/hardware/tools/avr/avr-4/bin" includes="**/*" />
346-
<fileset dir="macosx/work/Arduino.app/Contents/Resources/Java/hardware/tools/avr/libexec/gcc/avr/4.3.2/" includes="**/cc1*" />
369+
<fileset dir="macosx/work/Arduino.app/Contents/Java/hardware/tools/avr/bin" includes="**/*" />
370+
<fileset dir="macosx/work/Arduino.app/Contents/Java/hardware/tools/avr/avr/bin" includes="**/*" />
371+
<fileset dir="macosx/work/Arduino.app/Contents/Java/hardware/tools/avr/avr-3/bin" includes="**/*" />
372+
<fileset dir="macosx/work/Arduino.app/Contents/Java/hardware/tools/avr/avr-4/bin" includes="**/*" />
373+
<fileset dir="macosx/work/Arduino.app/Contents/Java/hardware/tools/avr/libexec/gcc/avr/4.3.2/" includes="**/cc1*" />
347374
</chmod>
348375

349-
<replace file="macosx/work/Arduino.app/Contents/Info.plist"
350-
token="VERSION" value="${version}" />
351-
<replace file="macosx/work/Arduino.app/Contents/Info.plist"
352-
token="REVISION" value="${revision}" />
353-
354376
<exec executable="zip" dir="macosx/work">
355377
<arg line="-q -r ../arduino-${version}-${platform}.zip ." />
356378
</exec>

0 commit comments

Comments
 (0)