|
234 | 234 | <!-- - - - - - - - - --> |
235 | 235 | <!-- Revision check --> |
236 | 236 | <!-- - - - - - - - - --> |
237 | | - <target name="revision-check"> |
238 | | - <!-- figure out the revision number --> |
| 237 | + <target name="revision-check" depends="package-library-index-json-bundle"> |
| 238 | + |
| 239 | + <!-- figure out the AVR core version number in platform.txt --> |
| 240 | + <loadfile srcfile="../hardware/arduino/avr/platform.txt" property="revision.avr.platform"> |
| 241 | + <filterchain> |
| 242 | + <tokenfilter> |
| 243 | + <linetokenizer /> |
| 244 | + <containsregex pattern="version="/> |
| 245 | + <replaceregex pattern="version=(.*)" flags="g" replace="1円"/> |
| 246 | + </tokenfilter> |
| 247 | + </filterchain> |
| 248 | + </loadfile> |
| 249 | + |
| 250 | + <!-- figure out the latest AVR core version number in package_index.json --> |
| 251 | + <loadfile srcfile="${staging_folder}/work/${staging_hardware_folder}/../dist/package_index.json" property="revision.avr.index"> |
| 252 | + <filterchain> |
| 253 | + <tokenfilter> |
| 254 | + <linetokenizer /> |
| 255 | + <containsregex pattern="archiveFileName.*avr-......tar.bz2"/> |
| 256 | + <replaceregex pattern=".*avr-(.*).tar.bz2.*" flags="g" replace="1円"/> |
| 257 | + </tokenfilter> |
| 258 | + <tailfilter lines="1"/> |
| 259 | + </filterchain> |
| 260 | + </loadfile> |
| 261 | + |
| 262 | + <echo message="AVR Arduino core version in platform.txt is: ${revision.avr.platform}" /> |
| 263 | + <echo message=" latest in index.json is: ${revision.avr.index}" /> |
| 264 | + <condition property="revision.avr.ok"> |
| 265 | + <or> |
| 266 | + <!-- fail build if -Drevision.check=enforce is set --> |
| 267 | + <not><equals arg1="${revision.check}" arg2="enforce"/></not> |
| 268 | + <equals arg1="${revision.avr.index}" arg2="${revision.avr.platform}"/> |
| 269 | + </or> |
| 270 | + </condition> |
| 271 | + <fail unless="revision.avr.ok"> |
| 272 | + Mismatching versions for bundled AVR core and package_index.json. |
| 273 | + Please check your platform.txt and package_index.json. |
| 274 | + </fail> |
| 275 | + |
| 276 | + <!-- figure out the IDE version number --> |
239 | 277 | <loadfile srcfile="shared/revisions.txt" property="revision"> |
240 | 278 | <filterchain> |
241 | 279 | <ignoreblank /> |
|
251 | 289 | </tokenfilter> |
252 | 290 | </filterchain> |
253 | 291 | </loadfile> |
254 | | - <echo message="Latest revision detected in shared/revision.txt is: ${revision}" /> |
255 | 292 |
|
256 | | - <!-- figure out the revision number in base.java --> |
| 293 | + <!-- figure out the IDE version number in base.java --> |
257 | 294 | <loadfile srcfile="../arduino-core/src/processing/app/BaseNoGui.java" |
258 | 295 | property="revision.base"> |
259 | 296 | <filterchain> |
|
264 | 301 | </tokenfilter> |
265 | 302 | </filterchain> |
266 | 303 | </loadfile> |
| 304 | + <echo message="Latest revision detected in shared/revision.txt is: ${revision}" /> |
267 | 305 | <echo message=" Revision in BaseNoGui.java is: ${revision.base}" /> |
268 | 306 | </target> |
269 | 307 |
|
|
0 commit comments