arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-06-15 00:02:49 +03:00
Code Activity

MacOSX: previous better IDE was missing some pieces. Added

Browse Source
This commit is contained in:
Federico Fissore
2015-03-04 11:23:36 +01:00
parent e327bb091a
commit aca6c223de
5 changed files with 27 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -31,6 +31,7 @@ build/macosx/libastylej*
build/macosx/appbundler*.jar build/macosx/appbundler*.jar
build/macosx/appbundler*.zip build/macosx/appbundler*.zip
build/macosx/appbundler build/macosx/appbundler
build/macosx/appbundler-1.0ea-arduino2
build/linux/work/ build/linux/work/
build/linux/dist/*.tar.gz build/linux/dist/*.tar.gz
build/linux/dist/*.tar.bz2 build/linux/dist/*.tar.bz2

4
arduino-core/src/processing/app/helpers/CommandlineParser.java
View File

@ -63,6 +63,10 @@ public class CommandlineParser {
action = a; action = a;
continue; continue;
} }
if (args[i].startsWith("-psn")) {
//discard
continue;
}
if (args[i].equals("--verbose") || args[i].equals("-v")) { if (args[i].equals("--verbose") || args[i].equals("-v")) {
doVerboseBuild = true; doVerboseBuild = true;
doVerboseUpload = true; doVerboseUpload = true;

41
build/build.xml
View File

@ -248,30 +248,31 @@
<target name="macosx-java-latest-build" if="macosx" depends="revision-check, macosx-checkos, subprojects-build" description="Build Mac OS X version"> <target name="macosx-java-latest-build" if="macosx" depends="revision-check, macosx-checkos, subprojects-build" description="Build Mac OS X version">
<antcall target="unzip"> <antcall target="unzip">
<param name="archive_file" value="${staging_folder}/appbundler-1.0ea-arduino.jar.zip" /> <param name="archive_file" value="${staging_folder}/appbundler-1.0ea-arduino2.jar.zip" />
<param name="archive_url" value="http://arduino.cc/download.php?f=/appbundler-1.0ea-arduino.jar.zip" /> <param name="archive_url" value="http://arduino.cc/download.php?f=/appbundler-1.0ea-arduino2.jar.zip" />
<param name="final_folder" value="${staging_folder}/appbundler" /> <param name="final_folder" value="${staging_folder}/appbundler-1.0ea-arduino2" />
<param name="dest_folder" value="${staging_folder}/appbundler" /> <param name="dest_folder" value="${staging_folder}/appbundler-1.0ea-arduino2" />
</antcall> </antcall>
<mkdir dir="${staging_folder}/work" /> <mkdir dir="${staging_folder}/work" />
<taskdef name="bundleapp" classname="com.oracle.appbundler.AppBundlerTask" classpath="${staging_folder}/appbundler/appbundler-1.0ea.jar"/> <taskdef name="bundleapp" classname="com.oracle.appbundler.AppBundlerTask" classpath="${staging_folder}/appbundler-1.0ea-arduino2/appbundler-1.0ea-arduino2.jar"/>
<bundleapp outputDirectory="${staging_folder}/work" <bundleapp
name="Arduino" jvmRequired="1.7"
displayName="Arduino" outputdirectory="${staging_folder}/work"
executableName="Arduino" name="Arduino"
identifier="cc.arduino.Arduino" displayname="Arduino"
signature="Pde1" executablename="Arduino"
icon="macosx/template.app/Contents/Resources/processing.icns" identifier="cc.arduino.Arduino"
copyright="Arduino LLC" shortversion="${version}"
getInfo="${version}" version="${revision}"
shortVersion="${version}" signature="Pde1"
version="${revision}" icon="macosx/template.app/Contents/Resources/processing.icns"
mainClassName="processing.app.Base" mainclassname="processing.app.Base"
minimumsystem="10.7" copyright="Arduino LLC"
highresolutioncapable="true"> minimumsystemversion="10.7"
highresolutioncapable="true">
<arch name="x86_64"/> <arch name="x86_64"/>
<arch name="i386"/> <arch name="i386"/>
@ -295,7 +296,7 @@
<!--<option value="-Dcom.apple.macos.useScreenMenuBar=true"/>--> <!--<option value="-Dcom.apple.macos.useScreenMenuBar=true"/>-->
<!-- Workaround since the icon parameter for bundleapp doesn't work --> <!-- Workaround since the icon parameter for bundleapp doesn't work -->
<option value="-Xdock:icon=Contents/Resources/processing.icns"/> <option value="-Xdock:name=Arduino"/>
<option value="-Dcom.apple.mrj.application.apple.menu.about.name=Arduino"/> <option value="-Dcom.apple.mrj.application.apple.menu.about.name=Arduino"/>
<option value="-Dfile.encoding=UTF-8"/> <option value="-Dfile.encoding=UTF-8"/>

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

@ -1 +0,0 @@
20da27cce14b7c60d6ef2e2cac2f60df491c8e21

1
build/macosx/appbundler-1.0ea-arduino2.jar.zip.sha Normal file
View File

@ -0,0 +1 @@
929bc65f3ba6ecb868254a6328f8502ad86fe4e5