|
71 | 71 | </or>
|
72 | 72 | </condition>
|
73 | 73 |
|
| 74 | + <property name="portable" value="false" /> |
| 75 | + |
74 | 76 | <property name="ARDUINO-BUILDER-VERSION" value="1.3.5" />
|
75 | 77 |
|
76 | 78 | <!-- Libraries required for running arduino -->
|
|
95 | 97 | <antcall target="${platform}-start" />
|
96 | 98 | </target>
|
97 | 99 |
|
98 |
| - <target name="dist" depends="revision-check" |
99 |
| - description="Build Arduino for distribution."> |
100 |
| - <input message="Enter version number:" |
101 |
| - addproperty="version" |
102 |
| - defaultvalue="${revision}" /> |
103 |
| - <antcall target="${platform}-dist" /> |
| 100 | + <target name="dist" depends="revision-check" description="Build Arduino for distribution."> |
| 101 | + <input message="Enter version number:" addproperty="version" defaultvalue="${revision}"/> |
| 102 | + <condition property="full-version" value="${version}-${platform}"> |
| 103 | + <not> |
| 104 | + <equals arg1="${portable}" arg2="true"/> |
| 105 | + </not> |
| 106 | + </condition> |
| 107 | + <condition property="full-version" value="${version}-${platform}-portable"> |
| 108 | + <equals arg1="${portable}" arg2="true"/> |
| 109 | + </condition> |
| 110 | + <antcall target="${platform}-dist"> |
| 111 | + <param name="full-version" value="${full-version}"/> |
| 112 | + </antcall> |
104 | 113 | </target>
|
105 | 114 |
|
106 | 115 | <!-- "§$§$&, ant doesn't have a built-in help target :( -->
|
|
400 | 409 | </copy>
|
401 | 410 | <delete dir="${staging_folder}/arduino-builder-macosx" includeemptydirs="true"/>
|
402 | 411 |
|
| 412 | + <antcall target="portable-${portable}"> |
| 413 | + <param name="parentdir" value="macosx/work/${staging_hardware_folder}/.." /> |
| 414 | + </antcall> |
403 | 415 | </target>
|
404 | 416 |
|
405 | 417 | <!-- Unzip AVR tools -->
|
|
463 | 475 |
|
464 | 476 | <!-- Create signed zip file -->
|
465 | 477 | <exec executable="zip" dir="macosx/work" failonerror="true">
|
466 |
| - <arg line="-q -r ../arduino-${version}-${platform}-signed.zip ." /> |
| 478 | + <arg line="-q -r ../arduino-${full-version}-signed.zip ." /> |
467 | 479 | </exec>
|
468 | 480 |
|
469 | 481 | <echo>
|
470 | 482 | =======================================================
|
471 | 483 | Arduino for Mac OS X built and signed.
|
472 | 484 |
|
473 |
| - macosx/arduino-${version}-${platform}-signed.zip |
| 485 | + macosx/arduino-${full-version}-signed.zip |
474 | 486 | =======================================================
|
475 | 487 | </echo>
|
476 | 488 | </target>
|
|
486 | 498 | <!-- - - - - - - - - - - - - - - - - - - -->
|
487 | 499 | <target name="macosx-dist" if="macosx" depends="build" description="Create a downloadable .zip for the Mac OS X version">
|
488 | 500 | <exec executable="zip" dir="macosx/work" failonerror="true">
|
489 |
| - <arg line="-q -r ../arduino-${version}-${platform}.zip ." /> |
| 501 | + <arg line="-q -r ../arduino-${full-version}.zip ." /> |
490 | 502 | </exec>
|
491 | 503 |
|
492 | 504 | <echo>
|
493 | 505 | =======================================================
|
494 | 506 | Arduino for Mac OS X was built. Grab the image from
|
495 | 507 |
|
496 |
| - macosx/arduino-${version}-${platform}.zip |
| 508 | + macosx/arduino-${full-version}.zip |
497 | 509 | =======================================================
|
498 | 510 | </echo>
|
499 | 511 | </target>
|
|
569 | 581 | </antcall>
|
570 | 582 | <copy file="linux/libastylej-2.05.1/libastylej${arch-bits}.so" tofile="linux/work/lib/libastylej.so" />
|
571 | 583 | <chmod perm="755" file="linux/work/lib/libastylej.so" />
|
| 584 | + |
| 585 | + <antcall target="portable-${portable}"> |
| 586 | + <param name="parentdir" value="linux/work" /> |
| 587 | + </antcall> |
572 | 588 | </target>
|
573 | 589 |
|
574 | 590 | <target name="linux32-build" depends="linux-build" description="Build linux (32-bit) version">
|
|
722 | 738 | <arg value="--lzma"/>
|
723 | 739 | <arg value="-c"/>
|
724 | 740 | <arg value="-f"/>
|
725 |
| - <arg value="arduino-${version}-${platform}.tar.xz"/> |
| 741 | + <arg value="arduino-${full-version}.tar.xz"/> |
726 | 742 | <arg value="arduino-${version}"/>
|
727 | 743 | </exec>
|
728 | 744 |
|
|
732 | 748 | =======================================================
|
733 | 749 | Arduino for Linux was built. Grab the archive from
|
734 | 750 |
|
735 |
| - linux/arduino-${version}-${platform}.tar.xz |
| 751 | + linux/arduino-${full-version}.tar.xz |
736 | 752 | =======================================================
|
737 | 753 | </echo>
|
738 | 754 | </target>
|
|
895 | 911 | <copy todir="${staging_folder}/work/java" includeemptydirs="true" preservelastmodified="true" overwrite="true" failonerror="true">
|
896 | 912 | <fileset dir="${WINDOWS_BUNDLED_JVM}" includes="*/**"/>
|
897 | 913 | </copy>
|
| 914 | + |
| 915 | + <antcall target="portable-${portable}"> |
| 916 | + <param name="parentdir" value="${staging_folder}/work" /> |
| 917 | + </antcall> |
898 | 918 | </target>
|
899 | 919 |
|
900 | 920 | <target name="windows-build-avr-toolchain">
|
|
916 | 936 | </target>
|
917 | 937 |
|
918 | 938 | <target name="windows-dist" depends="build" description="Create .zip files of windows version">
|
919 |
| - <zip destfile="windows/arduino-${version}-${platform}.zip" level="9"> |
| 939 | + <zip destfile="windows/arduino-${full-version}.zip" level="9"> |
920 | 940 | <zipfileset dir="windows/work" prefix="arduino-${version}"/>
|
921 | 941 | </zip>
|
922 | 942 |
|
923 | 943 | <echo>
|
924 | 944 | =======================================================
|
925 | 945 | Arduino for Windows was built. Grab the archive from
|
926 | 946 |
|
927 |
| - windows/arduino-${version}-${platform}.zip |
| 947 | + windows/arduino-${full-version}.zip |
928 | 948 | =======================================================
|
929 | 949 | </echo>
|
930 | 950 | </target>
|
|
1030 | 1050 | <echo file="${staging_folder}/work/${staging_hardware_folder}/../lib/hourlyBuild.txt">${BUILD_DATE}</echo>
|
1031 | 1051 | </target>
|
1032 | 1052 |
|
| 1053 | + <target name="portable-true"> |
| 1054 | + <mkdir dir="${parentdir}/portable"/> |
| 1055 | + </target> |
| 1056 | + <target name="portable-false"/> |
1033 | 1057 | </project>
|
0 commit comments