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

Merge arduino/master into esp8266

Browse Source 
* commit '71c39489180723b13cabe3c07e3994a239f8a03e':
  Updated translations
  Updated offline docs
  Corrected some email contacts.
  MacOS tests fix: new way of discovering work dir conflicts with tests execution. Fixed.
  Updated build_pull_request.bash
  Renamed mac build from "macosxnew" to "macosx-java-latest"
  Updated revision log. Version set to 1.6.0rc3
  build.xml and mac. Change in platform names: macosx now macosxnew, oldmacosx now macosx
  Fixed bug with paths with spaces
  build_pull_requests now builds oldmacosx as well
  Macosx: new appbundler, new macosx builds. Use platform=macosx and platform=oldmacosx
  build_pull_requests now moves the artifacts to the parent folder: this allows calling "clean" target before each build
  build.xml linux-clean target was not deleting old linux builds
  Fix typos in BlinkWithoutDelay.ino

Conflicts:
	build/build.xml
This commit is contained in:
Ivan Grokhotkov
2015-02-09 17:37:44 +03:00
parent edccc2c158 71c3948918
commit c7e363ca7b
34 changed files with 901 additions and 778 deletions
Download Patch File Download Diff File Expand all files Collapse all files

177
build/build.xml
View File

@ -5,23 +5,33 @@
<!--echo message="os.version = ${os.version}" /-->
<!-- Sets properties for macosx/windows/linux depending on current system -->
<condition property="platform" value="macosx"><os family="mac" /></condition>
<condition property="platform" value="macosx-java-latest"><os family="mac" /></condition>
<condition property="platform" value="macosx">
<and>
<os family="mac" />
<matches string="${os.version}" pattern="^10.[56]." />
</and>
</condition>
<condition property="platform" value="windows"><os family="windows" /></condition>
<condition property="platform" value="linux32"><os family="unix" arch="i386" /></condition>
<condition property="platform" value="linux64"><os family="unix" arch="amd64" /></condition>
<condition property="macosx"><equals arg1="${platform}" arg2="macosx" /></condition>
<condition property="macosx"><equals arg1="${platform}" arg2="macosx-java-latest" /></condition>
<condition property="macosx-java-latest"><equals arg1="${platform}" arg2="macosx-java-latest" /></condition>
<condition property="windows"><equals arg1="${platform}" arg2="windows" /></condition>
<condition property="linux32"><equals arg1="${platform}" arg2="linux32" /></condition>
<condition property="linux64"><equals arg1="${platform}" arg2="linux64" /></condition>
<condition property="linux"><equals arg1="${platform}" arg2="linux32" /></condition>
<condition property="linux"><equals arg1="${platform}" arg2="linux64" /></condition>
<condition property="staging_folder" value="macosx"><equals arg1="${platform}" arg2="macosx-java-latest" /></condition>
<condition property="staging_folder" value="macosx"><equals arg1="${platform}" arg2="macosx" /></condition>
<condition property="staging_folder" value="windows"><equals arg1="${platform}" arg2="windows" /></condition>
<condition property="staging_folder" value="linux"><equals arg1="${platform}" arg2="linux32" /></condition>
<condition property="staging_folder" value="linux"><equals arg1="${platform}" arg2="linux64" /></condition>
<condition property="staging_hardware_folder" value="Arduino.app/Contents/Java/hardware"><equals arg1="${platform}" arg2="macosx-java-latest" /></condition>
<condition property="staging_hardware_folder" value="Arduino.app/Contents/Resources/Java/hardware"><equals arg1="${platform}" arg2="macosx" /></condition>
<condition property="staging_hardware_folder" value="hardware"><equals arg1="${platform}" arg2="windows" /></condition>
<condition property="staging_hardware_folder" value="hardware"><equals arg1="${platform}" arg2="linux32" /></condition>
@ -141,7 +151,12 @@
</copy>
<!-- Unzip documentation -->
<unzip dest="${target.path}" src="shared/reference.zip" overwrite="false"/>
<antcall target="unzip">
<param name="archive_file" value="shared/reference-1.6.0.zip" />
<param name="archive_url" value="http://arduino.cc/download.php?f=/reference-1.6.0.zip" />
<param name="final_folder" value="${target.path}/reference" />
<param name="dest_folder" value="${target.path}" />
</antcall>
<!-- Write the revision file! -->
<echo file="${target.path}/lib/version.txt" message="${version}" />
@ -188,6 +203,8 @@
<!-- Mac OS X -->
<!-- - - - - - - - -->
<target name="macosx-java-latest-clean" depends="macosx-clean" description="Clean Mac OS X build"/>
<target name="macosx-clean" depends="subprojects-clean" description="Clean Mac OS X build">
<delete dir="macosx/work" />
<delete dir="macosx/working_dir" />
@ -228,6 +245,93 @@
<fileset file="shared/revisions.txt" />
</copy>
<antcall target="macosx-build-common"/>
<replace file="macosx/work/Arduino.app/Contents/Info.plist"
token="VERSION" value="${version}" />
<replace file="macosx/work/Arduino.app/Contents/Info.plist"
token="REVISION" value="${revision}" />
</target>
<target name="macosx-java-latest-build" if="macosx" depends="revision-check, macosx-checkos, subprojects-build" description="Build Mac OS X version">
<antcall target="unzip">
<param name="archive_file" value="${staging_folder}/appbundler-1.0ea.jar.zip" />
<param name="archive_url" value="http://arduino.cc/download.php?f=/appbundler-1.0ea.jar.zip" />
<param name="final_folder" value="${staging_folder}/appbundler" />
<param name="dest_folder" value="${staging_folder}/appbundler" />
</antcall>
<mkdir dir="${staging_folder}/work" />
<taskdef name="bundleapp" classname="com.oracle.appbundler.AppBundlerTask" classpath="${staging_folder}/appbundler/appbundler-1.0ea.jar"/>
<bundleapp outputDirectory="${staging_folder}/work"
name="Arduino"
displayName="Arduino"
executableName="Arduino"
identifier="cc.arduino.Arduino"
signature="Pde1"
icon="macosx/template.app/Contents/Resources/processing.icns"
copyright="Arduino LLC"
getInfo="${version}"
shortVersion="${version}"
version="${revision}"
mainClassName="processing.app.Base"
minimumsystem="10.7"
highresolutioncapable="true">
<arch name="x86_64"/>
<arch name="i386"/>
<classpath refid="runtime.jars"/>
<classpath file="./macosx/template.app/Contents/Resources/Java/quaqua.jar"/>
<option value="-Dapple.awt.application.name=Arduino" />
<option value="-Dapple.laf.useScreenMenuBar=true"/>
<option value="-Dcom.apple.macos.use-file-dialog-packages=true"/>
<option value="-Dcom.apple.smallTabs=true"/>
<option value="-Dcom.apple.macos.useScreenMenuBar=true" />
<!--
<option value="-Dapple.awt.showGrowBox=false"/>
<option value="-Dapple.awt.Antialiasing=false"/>
<option value="-Dapple.awt.TextAntialiasing=true"/>
<option value="-Dcom.apple.hwaccel=true"/>
<option value="-Dapple.awt.graphics.UseQuartz=true"/>
-->
<!--<option value="-Dcom.apple.macos.useScreenMenuBar=true"/>-->
<!-- Workaround since the icon parameter for bundleapp doesn't work -->
<option value="-Xdock:icon=Contents/Resources/processing.icns"/>
<option value="-Dcom.apple.mrj.application.apple.menu.about.name=Arduino"/>
<option value="-Dfile.encoding=UTF-8"/>
<option value="-Xms128M"/>
<option value="-Xmx256M"/>
<bundledocument extensions="ino,c,cpp,h"
icon="macosx/template.app/Contents/Resources/pde.icns"
name="Arduino Source File"
role="Editor">
</bundledocument>
</bundleapp>
<copy todir="${staging_folder}/work/${staging_hardware_folder}/../">
<fileset dir="shared" includes="lib/**" />
<fileset file="shared/revisions.txt" />
<file file="macosx/template.app/Contents/Resources/Java/quaqua.jar"/>
<fileset file="macosx/template.app/Contents/Resources/Java/libquaqua*" />
</copy>
<antcall target="macosx-build-common"/>
</target>
<target name="macosx-build-common">
<!-- Unzip AVR tools -->
<antcall target="unzip">
<param name="archive_file" value="${staging_folder}/avr-toolchain-mac32-gcc-4.8.1.zip" />
@ -236,20 +340,6 @@
<param name="dest_folder" value="${staging_folder}/work/${staging_hardware_folder}/tools/avr" />
</antcall>
<!--
<exec executable="unzip">
<arg value="-q" />
<arg value="-n" />
<arg value="-d" />
<arg value="macosx/work/${staging_hardware_folder}" />
<arg value="macosx/dist/tools-universal.zip" />
</exec>
<copy todir="macosx/work/Arduino.app/Contents/Resources/Java/hardware/tools/avr/avr/include/avr">
<fileset file="macosx/dist/eeprom.h" />
</copy>
-->
<copy todir="macosx/work/${staging_hardware_folder}/tools/">
<fileset file="macosx/dist/bossac" />
</copy>
@ -257,7 +347,7 @@
<chmod file="macosx/work/${staging_hardware_folder}/tools/bossac" perm="+x" />
<antcall target="assemble">
<param name="target.path" value="macosx/work/Arduino.app/Contents/Resources/Java" />
<param name="target.path" value="macosx/work/${staging_hardware_folder}/../" />
</antcall>
<antcall target="untar">
@ -284,8 +374,16 @@
<param name="final_folder" value="${staging_folder}/libastylej" />
<param name="dest_folder" value="${staging_folder}" />
</antcall>
<copy file="macosx/libastylej/libastylej.jnilib" todir="macosx/work/Arduino.app/Contents/Resources/Java/lib/" />
<chmod perm="755" file="macosx/work/Arduino.app/Contents/Resources/Java/lib/libastylej.jnilib" />
<copy file="macosx/libastylej/libastylej.jnilib" todir="macosx/work/${staging_hardware_folder}/../lib/" />
<chmod perm="755" file="macosx/work/${staging_hardware_folder}/../lib/libastylej.jnilib" />
<copy file="macosx/libastylej/libastylej.jnilib" tofile="macosx/work/${staging_hardware_folder}/../lib/libastylej.dylib" />
<chmod perm="755" file="macosx/work/${staging_hardware_folder}/../lib/libastylej.dylib" />
<chmod perm="+x">
<fileset dir="macosx/work/${staging_hardware_folder}/tools/avr/bin" includes="**/*" />
<fileset dir="macosx/work/${staging_hardware_folder}/tools/avr/avr/bin" includes="**/*" />
<fileset dir="macosx/work/${staging_hardware_folder}/tools/avr/libexec/gcc/avr/4.8.1/" includes="*" />
</chmod>
<antcall target="untar">
<param name="archive_file" value="${staging_folder}/dist/osx-xtensa-lx106-elf.tgz" />
@ -294,15 +392,32 @@
<param name="dest_folder" value="${staging_folder}/work/${staging_hardware_folder}/tools/esp8266/" />
</antcall>
</target>
<target name="macosx-run" depends="macosx-build" description="Run Mac OS X version">
<antcall target="macosx-run-common"/>
</target>
<target name="macosx-java-latest-run" depends="macosx-java-latest-build" description="Run Mac OS X version">
<antcall target="macosx-run-common"/>
</target>
<target name="macosx-debug" depends="macosx-build" description="Run Mac OS X version">
<antcall target="macosx-debug-common"/>
</target>
<target name="macosx-java-latest-debug" depends="macosx-java-latest-build" description="Run Mac OS X version">
<antcall target="macosx-debug-common"/>
</target>
<target name="macosx-run-common">
<exec executable="open" dir="macosx/work">
<arg value="Arduino.app"/>
</exec>
</target>
<target name="macosx-debug" depends="macosx-build" description="Run Mac OS X version">
<target name="macosx-debug-common">
<exec executable="open" dir="macosx/work" spawn="false">
<arg value="Arduino.app"/>
</exec>
@ -364,25 +479,17 @@
<!-- Build distribution file for MacOSX. -->
<!-- - - - - - - - - - - - - - - - - - - -->
<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" />
<chmod perm="+x">
<fileset dir="macosx/work/${staging_hardware_folder}/tools/avr/bin" includes="**/*" />
<fileset dir="macosx/work/${staging_hardware_folder}/tools/avr/avr/bin" includes="**/*" />
<fileset dir="macosx/work/${staging_hardware_folder}/tools/avr/libexec/gcc/avr/4.8.1/" includes="*" />
</chmod>
<antcall target="macosx-dist-common"/>
</target>
<replace file="macosx/work/Arduino.app/Contents/Info.plist"
token="VERSION" value="${version}" />
<replace file="macosx/work/Arduino.app/Contents/Info.plist"
token="REVISION" value="${revision}" />
<target name="macosx-java-latest-dist" if="macosx" depends="macosx-java-latest-build" description="Create a downloadable .zip for the Mac OS X version">
<antcall target="macosx-dist-common"/>
</target>
<target name="macosx-dist-common">
<exec executable="zip" dir="macosx/work">
<arg line="-q -r ../arduino-${version}-${platform}.zip ." />
</exec>
<!-- <exec executable="ditto" dir="macosx/work">
<arg line="-c -k -rsrc . ../arduino-${version}-macosx.zip" />
</exec> -->
<echo>
=======================================================
@ -454,7 +561,7 @@
<target name="linux-clean" depends="subprojects-clean" description="Clean linux version">
<delete dir="linux/work" />
<delete>
<fileset dir="linux" includes="arduino-*linux*.tgz"/>
<fileset dir="linux" includes="arduino-*linux*.tar.xz"/>
</delete>
</target>

