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

Updates to build.xml. (version auto defetect for "dist" target)

Browse Source
This commit is contained in:
Cristian Maglie
2013-01-24 14:42:51 +01:00
parent c1ce89ee48
commit 24bd97413e
3 changed files with 23 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
build/build.xml
View File

@ -110,41 +110,35 @@
<!-- - - - - - - - - --> <!-- - - - - - - - - -->
<target name="revision-check"> <target name="revision-check">
<!-- figure out the revision number --> <!-- figure out the revision number -->
<loadfile srcfile="../todo.txt" property="revision"> <loadfile srcfile="shared/revisions.txt" property="revision">
<filterchain> <filterchain>
<headfilter lines="1"/> <ignoreblank />
<tokenfilter> <headfilter lines="1"/>
<stringtokenizer suppressdelims="true"/> <tokenfilter>
<!-- grab the thing from the first line that's 4 digits --> <linetokenizer includeDelims="false" />
<containsregex pattern="(\d\d\d\d)" /> <!-- grab the thing from the first line that's 4 digits -->
</tokenfilter> <containsregex pattern="ARDUINO (.*) " />
<replaceregex pattern="ARDUINO ([^ ]*).*" replace="\1" />
</tokenfilter>
<tokenfilter>
<stringtokenizer suppressdelims="true" />
</tokenfilter>
</filterchain> </filterchain>
</loadfile> </loadfile>
<!-- <echo message="revision is ${revision}." /> --> <echo message="Latest revision detected in shared/revision.txt is: ${revision}" />
<!-- figure out the revision number in base.java --> <!-- figure out the revision number in base.java -->
<loadfile srcfile="../app/src/processing/app/Base.java" <loadfile srcfile="../app/src/processing/app/Base.java"
property="revision.base"> property="revision.base">
<filterchain> <filterchain>
<tokenfilter> <tokenfilter>
<linetokenizer /> <linetokenizer />
<containsregex pattern="String VERSION_NAME = "/> <containsregex pattern="String VERSION_NAME = "/>
<replaceregex pattern="[^0-9]*" flags="g" replace=""/> <replaceregex pattern="[^0-9]*" flags="g" replace=""/>
</tokenfilter> </tokenfilter>
</filterchain> </filterchain>
</loadfile> </loadfile>
<!-- <echo message="base revision is ${revision.base}." /> --> <echo message="Revision in Base.java is: ${revision.base}" />
<condition property="revision.correct">
<!-- Using contains because I can't figure out how to get rid of the
LF in revision.base. Please file a bug if you have a fix. -->
<contains string="${revision.base}" substring="${revision}"/>
</condition>
<!-- the revision.base property won't be set
if $revision wasn't found... -->
<fail unless="revision.correct"
message="Fix revision number in Base.java" />
</target> </target>
<!-- - - - - - - - --> <!-- - - - - - - - -->

8
build/shared/revisions.txt
View File

@ -1,5 +1,5 @@
ARDUINO BETA 1.5.2 - 2012.01.23 ARDUINO 1.5.2 BETA - 2012.01.23
[ide] [ide]
* Scrollable editor tabs (Shigheru KANEMOTO) * Scrollable editor tabs (Shigheru KANEMOTO)
@ -31,11 +31,11 @@ ARDUINO BETA 1.5.2 - 2012.01.23
* Merged all improvements made in Arduino IDE 1.0.3 * Merged all improvements made in Arduino IDE 1.0.3
* Merged all improvements made in Arduino IDE 1.0.4 (not yet released) * Merged all improvements made in Arduino IDE 1.0.4 (not yet released)
ARDUINO BETA 1.5.1r2 - 2012.11.06 ARDUINO 1.5.1r2 BETA - 2012.11.06
* Fixed wrong release file for windows. * Fixed wrong release file for windows.
ARDUINO BETA 1.5.1 - 2012.11.05 ARDUINO 1.5.1 BETA - 2012.11.05
* Merged changes coming from stable release of Arduino IDE 1.0.2. * Merged changes coming from stable release of Arduino IDE 1.0.2.
@ -60,7 +60,7 @@ ARDUINO BETA 1.5.1 - 2012.11.05
[firmwares] [firmwares]
* Added firmware for atmega16u2 on Due Board. * Added firmware for atmega16u2 on Due Board.
ARDUINO BETA 1.5 - 2012.10.22 ARDUINO 1.5 BETA - 2012.10.22
* First release for the unified IDE for both AVR 8-bit and ARM 32-bit * First release for the unified IDE for both AVR 8-bit and ARM 32-bit
(SAM3 CPUs) architectures. (SAM3 CPUs) architectures.

2
todo.txt
View File

@ -1,5 +1,3 @@
0152 arduino
Fix Linux make.sh, etc. scripts Fix Linux make.sh, etc. scripts
Test on Linux. Test on Linux.