Skip to content

Commit 24ecd42

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 89c1eef commit 24ecd42

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
@@ -101,6 +101,8 @@
101101

102102
<property name="ARDUINO-BUILDER-VERSION" value="1.4.3" />
103103
<property name="LIBLISTSERIAL-VERSION" value="1.4.2" />
104+
<property name="SERIALDISCOVER-VERSION" value="0.0.2" />
105+
<property name="MDNSDISCOVER-VERSION" value="0.0.1" />
104106
<property name="AVRGCC-VERSION" value="5.4.0-atmel3.6.1-arduino2" />
105107
<property name="AVRDUDE-VERSION" value="6.3.0-arduino14" />
106108
<property name="AVRCORE-VERSION" value="1.6.23" />
@@ -191,6 +193,11 @@
191193
<fileset dir="shared/examples" />
192194
</copy>
193195

196+
<!-- copy discoverers fake platform -->
197+
<copy todir="${staging_folder}/work/${staging_hardware_folder}/discoverers">
198+
<fileset dir="shared/discoverers"/>
199+
</copy>
200+
194201
<mkdir dir="${target.path}/reference"/>
195202

196203
<antcall target="assemble-docs" />
@@ -486,6 +493,24 @@
486493
<copy file="macosx/liblistSerials-${LIBLISTSERIAL-VERSION}/osx/liblistSerialsj.dylib" todir="macosx/work/${staging_hardware_folder}/../lib/" />
487494
<chmod perm="755" file="macosx/work/${staging_hardware_folder}/../lib/liblistSerialsj.dylib" />
488495

496+
<antcall target="unzip">
497+
<param name="archive_file" value="./serial-discovery-${SERIALDISCOVER-VERSION}.zip" />
498+
<param name="archive_url" value="https://downloads.arduino.cc/tools/serial-discovery-${SERIALDISCOVER-VERSION}.zip" />
499+
<param name="final_folder" value="${staging_folder}/serial-discovery-${SERIALDISCOVER-VERSION}" />
500+
<param name="dest_folder" value="${staging_folder}/serial-discovery-${SERIALDISCOVER-VERSION}" />
501+
</antcall>
502+
<copy file="macosx/serial-discovery-${SERIALDISCOVER-VERSION}/darwin/serial-discovery" todir="macosx/work/${staging_hardware_folder}/../tools/" />
503+
<chmod perm="755" file="macosx/work/${staging_hardware_folder}/../tools/serial-discovery" />
504+
505+
<antcall target="unzip">
506+
<param name="archive_file" value="./mdns-discovery-${MDNSDISCOVER-VERSION}.zip" />
507+
<param name="archive_url" value="https://downloads.arduino.cc/tools/mdns-discovery-${MDNSDISCOVER-VERSION}.zip" />
508+
<param name="final_folder" value="${staging_folder}/mdns-discovery-${MDNSDISCOVER-VERSION}" />
509+
<param name="dest_folder" value="${staging_folder}/mdns-discovery-${MDNSDISCOVER-VERSION}" />
510+
</antcall>
511+
<copy file="macosx/mdns-discovery-${MDNSDISCOVER-VERSION}/darwin/mdns-discovery" todir="macosx/work/${staging_hardware_folder}/../tools/" />
512+
<chmod perm="755" file="macosx/work/${staging_hardware_folder}/../tools/mdns-discovery" />
513+
489514
<antcall target="build-arduino-builder" />
490515

491516
<antcall target="portable-${portable}">
@@ -676,6 +701,24 @@
676701
<copy file="linux/liblistSerials-${LIBLISTSERIAL-VERSION}/linux${arch-bits}/liblistSerialsj.so" todir="linux/work/lib/" />
677702
<chmod perm="755" file="linux/work/lib/liblistSerialsj.so" />
678703

