From 481fd94ac64f3031d82fd8f2612eafbbff4b5c65 Mon Sep 17 00:00:00 2001 From: Kyle Evans Date: Mon, 3 Oct 2016 23:37:27 -0500 Subject: [PATCH 1/2] Add FreeBSD Platform Tag -- supports x86_64-freebsd, arm*-freebsd, and i386-freebsd with optional extension for tagging specific release (e.g. freebsd11) --- .../HostDependentDownloadableContribution.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/arduino-core/src/cc/arduino/contributions/packages/HostDependentDownloadableContribution.java b/arduino-core/src/cc/arduino/contributions/packages/HostDependentDownloadableContribution.java index 93a3420308a..70f23da0dec 100644 --- a/arduino-core/src/cc/arduino/contributions/packages/HostDependentDownloadableContribution.java +++ b/arduino-core/src/cc/arduino/contributions/packages/HostDependentDownloadableContribution.java @@ -79,6 +79,16 @@ public boolean isCompatible(Platform platform) { } } + if (osName.contains("FreeBSD")) { + if (osArch.contains("amd64")) { + return host.matches("x86_64-freebsd[0-9]*"); + } else if (osArch.contains("arm")) { + return host.matches("arm.*-freebsd[0-9]*"); + } else { + return host.matches("i386-freebsd[0-9]*"); + } + } + return false; } } From ba42280fba2b6a3827c9e1ce0ced115118a78a90 Mon Sep 17 00:00:00 2001 From: Kyle Evans Date: Wed, 28 Dec 2016 23:37:10 -0600 Subject: [PATCH 2/2] Simply arch matching --- .../packages/HostDependentDownloadableContribution.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/arduino-core/src/cc/arduino/contributions/packages/HostDependentDownloadableContribution.java b/arduino-core/src/cc/arduino/contributions/packages/HostDependentDownloadableContribution.java index 70f23da0dec..9209c77fc3f 100644 --- a/arduino-core/src/cc/arduino/contributions/packages/HostDependentDownloadableContribution.java +++ b/arduino-core/src/cc/arduino/contributions/packages/HostDependentDownloadableContribution.java @@ -80,12 +80,10 @@ public boolean isCompatible(Platform platform) { } if (osName.contains("FreeBSD")) { - if (osArch.contains("amd64")) { - return host.matches("x86_64-freebsd[0-9]*"); - } else if (osArch.contains("arm")) { + if (osArch.contains("arm")) { return host.matches("arm.*-freebsd[0-9]*"); } else { - return host.matches("i386-freebsd[0-9]*"); + return host.matches(osArch + "-freebsd[0-9]*"); } }