Commit ddaa3169 authored by bsam's avatar bsam
Browse files

Arduino is an open-source electronics prototyping platform based on

flexible, easy-to-use hardware and software. It's intended for artists,
designers, hobbyists, and anyone interested in creating interactive
objects or environments.

The Arduino software consists of a development environment (IDE) and the
core libraries.

WWW: http://arduino.cc/

PR:		213659
Submitted by:	bsdports@kyle-evans.net
parent 7bf519a2
......@@ -103,6 +103,7 @@
SUBDIR += arduino-mk
SUBDIR += arduino-sevseg
SUBDIR += arduino-tools
SUBDIR += arduino16
SUBDIR += argouml
SUBDIR += argp-standalone
SUBDIR += argtable
......
# $FreeBSD$
PORTNAME= arduino
PORTVERSION= 1.6.12
CATEGORIES= devel java
PKGNAMESUFFIX= 16
DIST_SUBDIR= ${PORTNAME}
MAINTAINER= bsdports@kyle-evans.net
COMMENT= Open-source electronics prototyping platform
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/../license.txt
LIB_DEPENDS= liblistSerialsj.so:devel/listserialc \
libastyle-arduinoj.so:devel/libastylej-arduino
RUN_DEPENDS= arduino-builder:devel/arduino-builder \
arduino-tools>=1.6.12:devel/arduino-tools \
bash:shells/bash
CONFLICTS= arduino-[0-9]*
BUNDLE_GH_ACCOUNT= arduino-libraries
BUNDLE_LIBRARIES= Firmata:2.5.3:firmata \
Bridge:1.6.3:bridge \
Robot_Control:1.0.2:robotcontrol \
Robot_Motor:1.0.1:robotmotor \
RobotIRremote:1.0.2:robotir \
SpacebrewYun:1.0.1:spacebrew \
Temboo:1.1.7:temboo \
Esplora:1.0.4:esplora \
Mouse:1.0.1:mouse \
Keyboard:1.0.1:keyboard
GH_TUPLE+= ${BUNDLE_GH_ACCOUNT}:WiFi101-FirmwareUpdater-Plugin:v0.8.0:wifi10/linux/work/tools/WiFi101
USE_GITHUB= yes
GH_ACCOUNT= arduino
GH_PROJECT= Arduino
.for blib in ${BUNDLE_LIBRARIES}
GH_TUPLE+= ${BUNDLE_GH_ACCOUNT}:${blib}/linux/work/libraries/${blib:C/\:.*//}
.endfor
LIB_DIRS+= ${LOCALBASE}/lib ${LOCALBASE}/lib/jni
WRKSRC_SUBDIR= build
PATCH_WRKSRC= ${WRKSRC}/../
MAKE_ARGS+= -Dlight_bundle=true -Dlocal_sources=true
USE_JAVA= yes
USE_ANT= yes
DOCS_MAKE_ARGS= -Dno_docs=false
DOCS_MAKE_ARGS_OFF= -Dno_docs=true
OS_DIR= ${WRKSRC}/linux
BUILD_DIR= ${OS_DIR}/work
INSLIST= lib libraries revisions.txt tools
STRIP= # No Elfs here, only symlinks
OPTIONS_DEFINE= DOCS EXAMPLES
OPTIONS_SUB= yes
DOCS_MASTER_SITES= http://downloads.arduino.cc/:ref,galileo,edison \
https://files.kyle-evans.net/arduino/:ref,galileo,edison
DOCS_DISTFILES= reference-1.6.6-3.zip:ref \
Galileo_help_files-1.6.2.zip:galileo \
Edison_help_files-1.6.2.zip:edison
.include <bsd.port.options.mk>
.if ${ARCH} == "amd64"
ARCH= x86_64
.endif
.if ${PORT_OPTIONS:MDOCS}
INSLIST+= reference
.endif
.if ${PORT_OPTIONS:MEXAMPLES}
INSLIST+= examples
.endif
post-extract:
${MKDIR} ${BUILD_DIR}/reference
${MV} ${WRKDIR}/code.jquery.com ${BUILD_DIR}/reference
${MV} ${WRKDIR}/www.arduino.cc ${BUILD_DIR}/reference
${MV} ${WRKDIR}/Galileo_help_files ${BUILD_DIR}/reference
${MV} ${WRKDIR}/Edison_help_files ${BUILD_DIR}/reference
post-patch:
${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' ${PATCH_WRKSRC}/arduino-core/src/processing/app/BaseNoGui.java
do-install:
${MKDIR} ${STAGEDIR}${PREFIX}/${PORTNAME}
(cd ${BUILD_DIR}/ && ${COPYTREE_SHARE} "${INSLIST}" ${STAGEDIR}${PREFIX}/${PORTNAME} ${FIND_EXPR})
(cd ${WRKSRC}/../ && ${COPYTREE_SHARE} "libraries" ${STAGEDIR}${PREFIX}/${PORTNAME} ${FIND_EXPR})
${RM} ${STAGEDIR}${PREFIX}/${PORTNAME}/lib/libastylej.so
${RM} ${STAGEDIR}${PREFIX}/${PORTNAME}/lib/liblistSerialsj.so
${LN} -s ../../lib/jni/libarduino-astylej.so ${STAGEDIR}${PREFIX}/${PORTNAME}/lib/libastylej.so
${LN} -s ../../lib/jni/liblistSerialsj.so ${STAGEDIR}${PREFIX}/${PORTNAME}/lib/liblistSerialsj.so
${INSTALL_SCRIPT} ${BUILD_DIR}/arduino ${STAGEDIR}${PREFIX}/${PORTNAME}
${LN} -s ../${PORTNAME}/arduino ${STAGEDIR}${PREFIX}/bin/arduino
${LN} -s ../bin/arduino-builder ${STAGEDIR}${PREFIX}/arduino/arduino-builder
.include <bsd.port.mk>
TIMESTAMP = 1476591503
SHA256 (arduino/reference-1.6.6-3.zip) = c3bfb7f9b408fd99a4a1c0f3b022f0a8b10abae6dc28e35d38b4a0df62903685
SIZE (arduino/reference-1.6.6-3.zip) = 7004842
SHA256 (arduino/Galileo_help_files-1.6.2.zip) = 1c70276e4783286d59c8ac0132c3286e7dcf6825bea65e25747a94416b07aa61
SIZE (arduino/Galileo_help_files-1.6.2.zip) = 4352077
SHA256 (arduino/Edison_help_files-1.6.2.zip) = 56718ce5b2b090d79dae298f6ff9a09c8c1a77f74e3594a951f7035877cc45f4
SIZE (arduino/Edison_help_files-1.6.2.zip) = 3321743
SHA256 (arduino/arduino-Arduino-1.6.12_GH0.tar.gz) = 081c063e34bd72c9912705f33395cdd1870424826b4365dd64439575e0f11817
SIZE (arduino/arduino-Arduino-1.6.12_GH0.tar.gz) = 81248294
SHA256 (arduino/arduino-libraries-WiFi101-FirmwareUpdater-Plugin-v0.8.0_GH0.tar.gz) = 2f6b17200c107e6e6190147b1e075d3bd91bf2f673853bce511eb8758c9dd133
SIZE (arduino/arduino-libraries-WiFi101-FirmwareUpdater-Plugin-v0.8.0_GH0.tar.gz) = 568963
SHA256 (arduino/arduino-libraries-Firmata-2.5.3_GH0.tar.gz) = d59313efb1050b4500d0ca8592bd312a8280903ee60051ec07ebb0f2a8cfa185
SIZE (arduino/arduino-libraries-Firmata-2.5.3_GH0.tar.gz) = 154530
SHA256 (arduino/arduino-libraries-Bridge-1.6.3_GH0.tar.gz) = 8c5f01530973aef9dbd47bd748c093e0a0774cca425e2b00e058f12d805a483f
SIZE (arduino/arduino-libraries-Bridge-1.6.3_GH0.tar.gz) = 36011
SHA256 (arduino/arduino-libraries-Robot_Control-1.0.2_GH0.tar.gz) = 1c40bbd733ea3abde7f45102ad61e019c9512670a0da3a43bc0e609a03996a57
SIZE (arduino/arduino-libraries-Robot_Control-1.0.2_GH0.tar.gz) = 78144
SHA256 (arduino/arduino-libraries-Robot_Motor-1.0.1_GH0.tar.gz) = d2ebb4e924389e15f94cb052794d666e50711c2d5a3ec9a3a3e36f2fd141d198
SIZE (arduino/arduino-libraries-Robot_Motor-1.0.1_GH0.tar.gz) = 7891
SHA256 (arduino/arduino-libraries-RobotIRremote-1.0.2_GH0.tar.gz) = 58de60b9deb51172c5cb0ba31ce66cae021b937c3f22c69580f59f94b7692af0
SIZE (arduino/arduino-libraries-RobotIRremote-1.0.2_GH0.tar.gz) = 19013
SHA256 (arduino/arduino-libraries-SpacebrewYun-1.0.1_GH0.tar.gz) = b9ac22651020c04a246a0f839c7b7627dff22b1998e6640ee6112d7251538d09
SIZE (arduino/arduino-libraries-SpacebrewYun-1.0.1_GH0.tar.gz) = 6901
SHA256 (arduino/arduino-libraries-Temboo-1.1.7_GH0.tar.gz) = 34f6a1a87f32dd18515e3813a35e51aebc4a5e369c439cd8b535fa796b0e7d51
SIZE (arduino/arduino-libraries-Temboo-1.1.7_GH0.tar.gz) = 76226
SHA256 (arduino/arduino-libraries-Esplora-1.0.4_GH0.tar.gz) = 67644c34290d02d7867af87743e5326de55ee076f44ce2edbcd6fabad2ce7bac
SIZE (arduino/arduino-libraries-Esplora-1.0.4_GH0.tar.gz) = 12615
SHA256 (arduino/arduino-libraries-Mouse-1.0.1_GH0.tar.gz) = 9269148995b5053a31781a085715f86ba60d9cf209fa1f13ba108858f1f50204
SIZE (arduino/arduino-libraries-Mouse-1.0.1_GH0.tar.gz) = 2421
SHA256 (arduino/arduino-libraries-Keyboard-1.0.1_GH0.tar.gz) = 048468d0c2d3be933971a7cbcdd68ac8619cc9a7b039eaa8ee15783ed767d793
SIZE (arduino/arduino-libraries-Keyboard-1.0.1_GH0.tar.gz) = 4098
--- app/src/processing/app/Base.java.orig 2016-09-21 10:09:37 UTC
+++ app/src/processing/app/Base.java
@@ -463,7 +463,7 @@ public class Base {
new Thread(new NewBoardListener(this)).start();
// Check for updates
- if (PreferencesData.getBoolean("update.check")) {
+ if (false) {
new UpdateCheck(this);
contributionsSelfCheck = new ContributionsSelfCheck(this, new UpdatableBoardsLibsFakeURLsHandler(this), contributionInstaller, libraryInstaller);
@@ -1060,12 +1060,7 @@ public class Base {
if (importMenu == null)
return;
importMenu.removeAll();
-
- JMenuItem menu = new JMenuItem(tr("Manage Libraries..."));
- menu.addActionListener(e -> openLibraryManager("", ""));
- importMenu.add(menu);
- importMenu.addSeparator();
-
+
JMenuItem addLibraryMenuItem = new JMenuItem(tr("Add .ZIP Library..."));
addLibraryMenuItem.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
@@ -1392,31 +1387,12 @@ public class Base {
boardMenu.putClientProperty("removeOnWindowDeactivation", true);
MenuScroller.setScrollerFor(boardMenu);
- boardMenu.add(new JMenuItem(new AbstractAction(tr("Boards Manager...")) {
- public void actionPerformed(ActionEvent actionevent) {
- String filterText = "";
- String dropdownItem = "";
- if (actionevent instanceof Event) {
- filterText = ((Event) actionevent).getPayload().get("filterText").toString();
- dropdownItem = ((Event) actionevent).getPayload().get("dropdownItem").toString();
- }
- try {
- openBoardsManager(filterText, dropdownItem);
- } catch (Exception e) {
- //TODO show error
- e.printStackTrace();
- }
- }
- }));
boardsCustomMenus.add(boardMenu);
// If there are no platforms installed we are done
if (BaseNoGui.packages.size() == 0)
return;
- // Separate "Install boards..." command from installed boards
- boardMenu.add(new JSeparator());
-
// Generate custom menus for all platforms
Set<String> customMenusTitles = new HashSet<String>();
for (TargetPackage targetPackage : BaseNoGui.packages.values()) {
--- arduino-core/src/cc/arduino/contributions/libraries/LibraryInstaller.java.orig 2016-09-21 10:09:37 UTC
+++ arduino-core/src/cc/arduino/contributions/libraries/LibraryInstaller.java
@@ -55,31 +55,7 @@ public class LibraryInstaller {
}
public synchronized void updateIndex(ProgressListener progressListener) throws Exception {
- final MultiStepProgress progress = new MultiStepProgress(2);
-
- DownloadableContributionsDownloader downloader = new DownloadableContributionsDownloader(BaseNoGui.librariesIndexer.getStagingFolder());
- // Step 1: Download index
- File outputFile = BaseNoGui.librariesIndexer.getIndexFile();
- File tmpFile = new File(outputFile.getAbsolutePath() + ".tmp");
- try {
- GZippedJsonDownloader gZippedJsonDownloader = new GZippedJsonDownloader(downloader, new URL(Constants.LIBRARY_INDEX_URL), new URL(Constants.LIBRARY_INDEX_URL_GZ));
- gZippedJsonDownloader.download(tmpFile, progress, tr("Downloading libraries index..."), progressListener);
- } catch (InterruptedException e) {
- // Download interrupted... just exit
- return;
- }
- progress.stepDone();
-
- // TODO: Check downloaded index
-
- // Replace old index with the updated one
- if (outputFile.exists())
- outputFile.delete();
- if (!tmpFile.renameTo(outputFile))
- throw new Exception(tr("An error occurred while updating libraries index!"));
-
- // Step 2: Rescan index
- rescanLibraryIndex(progress, progressListener);
+ return;
}
public synchronized void install(ContributedLibrary lib, ContributedLibrary replacedLib, ProgressListener progressListener) throws Exception {
--- arduino-core/src/cc/arduino/contributions/packages/ContributionInstaller.java.orig 2016-09-21 10:09:37 UTC
+++ arduino-core/src/cc/arduino/contributions/packages/ContributionInstaller.java
@@ -281,47 +281,11 @@ public class ContributionInstaller {
}
public synchronized List<String> updateIndex(ProgressListener progressListener) throws Exception {
- MultiStepProgress progress = new MultiStepProgress(1);
-
- List<String> downloadedPackageIndexFilesAccumulator = new LinkedList<>();
- downloadIndexAndSignature(progress, downloadedPackageIndexFilesAccumulator, Constants.PACKAGE_INDEX_URL, progressListener);
-
- Set<String> packageIndexURLs = new HashSet<>();
- String additionalURLs = PreferencesData.get(Constants.PREF_BOARDS_MANAGER_ADDITIONAL_URLS, "");
- if (!"".equals(additionalURLs)) {
- packageIndexURLs.addAll(Arrays.asList(additionalURLs.split(",")));
- }
-
- for (String packageIndexURL : packageIndexURLs) {
- try {
- downloadIndexAndSignature(progress, downloadedPackageIndexFilesAccumulator, packageIndexURL, progressListener);
- } catch (Exception e) {
- System.err.println(e.getMessage());
- }
- }
-
- progress.stepDone();
-
- return downloadedPackageIndexFilesAccumulator;
+ return new LinkedList<>();
}
private void downloadIndexAndSignature(MultiStepProgress progress, List<String> downloadedPackagedIndexFilesAccumulator, String packageIndexUrl, ProgressListener progressListener) throws Exception {
- File packageIndex = download(progress, packageIndexUrl, progressListener);
- downloadedPackagedIndexFilesAccumulator.add(packageIndex.getName());
- try {
- File packageIndexSignature = download(progress, packageIndexUrl + ".sig", progressListener);
- boolean signatureVerified = signatureVerifier.isSigned(packageIndex);
- if (signatureVerified) {
- downloadedPackagedIndexFilesAccumulator.add(packageIndexSignature.getName());
- } else {
- downloadedPackagedIndexFilesAccumulator.remove(packageIndex.getName());
- Files.delete(packageIndex.toPath());
- Files.delete(packageIndexSignature.toPath());
- System.err.println(I18n.format(tr("{0} file signature verification failed. File ignored."), packageIndexUrl));
- }
- } catch (Exception e) {
- //ignore errors
- }
+ return;
}
private File download(MultiStepProgress progress, String packageIndexUrl, ProgressListener progressListener) throws Exception {
--- arduino-core/src/cc/arduino/contributions/packages/ContributionsIndexer.java.orig 2016-09-21 10:09:37 UTC
+++ arduino-core/src/cc/arduino/contributions/packages/ContributionsIndexer.java
@@ -85,17 +85,6 @@ public class ContributionsIndexer {
File bundledIndexFile = new File(builtInHardwareFolder, Constants.BUNDLED_INDEX_FILE_NAME);
index = parseIndex(bundledIndexFile);
- // ...and overlay the default index if present
- File defaultIndexFile = getIndexFile(Constants.DEFAULT_INDEX_FILE_NAME);
- if (defaultIndexFile.exists()) {
- // Check main index signature
- if (!PreferencesData.getBoolean("allow_insecure_packages") && !signatureVerifier.isSigned(defaultIndexFile)) {
- throw new SignatureVerificationFailedException(Constants.DEFAULT_INDEX_FILE_NAME);
- }
-
- mergeContributions(parseIndex(defaultIndexFile), defaultIndexFile);
- }
-
// Set main and bundled indexes as trusted
index.getPackages().forEach(pack -> pack.setTrusted(true));
--- arduino-core/src/cc/arduino/contributions/packages/HostDependentDownloadableContribution.java.orig 2016-09-21 10:09:37 UTC
+++ arduino-core/src/cc/arduino/contributions/packages/HostDependentDownloadableContribution.java
@@ -79,6 +79,16 @@ public abstract class HostDependentDownl
}
}
+ 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;
}
}
--- arduino-core/src/processing/app/BaseNoGui.java.orig 2016-09-21 10:09:37 UTC
+++ arduino-core/src/processing/app/BaseNoGui.java
@@ -851,7 +851,7 @@ public class BaseNoGui {
if (installedFolder != null) {
toolPath = installedFolder.getAbsolutePath();
} else {
- toolPath = Constants.PREF_REMOVE_PLACEHOLDER;
+ toolPath = "/usr/local";
}
String toolName = tool.getName();
String toolVersion = tool.getVersion();
--- build/build.xml.orig 2016-09-21 10:09:37 UTC
+++ build/build.xml
@@ -99,7 +99,7 @@
</fileset>
<target name="build" description="Build Arduino.">
- <antcall target="${platform}-build" />
+ <antcall target="linux64-build" />
<antcall target="generate-hourly-build-txt"/>
</target>
@@ -177,46 +177,23 @@
<mkdir dir="${target.path}/reference"/>
- <!-- Unzip documentation -->
- <antcall target="unzip">
- <param name="archive_file" value="shared/reference-1.6.6-3.zip" />
- <param name="archive_url" value="http://downloads.arduino.cc/reference-1.6.6-3.zip" />
- <param name="final_folder" value="${target.path}/reference/www.arduino.cc" />
- <param name="dest_folder" value="${target.path}/reference/" />
- </antcall>
- <antcall target="unzip">
- <param name="archive_file" value="shared/Galileo_help_files-1.6.2.zip" />
- <param name="archive_url" value="http://downloads.arduino.cc/Galileo_help_files-1.6.2.zip" />
- <param name="final_folder" value="${target.path}/reference/Galileo_help_files" />
- <param name="dest_folder" value="${target.path}/reference/" />
- </antcall>
- <antcall target="unzip">
- <param name="archive_file" value="shared/Edison_help_files-1.6.2.zip" />
- <param name="archive_url" value="http://downloads.arduino.cc/Edison_help_files-1.6.2.zip" />
- <param name="final_folder" value="${target.path}/reference/Edison_help_files" />
- <param name="dest_folder" value="${target.path}/reference/" />
- </antcall>
-
- <!-- Fix wrong permissions from zip file root folder -->
- <chmod perm="755" dir="${target.path}/reference/Galileo_help_files" />
- <chmod perm="755" dir="${target.path}/reference/Edison_help_files" />
+ <antcall target="assemble-docs" />
<!-- Write the revision file! -->
<echo file="${target.path}/lib/version.txt" message="${version}" />
<antcall target="assemble-libraries" />
+ </target>
- <!-- Add WiFi101 updater tool -->
- <antcall target="unzip">
- <param name="archive_file" value="shared/WiFi101-Updater-ArduinoIDE-Plugin-0.8.0.zip" />
- <param name="archive_url" value="https://github.com/arduino-libraries/WiFi101-FirmwareUpdater-Plugin/releases/download/v0.8.0/WiFi101-Updater-ArduinoIDE-Plugin-0.8.0.zip" />
- <param name="final_folder" value="${target.path}/tools/WiFi101" />
- <param name="dest_folder" value="${target.path}/tools/" />
- </antcall>
+ <target name="assemble-docs" unless="no_docs">
+ <!-- Fix wrong permissions from zip file root folder -->
+ <chmod perm="755" dir="${target.path}/reference/Galileo_help_files" />
+ <chmod perm="755" dir="${target.path}/reference/Edison_help_files" />
</target>
<!-- copy library folder -->
- <target name="assemble-libraries" unless="light_bundle">
+ <target name="assemble-libraries" depends="assemble-libraries-full, assemble-libraries-light" />
+ <target name="assemble-libraries-full" unless="light_bundle">
<copy todir="${target.path}/libraries">
<fileset dir="../libraries"/>
</copy>
@@ -232,6 +209,9 @@
<download-library name="Mouse" version="1.0.1"/>
<download-library name="Keyboard" version="1.0.1"/>
</target>
+ <target name="assemble-libraries-light" if="light_bundle">
+ <mkdir dir="${target.path}/libraries" />
+ </target>
<macrodef name="download-library">
<attribute name="name"/>
@@ -250,13 +230,17 @@
</macrodef>
<!-- copy hardware folder -->
- <target name="assemble-hardware" unless="light_bundle">
+ <target name="assemble-hardware" depends="assemble-hardware-full, assemble-hardware-light" />
+ <target name="assemble-hardware-full" unless="light_bundle">
<copy todir="${target.path}/hardware">
<fileset dir="../hardware">
<exclude name="arduino/sam/**"/>
</fileset>
</copy>
</target>
+ <target name="assemble-hardware-light" if="light_bundle">
+ <copy file="../hardware/package_index_bundled.json" todir="${target.path}/hardware" />
+ </target>
<!-- - - - - - - - - -->
<!-- Revision check -->
@@ -362,7 +346,7 @@
<antcall target="unzip">
<param name="archive_file" value="${staging_folder}/appbundler-1.0ea-arduino4.jar.zip" />
- <param name="archive_url" value="http://downloads.arduino.cc/appbundler-1.0ea-arduino4.jar.zip" />
+ <param name="archive_url" value="https://downloads.arduino.cc/appbundler-1.0ea-arduino4.jar.zip" />
<param name="final_folder" value="${staging_folder}/appbundler-1.0ea-arduino4" />
<param name="dest_folder" value="${staging_folder}/appbundler-1.0ea-arduino4" />
</antcall>
@@ -447,7 +431,7 @@
<antcall target="unzip">
<param name="archive_file" value="./libastylej-2.05.1-3.zip" />
- <param name="archive_url" value="http://downloads.arduino.cc/libastylej-2.05.1-3.zip" />
+ <param name="archive_url" value="https://downloads.arduino.cc/libastylej-2.05.1-3.zip" />
<param name="final_folder" value="${staging_folder}/libastylej-2.05.1" />
<param name="dest_folder" value="${staging_folder}" />
</antcall>
@@ -458,7 +442,7 @@
<antcall target="unzip">
<param name="archive_file" value="./liblistSerials-${LIBLISTSERIAL-VERSION}.zip" />
- <param name="archive_url" value="http://downloads.arduino.cc/liblistSerials/liblistSerials-${LIBLISTSERIAL-VERSION}.zip" />
+ <param name="archive_url" value="https://downloads.arduino.cc/liblistSerials/liblistSerials-${LIBLISTSERIAL-VERSION}.zip" />
<param name="final_folder" value="${staging_folder}/liblistSerials-${LIBLISTSERIAL-VERSION}" />
<param name="dest_folder" value="${staging_folder}" />
</antcall>
@@ -469,7 +453,7 @@
<mkdir dir="${staging_folder}/arduino-builder-macosx"/>
<antcall target="untar">
<param name="archive_file" value="./arduino-builder-macosx-${ARDUINO-BUILDER-VERSION}.tar.bz2" />
- <param name="archive_url" value="http://downloads.arduino.cc/tools/arduino-builder-macosx-${ARDUINO-BUILDER-VERSION}.tar.bz2" />
+ <param name="archive_url" value="https://downloads.arduino.cc/tools/arduino-builder-macosx-${ARDUINO-BUILDER-VERSION}.tar.bz2" />
<param name="final_folder" value="${staging_folder}/arduino-builder-macosx/arduino-builder" />
<param name="dest_folder" value="${staging_folder}/arduino-builder-macosx" />
</antcall>
@@ -643,53 +627,15 @@
</target>
<target name="linux-libastyle-x86" depends="linux-build" description="Download libastyle.so for x86/x64 arch">
- <antcall target="unzip">
- <param name="archive_file" value="./libastylej-2.05.1-3.zip" />
- <param name="archive_url" value="http://downloads.arduino.cc/libastylej-2.05.1-3.zip" />
- <param name="final_folder" value="${staging_folder}/libastylej-2.05.1" />
- <param name="dest_folder" value="${staging_folder}" />
- </antcall>
- <copy file="linux/libastylej-2.05.1/libastylej${arch-bits}.so" tofile="linux/work/lib/libastylej.so" />
- <chmod perm="755" file="linux/work/lib/libastylej.so" />
-
<antcall target="portable-${portable}">
<param name="parentdir" value="linux/work" />
</antcall>
-
- <antcall target="unzip">
- <param name="archive_file" value="./liblistSerials-${LIBLISTSERIAL-VERSION}.zip" />
- <param name="archive_url" value="http://downloads.arduino.cc/liblistSerials/liblistSerials-${LIBLISTSERIAL-VERSION}.zip" />
- <param name="final_folder" value="${staging_folder}/liblistSerials-${LIBLISTSERIAL-VERSION}" />
- <param name="dest_folder" value="${staging_folder}" />
- </antcall>
- <copy file="linux/liblistSerials-${LIBLISTSERIAL-VERSION}/linux${arch-bits}/liblistSerialsj.so" todir="linux/work/lib/" />
- <chmod perm="755" file="linux/work/lib/liblistSerialsj.so" />
-
</target>
<target name="linux-libastyle-arm" depends="linux-build" description="Download libastyle.so for ARM">
- <antcall target="unzip">
- <param name="archive_file" value="./libastylej-2.05.1-3.zip" />
- <param name="archive_url" value="http://downloads.arduino.cc/libastylej-2.05.1-3.zip" />
- <param name="final_folder" value="${staging_folder}/libastylej-2.05.1" />
- <param name="dest_folder" value="${staging_folder}" />
- </antcall>
- <copy file="linux/libastylej-2.05.1/libastylej_arm.so" tofile="linux/work/lib/libastylej.so" />
- <chmod perm="755" file="linux/work/lib/libastylej.so" />
-
<antcall target="portable-${portable}">
<param name="parentdir" value="linux/work" />
</antcall>
-
- <antcall target="unzip">
- <param name="archive_file" value="./liblistSerials-${LIBLISTSERIAL-VERSION}.zip" />
- <param name="archive_url" value="http://downloads.arduino.cc/liblistSerials/liblistSerials-${LIBLISTSERIAL-VERSION}.zip" />
- <param name="final_folder" value="${staging_folder}/liblistSerials-${LIBLISTSERIAL-VERSION}" />
- <param name="dest_folder" value="${staging_folder}" />
- </antcall>
- <copy file="linux/liblistSerials-${LIBLISTSERIAL-VERSION}/arm/liblistSerialsj.so" todir="linux/work/lib/" />
- <chmod perm="755" file="linux/work/lib/liblistSerialsj.so" />
-
</target>
<target name="linuxarm-build" depends="linux-libastyle-arm" description="Build linux (32-bit) version">
@@ -701,7 +647,7 @@
<mkdir dir="${staging_folder}/arduino-builder-arm"/>
<antcall target="untar">
<param name="archive_file" value="./arduino-builder-arm-${ARDUINO-BUILDER-VERSION}.tar.bz2" />
- <param name="archive_url" value="http://downloads.arduino.cc/tools/arduino-builder-arm-${ARDUINO-BUILDER-VERSION}.tar.bz2" />
+ <param name="archive_url" value="https://downloads.arduino.cc/tools/arduino-builder-arm-${ARDUINO-BUILDER-VERSION}.tar.bz2" />
<param name="final_folder" value="${staging_folder}/arduino-builder-arm/arduino-builder" />
<param name="dest_folder" value="${staging_folder}/arduino-builder-arm" />
</antcall>
@@ -731,7 +677,7 @@
<mkdir dir="${staging_folder}/arduino-builder-linux32"/>
<antcall target="untar">
<param name="archive_file" value="./arduino-builder-linux32-${ARDUINO-BUILDER-VERSION}.tar.bz2" />
- <param name="archive_url" value="http://downloads.arduino.cc/tools/arduino-builder-linux32-${ARDUINO-BUILDER-VERSION}.tar.bz2" />
+ <param name="archive_url" value="https://downloads.arduino.cc/tools/arduino-builder-linux32-${ARDUINO-BUILDER-VERSION}.tar.bz2" />
<param name="final_folder" value="${staging_folder}/arduino-builder-linux32/arduino-builder" />
<param name="dest_folder" value="${staging_folder}/arduino-builder-linux32" />
</antcall>
@@ -756,30 +702,6 @@
<antcall target="linux-jvm-${linux-bundle-jvm-task}">
<param name="JVM" value="${LINUX64_BUNDLED_JVM}"/>
</antcall>
-
- <delete dir="${staging_folder}/arduino-builder-linux64" includeemptydirs="true"/>
- <mkdir dir="${staging_folder}/arduino-builder-linux64"/>
- <antcall target="untar">
- <param name="archive_file" value="./arduino-builder-linux64-${ARDUINO-BUILDER-VERSION}.tar.bz2" />
- <param name="archive_url" value="http://downloads.arduino.cc/tools/arduino-builder-linux64-${ARDUINO-BUILDER-VERSION}.tar.bz2" />
- <param name="final_folder" value="${staging_folder}/arduino-builder-linux64/arduino-builder" />
- <param name="dest_folder" value="${staging_folder}/arduino-builder-linux64" />
- </antcall>
- <copy file="${staging_folder}/arduino-builder-linux64/arduino-builder" tofile="linux/work/arduino-builder" />
- <chmod perm="755" file="linux/work/arduino-builder" />
- <move file="${staging_folder}/arduino-builder-linux64/tools" tofile="linux/work/tools-builder"/>
- <copy todir="linux/work/hardware" overwrite="true">
- <fileset dir="${staging_folder}/arduino-builder-linux64/hardware" includes="*.txt"/>
- </copy>
- <delete dir="${staging_folder}/arduino-builder-linux64" includeemptydirs="true"/>
-
- <antcall target="avr-toolchain-bundle">
- <param name="unpack_target" value="untar"/>
- <param name="gcc_archive_file" value="avr-gcc-${AVRGCC-VERSION}-x86_64-pc-linux-gnu.tar.bz2"/>
- <param name="gcc_version" value="${AVRGCC-VERSION}"/>
- <param name="avrdude_archive_file" value="avrdude-${AVRDUDE-VERSION}-x86_64-pc-linux-gnu.tar.bz2"/>
- <param name="avrdude_version" value="${AVRDUDE-VERSION}"/>