Skip to content

Commit fa21847

Browse files
facchinmfacchinm
committed
PluggableDiscovery: add discoverers (alongside the normal ones)
using https://github.com/arduino/serial-discovery and https://github.com/arduino/mdns-discovery
1 parent 52652dd commit fa21847

File tree

5 files changed

+106
-0
lines changed

5 files changed

+106
-0
lines changed

‎build/build.xml

Lines changed: 102 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,8 @@
105105
<property name="AVRDUDE-VERSION" value="6.3.0-arduino17" />
106106
<property name="AVRCORE-VERSION" value="1.8.1" />
107107
<property name="arduinoOTA-VERSION" value="1.3.0" />
108+
<property name="SERIALDISCOVER-VERSION" value="0.0.2" />
109+
<property name="MDNSDISCOVER-VERSION" value="0.0.1" />
108110

109111
<!-- Libraries required for running arduino -->
110112
<fileset dir=".." id="runtime.jars">
@@ -207,6 +209,11 @@
207209
<fileset dir="shared/examples" />
208210
</copy>
209211

212+
<!-- copy discoverers fake platform -->
213+
<copy todir="${staging_folder}/work/${staging_hardware_folder}/discoverers">
214+
<fileset dir="shared/discoverers"/>
215+
</copy>
216+
210217
<mkdir dir="${target.path}/reference"/>
211218

212219
<antcall target="assemble-docs" />
@@ -503,6 +510,24 @@
503510
<copy file="macosx/liblistSerials-${LIBLISTSERIAL-VERSION}/osx/liblistSerialsj.dylib" todir="macosx/work/${staging_hardware_folder}/../lib/" />
504511
<chmod perm="755" file="macosx/work/${staging_hardware_folder}/../lib/liblistSerialsj.dylib" />
505512

513+
<antcall target="unzip">
514+
<param name="archive_file" value="./serial-discovery-${SERIALDISCOVER-VERSION}.zip" />
515+
<param name="archive_url" value="https://downloads.arduino.cc/tools/serial-discovery-${SERIALDISCOVER-VERSION}.zip" />
516+
<param name="final_folder" value="${staging_folder}/serial-discovery-${SERIALDISCOVER-VERSION}" />
517+
<param name="dest_folder" value="${staging_folder}/serial-discovery-${SERIALDISCOVER-VERSION}" />
518+
</antcall>
519+
<copy file="macosx/serial-discovery-${SERIALDISCOVER-VERSION}/darwin/serial-discovery" todir="macosx/work/${staging_hardware_folder}/../tools/" />
520+
<chmod perm="755" file="macosx/work/${staging_hardware_folder}/../tools/serial-discovery" />
521+
522+
<antcall target="unzip">
523+
<param name="archive_file" value="./mdns-discovery-${MDNSDISCOVER-VERSION}.zip" />
524+
<param name="archive_url" value="https://downloads.arduino.cc/tools/mdns-discovery-${MDNSDISCOVER-VERSION}.zip" />
525+
<param name="final_folder" value="${staging_folder}/mdns-discovery-${MDNSDISCOVER-VERSION}" />
526+
<param name="dest_folder" value="${staging_folder}/mdns-discovery-${MDNSDISCOVER-VERSION}" />
527+
</antcall>
528+
<copy file="macosx/mdns-discovery-${MDNSDISCOVER-VERSION}/darwin/mdns-discovery" todir="macosx/work/${staging_hardware_folder}/../tools/" />
529+
<chmod perm="755" file="macosx/work/${staging_hardware_folder}/../tools/mdns-discovery" />
530+
506531
<antcall target="build-arduino-builder" />
507532

508533
<antcall target="portable-${portable}">
@@ -691,6 +716,24 @@
691716
<copy file="linux/liblistSerials-${LIBLISTSERIAL-VERSION}/linux${arch-bits}/liblistSerialsj.so" todir="linux/work/lib/" />
692717
<chmod perm="755" file="linux/work/lib/liblistSerialsj.so" />
693718

