arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-08-09 22:24:14 +03:00
Code Activity

Merge commit 'fcbbf8f4b4960bae1091c0cd9dc58b4a1885baf6' into platforms-b

Browse Source 
Conflicts:
	app/src/processing/app/Base.java
	app/src/processing/app/debug/Compiler.java
	build/build.xml
	hardware/arduino/boards.txt
This commit is contained in:
Cristian Maglie
2011-12-22 00:35:33 +01:00
parent 24a0dfdf00 fcbbf8f4b4
commit 65c15d93eb
10 changed files with 756 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
build/build.xml
View File

@@ -217,6 +217,10 @@
<exec executable="macosx/work/Arduino.app/Contents/MacOS/JavaApplicationStub" spawn="true"/>
</target>
<target name="macosx-debug" depends="macosx-build" description="Run Mac OS X version">
<exec executable="macosx/work/Arduino.app/Contents/MacOS/JavaApplicationStub" spawn="false"/>
</target>
<target name="macosx-dist" if="macosx" depends="macosx-build" description="Create a downloadable .zip for the Mac OS X version">
<!-- The ant copy command does not preserve permissions. -->
<chmod file="macosx/work/Arduino.app/Contents/MacOS/JavaApplicationStub" perm="+x" />

2
build/shared/lib/preferences.txt
View File

@@ -239,6 +239,8 @@ run.present.exclusive.macosx = true
# ARDUINO PREFERENCES
board = uno
target = arduino
platform = avr
software=ARDUINO
programmer = arduino:avrispmkii