Skip to content

Commit aca6c22

Browse files
author
Federico Fissore
committed
MacOSX: previous better IDE was missing some pieces. Added
1 parent e327bb0 commit aca6c22

File tree

5 files changed

+28
-22
lines changed

5 files changed

+28
-22
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ build/macosx/libastylej*
3131
build/macosx/appbundler*.jar
3232
build/macosx/appbundler*.zip
3333
build/macosx/appbundler
34+
build/macosx/appbundler-1.0ea-arduino2
3435
build/linux/work/
3536
build/linux/dist/*.tar.gz
3637
build/linux/dist/*.tar.bz2

arduino-core/src/processing/app/helpers/CommandlineParser.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,10 @@ private void parseArguments(String[] args) {
6363
action = a;
6464
continue;
6565
}
66+
if (args[i].startsWith("-psn")) {
67+
//discard
68+
continue;
69+
}
6670
if (args[i].equals("--verbose") || args[i].equals("-v")) {
6771
doVerboseBuild = true;
6872
doVerboseUpload = true;

build/build.xml

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -248,30 +248,31 @@
248248

249249
<target name="macosx-java-latest-build" if="macosx" depends="revision-check, macosx-checkos, subprojects-build" description="Build Mac OS X version">
250250
<antcall target="unzip">
251-
<param name="archive_file" value="${staging_folder}/appbundler-1.0ea-arduino.jar.zip" />
252-
<param name="archive_url" value="http://arduino.cc/download.php?f=/appbundler-1.0ea-arduino.jar.zip" />
253-
<param name="final_folder" value="${staging_folder}/appbundler" />
254-
<param name="dest_folder" value="${staging_folder}/appbundler" />
251+
<param name="archive_file" value="${staging_folder}/appbundler-1.0ea-arduino2.jar.zip" />
252+
<param name="archive_url" value="http://arduino.cc/download.php?f=/appbundler-1.0ea-arduino2.jar.zip" />
253+
<param name="final_folder" value="${staging_folder}/appbundler-1.0ea-arduino2" />
254+
<param name="dest_folder" value="${staging_folder}/appbundler-1.0ea-arduino2" />
255255
</antcall>
256256

257257
<mkdir dir="${staging_folder}/work" />
258258

259-
<taskdef name="bundleapp" classname="com.oracle.appbundler.AppBundlerTask" classpath="${staging_folder}/appbundler/appbundler-1.0ea.jar"/>
260-
261-
<bundleapp outputDirectory="${staging_folder}/work"
262-
name="Arduino"
263-
displayName="Arduino"
264-
executableName="Arduino"
265-
identifier="cc.arduino.Arduino"
266-
signature="Pde1"
267-
icon="macosx/template.app/Contents/Resources/processing.icns"
268-
copyright="Arduino LLC"
269-
getInfo="${version}"
270-
shortVersion="${version}"
271-
version="${revision}"
272-
mainClassName="processing.app.Base"
273-
minimumsystem="10.7"
274-
highresolutioncapable="true">
259+
<taskdef name="bundleapp" classname="com.oracle.appbundler.AppBundlerTask" classpath="${staging_folder}/appbundler-1.0ea-arduino2/appbundler-1.0ea-arduino2.jar"/>
260+
261+
<bundleapp
262+
jvmRequired="1.7"
263+
outputdirectory="${staging_folder}/work"
264+
name="Arduino"
265+
displayname="Arduino"
266+
executablename="Arduino"
267+
identifier="cc.arduino.Arduino"
268+
shortversion="${version}"
269+
version="${revision}"
270+
signature="Pde1"
271+
icon="macosx/template.app/Contents/Resources/processing.icns"
272+
mainclassname="processing.app.Base"
273+
copyright="Arduino LLC"
274+
minimumsystemversion="10.7"
275+
highresolutioncapable="true">
275276

276277
<arch name="x86_64"/>
277278
<arch name="i386"/>
@@ -295,7 +296,7 @@
295296
<!--<option value="-Dcom.apple.macos.useScreenMenuBar=true"/>-->
296297

297298
<!-- Workaround since the icon parameter for bundleapp doesn't work -->
298-
<option value="-Xdock:icon=Contents/Resources/processing.icns"/>
299+
<option value="-Xdock:name=Arduino"/>
299300
<option value="-Dcom.apple.mrj.application.apple.menu.about.name=Arduino"/>
300301
<option value="-Dfile.encoding=UTF-8"/>
301302

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

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
929bc65f3ba6ecb868254a6328f8502ad86fe4e5

0 commit comments

Comments
 (0)