719+
<antcall target="unzip">
720+
<param name="archive_file" value="./serial-discovery-${SERIALDISCOVER-VERSION}.zip" />
721+
<param name="archive_url" value="https://downloads.arduino.cc/tools/serial-discovery-${SERIALDISCOVER-VERSION}.zip" />
722+
<param name="final_folder" value="${staging_folder}/serial-discovery-${SERIALDISCOVER-VERSION}" />
723+
<param name="dest_folder" value="${staging_folder}/serial-discovery-${SERIALDISCOVER-VERSION}" />
724+
</antcall>
725+
<copy file="linux/serial-discovery-${SERIALDISCOVER-VERSION}/linux${arch-bits}/serial-discovery" todir="linux/work/${staging_hardware_folder}/../tools/" />
726+
<chmod perm="755" file="linux/work/${staging_hardware_folder}/../tools/serial-discovery" />
727+
728+
<antcall target="unzip">
729+
<param name="archive_file" value="./mdns-discovery-${MDNSDISCOVER-VERSION}.zip" />
730+
<param name="archive_url" value="https://downloads.arduino.cc/tools/mdns-discovery-${MDNSDISCOVER-VERSION}.zip" />
731+
<param name="final_folder" value="${staging_folder}/mdns-discovery-${MDNSDISCOVER-VERSION}" />
732+
<param name="dest_folder" value="${staging_folder}/mdns-discovery-${MDNSDISCOVER-VERSION}" />
733+
</antcall>
734+
<copy file="linux/mdns-discovery-${MDNSDISCOVER-VERSION}/linux${arch-bits}/mdns-discovery" todir="linux/work/${staging_hardware_folder}/../tools/" />
735+
<chmod perm="755" file="linux/work/${staging_hardware_folder}/../tools/mdns-discovery" />
736+
694737
</target>
695738

696739
<target name="linux-libastyle-arm" depends="linux-build" description="Download libastyle.so for ARM">
@@ -716,6 +759,24 @@
716759
<copy file="linux/liblistSerials-${LIBLISTSERIAL-VERSION}/arm/liblistSerialsj.so" todir="linux/work/lib/" />
717760
<chmod perm="755" file="linux/work/lib/liblistSerialsj.so" />
718761

762+
<antcall target="unzip">
763+
<param name="archive_file" value="./serial-discovery-${SERIALDISCOVER-VERSION}.zip" />
764+
<param name="archive_url" value="https://downloads.arduino.cc/tools/serial-discovery-${SERIALDISCOVER-VERSION}.zip" />
765+
<param name="final_folder" value="${staging_folder}/serial-discovery-${SERIALDISCOVER-VERSION}" />
766+
<param name="dest_folder" value="${staging_folder}/serial-discovery-${SERIALDISCOVER-VERSION}" />
767+
</antcall>
768+
<copy file="linux/serial-discovery-${SERIALDISCOVER-VERSION}/linuxarm/serial-discovery" todir="linux/work/${staging_hardware_folder}/../tools/" />
769+
<chmod perm="755" file="linux/work/${staging_hardware_folder}/../tools/serial-discovery" />
770+
771+
<antcall target="unzip">
772+
<param name="archive_file" value="./mdns-discovery-${MDNSDISCOVER-VERSION}.zip" />
773+
<param name="archive_url" value="https://downloads.arduino.cc/tools/mdns-discovery-${MDNSDISCOVER-VERSION}.zip" />
774+
<param name="final_folder" value="${staging_folder}/mdns-discovery-${MDNSDISCOVER-VERSION}" />
775+
<param name="dest_folder" value="${staging_folder}/mdns-discovery-${MDNSDISCOVER-VERSION}" />
776+
</antcall>
777+
<copy file="linux/mdns-discovery-${MDNSDISCOVER-VERSION}/linuxarm/mdns-discovery" todir="linux/work/${staging_hardware_folder}/../tools/" />
778+
<chmod perm="755" file="linux/work/${staging_hardware_folder}/../tools/mdns-discovery" />
779+
719780
</target>
720781