704+
<antcall target="unzip">
705+
<param name="archive_file" value="./serial-discovery-${SERIALDISCOVER-VERSION}.zip" />
706+
<param name="archive_url" value="https://downloads.arduino.cc/tools/serial-discovery-${SERIALDISCOVER-VERSION}.zip" />
707+
<param name="final_folder" value="${staging_folder}/serial-discovery-${SERIALDISCOVER-VERSION}" />
708+
<param name="dest_folder" value="${staging_folder}/serial-discovery-${SERIALDISCOVER-VERSION}" />
709+
</antcall>
710+
<copy file="linux/serial-discovery-${SERIALDISCOVER-VERSION}/linux${arch-bits}/serial-discovery" todir="linux/work/${staging_hardware_folder}/../tools/" />
711+
<chmod perm="755" file="linux/work/${staging_hardware_folder}/../tools/serial-discovery" />
712+
713+
<antcall target="unzip">
714+
<param name="archive_file" value="./mdns-discovery-${MDNSDISCOVER-VERSION}.zip" />
715+
<param name="archive_url" value="https://downloads.arduino.cc/tools/mdns-discovery-${MDNSDISCOVER-VERSION}.zip" />
716+
<param name="final_folder" value="${staging_folder}/mdns-discovery-${MDNSDISCOVER-VERSION}" />
717+
<param name="dest_folder" value="${staging_folder}/mdns-discovery-${MDNSDISCOVER-VERSION}" />
718+
</antcall>
719+
<copy file="linux/mdns-discovery-${MDNSDISCOVER-VERSION}/linux${arch-bits}/mdns-discovery" todir="linux/work/${staging_hardware_folder}/../tools/" />
720+
<chmod perm="755" file="linux/work/${staging_hardware_folder}/../tools/mdns-discovery" />
721+
679722
</target>
680723

681724
<target name="linux-libastyle-arm" depends="linux-build" description="Download libastyle.so for ARM">
@@ -701,6 +744,24 @@
701744
<copy file="linux/liblistSerials-${LIBLISTSERIAL-VERSION}/arm/liblistSerialsj.so" todir="linux/work/lib/" />
702745
<chmod perm="755" file="linux/work/lib/liblistSerialsj.so" />
703746

747+
<antcall target="unzip">
748+
<param name="archive_file" value="./serial-discovery-${SERIALDISCOVER-VERSION}.zip" />
749+
<param name="archive_url" value="https://downloads.arduino.cc/tools/serial-discovery-${SERIALDISCOVER-VERSION}.zip" />
750+
<param name="final_folder" value="${staging_folder}/serial-discovery-${SERIALDISCOVER-VERSION}" />
751+
<param name="dest_folder" value="${staging_folder}/serial-discovery-${SERIALDISCOVER-VERSION}" />
752+
</antcall>
753+
<copy file="linux/serial-discovery-${SERIALDISCOVER-VERSION}/linuxarm/serial-discovery" todir="linux/work/${staging_hardware_folder}/../tools/" />
754+
<chmod perm="755" file="linux/work/${staging_hardware_folder}/../tools/serial-discovery" />
755+
756+
<antcall target="unzip">
757+
<param name="archive_file" value="./mdns-discovery-${MDNSDISCOVER-VERSION}.zip" />
758+
<param name="archive_url" value="https://downloads.arduino.cc/tools/mdns-discovery-${MDNSDISCOVER-VERSION}.zip" />
759+
<param name="final_folder" value="${staging_folder}/mdns-discovery-${MDNSDISCOVER-VERSION}" />
760+
<param name="dest_folder" value="${staging_folder}/mdns-discovery-${MDNSDISCOVER-VERSION}" />
761+
</antcall>
762+
<copy file="linux/mdns-discovery-${MDNSDISCOVER-VERSION}/linuxarm/mdns-discovery" todir="linux/work/${staging_hardware_folder}/../tools/" />
763+
<chmod perm="755" file="linux/work/${staging_hardware_folder}/../tools/mdns-discovery" />
764+
704765
</target>
705766