20
build/build_pull_request.bash
View File

@ -1,4 +1,4 @@
#!/bin/bash -e
#!/bin/bash -ex
if [ "x${ghprbPullId}" == "x" ]
then
@ -15,8 +15,18 @@ fi
VERSION="PR-${ghprbPullId}-BUILD-${BUILD_NUMBER}"
ant -Djava.net.preferIPv4Stack=true -Dplatform=linux32 -Dlinux32=1 -Dversion="${VERSION}" dist
ant -Djava.net.preferIPv4Stack=true -Dplatform=linux64 -Dlinux64=1 -Dversion="${VERSION}" dist
ant -Djava.net.preferIPv4Stack=true -Dplatform=windows -Dwindows=1 -Dversion="${VERSION}" dist
ant -Djava.net.preferIPv4Stack=true -Dplatform=macosx -Dmacosx=1 -Dversion="${VERSION}" dist
ant -Djava.net.preferIPv4Stack=true -Dplatform=linux32 -Dversion="${VERSION}" clean dist
mv linux/arduino-*$VERSION*.tar.xz ../
ant -Djava.net.preferIPv4Stack=true -Dplatform=linux64 -Dversion="${VERSION}" clean dist
mv linux/arduino-*$VERSION*.tar.xz ../
ant -Djava.net.preferIPv4Stack=true -Dplatform=windows -Dversion="${VERSION}" clean dist
mv windows/arduino-*$VERSION*.zip ../
ant -Djava.net.preferIPv4Stack=true -Dplatform=macosx -Dversion="${VERSION}" clean dist
mv macosx/arduino-*$VERSION*.zip ../
ant -Djava.net.preferIPv4Stack=true -Dplatform=macosx-java-latest -Dversion="${VERSION}" clean dist
mv macosx/arduino-*$VERSION*.zip ../

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