721782
<target name="linuxarm-build" depends="linux-libastyle-arm" description="Build linux (32-bit) version">
@@ -758,6 +819,25 @@
758819
</antcall>
759820
<copy file="linux/liblistSerials-${LIBLISTSERIAL-VERSION}/aarch64/liblistSerialsj.so" todir="linux/work/lib/" />
760821
<chmod perm="755" file="linux/work/lib/liblistSerialsj.so" />
822+
823+
<antcall target="unzip">
824+
<param name="archive_file" value="./serial-discovery-${SERIALDISCOVER-VERSION}.zip" />
825+
<param name="archive_url" value="https://downloads.arduino.cc/tools/serial-discovery-${SERIALDISCOVER-VERSION}.zip" />
826+
<param name="final_folder" value="${staging_folder}/serial-discovery-${SERIALDISCOVER-VERSION}" />
827+
<param name="dest_folder" value="${staging_folder}/serial-discovery-${SERIALDISCOVER-VERSION}" />
828+
</antcall>
829+
<copy file="linux/serial-discovery-${SERIALDISCOVER-VERSION}/linuxarm64/serial-discovery" todir="linux/work/${staging_hardware_folder}/../tools/" />
830+
<chmod perm="755" file="linux/work/${staging_hardware_folder}/../tools/serial-discovery" />
831+
832+
<antcall target="unzip">
833+
<param name="archive_file" value="./mdns-discovery-${MDNSDISCOVER-VERSION}.zip" />
834+
<param name="archive_url" value="https://downloads.arduino.cc/tools/mdns-discovery-${MDNSDISCOVER-VERSION}.zip" />
835+
<param name="final_folder" value="${staging_folder}/mdns-discovery-${MDNSDISCOVER-VERSION}" />
836+
<param name="dest_folder" value="${staging_folder}/mdns-discovery-${MDNSDISCOVER-VERSION}" />
837+
</antcall>
838+
<copy file="linux/mdns-discovery-${MDNSDISCOVER-VERSION}/linuxarm64/mdns-discovery" todir="linux/work/${staging_hardware_folder}/../tools/" />
839+
<chmod perm="755" file="linux/work/${staging_hardware_folder}/../tools/mdns-discovery" />
840+
761841
</target>
762842

763843
<target name="linuxaarch64-build" depends="linux-libastyle-aarch64" description="Build Linux (AArch64) version">
@@ -1077,6 +1157,28 @@
10771157
<param name="file" value="windows/work/lib/listSerialsj.dll" />
10781158
</antcall>
10791159

1160+
<antcall target="unzip">
1161+
<param name="archive_file" value="./serial-discovery-${SERIALDISCOVER-VERSION}.zip" />
1162+
<param name="archive_url" value="https://downloads.arduino.cc/tools/serial-discovery-${SERIALDISCOVER-VERSION}.zip" />
1163+
<param name="final_folder" value="${staging_folder}/serial-discovery-${SERIALDISCOVER-VERSION}" />
1164+
<param name="dest_folder" value="${staging_folder}/serial-discovery-${SERIALDISCOVER-VERSION}" />
1165+
</antcall>
1166+
<copy file="windows/serial-discovery-${SERIALDISCOVER-VERSION}/windows/serial-discovery.exe" todir="windows/work/tools/" />
1167+
<antcall target="make-file-executable">
1168+
<param name="file" value="windows/work/tools/serial-discovery.exe" />
1169+
</antcall>
1170+
1171+
<antcall target="unzip">
1172+
<param name="archive_file" value="./mdns-discovery-${MDNSDISCOVER-VERSION}.zip" />
1173+
<param name="archive_url" value="https://downloads.arduino.cc/tools/mdns-discovery-${MDNSDISCOVER-VERSION}.zip" />
1174+
<param name="final_folder" value="${staging_folder}/mdns-discovery-${MDNSDISCOVER-VERSION}" />
1175+
<param name="dest_folder" value="${staging_folder}/mdns-discovery-${MDNSDISCOVER-VERSION}" />
1176+
</antcall>
1177+
<copy file="windows/mdns-discovery-${MDNSDISCOVER-VERSION}/windows/mdns-discovery.exe" todir="windows/work/tools/" />
1178+
<antcall target="make-file-executable">
1179+
<param name="file" value="windows/work/tools/mdns-discovery.exe" />
1180+
</antcall>
1181+
10801182
<delete dir="${staging_folder}/arduino-builder-windows" includeemptydirs="true"/>
10811183
<mkdir dir="${staging_folder}/arduino-builder-windows"/>
10821184
<antcall target="unzip">

‎build/mdns-discovery-0.0.1.zip.sha

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
11ac3c2f9313e1979e3488ab674fabd0884ec0b4

‎build/serial-discovery-0.0.2.zip.sha

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
42bd1dcf55a46216e721afee01e913139a9e562a

‎build/shared/discoverers/disco/boards.txt

Whitespace-only changes.

‎build/shared/discoverers/disco/platform.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
discovery.serial.pattern={runtime.ide.path}/tools/serial-discovery
2+
discovery.mdns.pattern={runtime.ide.path}/tools/mdns-discovery

0 commit comments

Comments
 (0)