Skip to content

Commit 25d40b8

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 3577626 commit 25d40b8

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
@@ -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" />
@@ -208,6 +210,11 @@
208210
<fileset dir="shared/examples" />
209211
</copy>
210212

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

213220
<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
<antcall target="build-arduino-cli" />
508533

@@ -692,6 +717,24 @@
692717
<copy file="linux/liblistSerials-${LIBLISTSERIAL-VERSION}/linux${arch-bits}/liblistSerialsj.so" todir="linux/work/lib/" />
693718
<chmod perm="755" file="linux/work/lib/liblistSerialsj.so" />
694719

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

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

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

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

765845
<target name="linuxaarch64-build" depends="linux-libastyle-aarch64" description="Build Linux (AArch64) version">
@@ -1096,6 +1176,28 @@
10961176
<param name="file" value="windows/work/lib/listSerialsj.dll" />
10971177
</antcall>
10981178

1179+
<antcall target="unzip">
1180+
<param name="archive_file" value="./serial-discovery-${SERIALDISCOVER-VERSION}.zip" />
1181+
<param name="archive_url" value="https://downloads.arduino.cc/tools/serial-discovery-${SERIALDISCOVER-VERSION}.zip" />
1182+
<param name="final_folder" value="${staging_folder}/serial-discovery-${SERIALDISCOVER-VERSION}" />
1183+
<param name="dest_folder" value="${staging_folder}/serial-discovery-${SERIALDISCOVER-VERSION}" />
1184+
</antcall>
1185+
<copy file="windows/serial-discovery-${SERIALDISCOVER-VERSION}/windows/serial-discovery.exe" todir="windows/work/tools/" />
1186+
<antcall target="make-file-executable">
1187+
<param name="file" value="windows/work/tools/serial-discovery.exe" />
1188+
</antcall>
1189+
1190+
<antcall target="unzip">
1191+
<param name="archive_file" value="./mdns-discovery-${MDNSDISCOVER-VERSION}.zip" />
1192+
<param name="archive_url" value="https://downloads.arduino.cc/tools/mdns-discovery-${MDNSDISCOVER-VERSION}.zip" />
1193+
<param name="final_folder" value="${staging_folder}/mdns-discovery-${MDNSDISCOVER-VERSION}" />
1194+
<param name="dest_folder" value="${staging_folder}/mdns-discovery-${MDNSDISCOVER-VERSION}" />
1195+
</antcall>
1196+
<copy file="windows/mdns-discovery-${MDNSDISCOVER-VERSION}/windows/mdns-discovery.exe" todir="windows/work/tools/" />
1197+
<antcall target="make-file-executable">
1198+
<param name="file" value="windows/work/tools/mdns-discovery.exe" />
1199+
</antcall>
1200+
10991201
<delete dir="${staging_folder}/arduino-builder-windows" includeemptydirs="true"/>
11001202
<mkdir dir="${staging_folder}/arduino-builder-windows"/>
11011203
<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)