@ -0,0 +1 @@
28b3ccde1631791575a11f73e5fd0097df566fe2

4
build/shared/examples/02.Digital/BlinkWithoutDelay/BlinkWithoutDelay.ino
View File

@ -1,6 +1,6 @@
/* Blink without Delay
Turns on and off a light emitting diode(LED) connected to a digital
Turns on and off a light emitting diode (LED) connected to a digital
pin, without using the delay() function. This means that other code
can run at the same time without being interrupted by the LED code.
@ -28,7 +28,7 @@ const int ledPin = 13; // the number of the LED pin
// Variables will change :
int ledState = LOW; // ledState used to set the LED
// Generally, you shuould use "unsigned long" for variables that hold time
// Generally, you should use "unsigned long" for variables that hold time
// The value will quickly become too large for an int to store
unsigned long previousMillis = 0; // will store last time LED was updated

1
build/shared/reference-1.6.0.zip.sha Normal file
View File

@ -0,0 +1 @@
61699592ab44df789b98527f2d82e8defc8ce552

BIN
build/shared/reference.zip
View File

Binary file not shown.

5
build/shared/revisions.txt
View File

@ -1,4 +1,9 @@
ARDUINO 1.6.0rc3 - 2015.02.03
[ide]
* Bunch of bugfix on MacOSX build (https://github.com/arduino/Arduino/pull/2590)
ARDUINO 1.6.0rc2 - 2015.01.20
[ide]