Skip to content

Commit 5b7678c

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 e14ea99 commit 5b7678c

File tree

5 files changed

+106
-0
lines changed

5 files changed

+106
-0
lines changed

Diff for: ‎build/build.xml

+102
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,8 @@
102102
<property name="ARDUINO-BUILDER-VERSION" value="1.4.4" />
103103
<property name="ARDUINO-CLI-VERSION" value="0.3.4-alpha.preview" />
104104
<property name="LIBLISTSERIAL-VERSION" value="1.4.2" />
105+
<property name="SERIALDISCOVER-VERSION" value="0.0.2" />
106+
<property name="MDNSDISCOVER-VERSION" value="0.0.1" />
105107
<property name="AVRGCC-VERSION" value="5.4.0-atmel3.6.1-arduino2" />
106108
<property name="AVRDUDE-VERSION" value="6.3.0-arduino14" />
107109
<property name="AVRCORE-VERSION" value="1.6.23" />
@@ -192,6 +194,11 @@
192194
<fileset dir="shared/examples" />
193195
</copy>
194196

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

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

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

@@ -678,6 +703,24 @@
678703
<copy file="linux/liblistSerials-${LIBLISTSERIAL-VERSION}/linux${arch-bits}/liblistSerialsj.so" todir="linux/work/lib/" />
679704
<chmod perm="755" file="linux/work/lib/liblistSerialsj.so" />
680705

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

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

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

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

751831
<target name="linuxaarch64-build" depends="linux-libastyle-aarch64" description="Build Linux (AArch64) version">
@@ -1086,6 +1166,28 @@
10861166
<param name="file" value="windows/work/lib/listSerialsj.dll" />
10871167
</antcall>
10881168

1169+
<antcall target="unzip">
1170+
<param name="archive_file" value="./serial-discovery-${SERIALDISCOVER-VERSION}.zip" />
1171+
<param name="archive_url" value="https://downloads.arduino.cc/tools/serial-discovery-${SERIALDISCOVER-VERSION}.zip" />
1172+
<param name="final_folder" value="${staging_folder}/serial-discovery-${SERIALDISCOVER-VERSION}" />
1173+
<param name="dest_folder" value="${staging_folder}/serial-discovery-${SERIALDISCOVER-VERSION}" />
1174+
</antcall>
1175+
<copy file="windows/serial-discovery-${SERIALDISCOVER-VERSION}/windows/serial-discovery.exe" todir="windows/work/tools/" />
1176+
<antcall target="make-file-executable">
1177+
<param name="file" value="windows/work/tools/serial-discovery.exe" />
1178+
</antcall>
1179+
1180+
<antcall target="unzip">
1181+
<param name="archive_file" value="./mdns-discovery-${MDNSDISCOVER-VERSION}.zip" />
1182+
<param name="archive_url" value="https://downloads.arduino.cc/tools/mdns-discovery-${MDNSDISCOVER-VERSION}.zip" />
1183+
<param name="final_folder" value="${staging_folder}/mdns-discovery-${MDNSDISCOVER-VERSION}" />
1184+
<param name="dest_folder" value="${staging_folder}/mdns-discovery-${MDNSDISCOVER-VERSION}" />
1185+
</antcall>
1186+
<copy file="windows/mdns-discovery-${MDNSDISCOVER-VERSION}/windows/mdns-discovery.exe" todir="windows/work/tools/" />
1187+
<antcall target="make-file-executable">
1188+
<param name="file" value="windows/work/tools/mdns-discovery.exe" />
1189+
</antcall>
1190+
10891191
<delete dir="${staging_folder}/arduino-builder-windows" includeemptydirs="true"/>
10901192
<mkdir dir="${staging_folder}/arduino-builder-windows"/>
10911193
<antcall target="unzip-with-ant-task">

Diff for: ‎build/mdns-discovery-0.0.1.zip.sha

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
11ac3c2f9313e1979e3488ab674fabd0884ec0b4

Diff for: ‎build/serial-discovery-0.0.2.zip.sha

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
42bd1dcf55a46216e721afee01e913139a9e562a

Diff for: ‎build/shared/discoverers/disco/boards.txt

Whitespace-only changes.

Diff for: ‎build/shared/discoverers/disco/platform.txt

+2
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)