706767
<target name="linuxarm-build" depends="linux-libastyle-arm" description="Build linux (32-bit) version">
@@ -743,6 +804,25 @@
743804
</antcall>
744805
<copy file="linux/liblistSerials-${LIBLISTSERIAL-VERSION}/aarch64/liblistSerialsj.so" todir="linux/work/lib/" />
745806
<chmod perm="755" file="linux/work/lib/liblistSerialsj.so" />
807+
808+
<antcall target="unzip">
809+
<param name="archive_file" value="./serial-discovery-${SERIALDISCOVER-VERSION}.zip" />
810+
<param name="archive_url" value="https://downloads.arduino.cc/tools/serial-discovery-${SERIALDISCOVER-VERSION}.zip" />
811+
<param name="final_folder" value="${staging_folder}/serial-discovery-${SERIALDISCOVER-VERSION}" />
812+
<param name="dest_folder" value="${staging_folder}/serial-discovery-${SERIALDISCOVER-VERSION}" />
813+
</antcall>
814+
<copy file="linux/serial-discovery-${SERIALDISCOVER-VERSION}/linuxarm64/serial-discovery" todir="linux/work/${staging_hardware_folder}/../tools/" />
815+
<chmod perm="755" file="linux/work/${staging_hardware_folder}/../tools/serial-discovery" />
816+
817+
<antcall target="unzip">
818+
<param name="archive_file" value="./mdns-discovery-${MDNSDISCOVER-VERSION}.zip" />
819+
<param name="archive_url" value="https://downloads.arduino.cc/tools/mdns-discovery-${MDNSDISCOVER-VERSION}.zip" />
820+
<param name="final_folder" value="${staging_folder}/mdns-discovery-${MDNSDISCOVER-VERSION}" />
821+
<param name="dest_folder" value="${staging_folder}/mdns-discovery-${MDNSDISCOVER-VERSION}" />
822+
</antcall>
823+
<copy file="linux/mdns-discovery-${MDNSDISCOVER-VERSION}/linuxarm64/mdns-discovery" todir="linux/work/${staging_hardware_folder}/../tools/" />
824+
<chmod perm="755" file="linux/work/${staging_hardware_folder}/../tools/mdns-discovery" />
825+
746826
</target>
747827

748828
<target name="linuxaarch64-build" depends="linux-libastyle-aarch64" description="Build Linux (AArch64) version">
@@ -1066,6 +1146,28 @@
10661146
<param name="file" value="windows/work/lib/listSerialsj.dll" />
10671147
</antcall>
10681148

1149+
<antcall target="unzip">
1150+
<param name="archive_file" value="./serial-discovery-${SERIALDISCOVER-VERSION}.zip" />
1151+
<param name="archive_url" value="https://downloads.arduino.cc/tools/serial-discovery-${SERIALDISCOVER-VERSION}.zip" />
1152+
<param name="final_folder" value="${staging_folder}/serial-discovery-${SERIALDISCOVER-VERSION}" />
1153+
<param name="dest_folder" value="${staging_folder}/serial-discovery-${SERIALDISCOVER-VERSION}" />
1154+
</antcall>
1155+
<copy file="windows/serial-discovery-${SERIALDISCOVER-VERSION}/windows/serial-discovery.exe" todir="windows/work/tools/" />
1156+
<antcall target="make-file-executable">
1157+
<param name="file" value="windows/work/tools/serial-discovery.exe" />
1158+
</antcall>
1159+
1160+
<antcall target="unzip">
1161+
<param name="archive_file" value="./mdns-discovery-${MDNSDISCOVER-VERSION}.zip" />
1162+
<param name="archive_url" value="https://downloads.arduino.cc/tools/mdns-discovery-${MDNSDISCOVER-VERSION}.zip" />
1163+
<param name="final_folder" value="${staging_folder}/mdns-discovery-${MDNSDISCOVER-VERSION}" />
1164+
<param name="dest_folder" value="${staging_folder}/mdns-discovery-${MDNSDISCOVER-VERSION}" />
1165+
</antcall>
1166+
<copy file="windows/mdns-discovery-${MDNSDISCOVER-VERSION}/windows/mdns-discovery.exe" todir="windows/work/tools/" />
1167+
<antcall target="make-file-executable">
1168+
<param name="file" value="windows/work/tools/mdns-discovery.exe" />
1169+
</antcall>
1170+
10691171
<delete dir="${staging_folder}/arduino-builder-windows" includeemptydirs="true"/>
10701172
<mkdir dir="${staging_folder}/arduino-builder-windows"/>
10711173
<antcall target="unzip-with-ant-task">

‎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)