diff options
| -rw-r--r-- | .SRCINFO | 20 | ||||
| -rw-r--r-- | PKGBUILD | 23 | ||||
| -rw-r--r-- | arduino.install | 31 | ||||
| -rw-r--r-- | arduino.sh | 3 | ||||
| -rw-r--r-- | build.patch | 214 |
5 files changed, 71 insertions, 220 deletions
@@ -1,7 +1,7 @@ pkgbase = arduino pkgdesc = Arduino prototyping platform SDK - pkgver = 1.6.12 - pkgrel = 4 + pkgver = 1.6.13 + pkgrel = 1 epoch = 1 url = https://github.com/arduino/Arduino install = arduino.install @@ -21,18 +21,18 @@ pkgbase = arduino optdepends = arduino-avr-core: AVR core with upstream avr-gcc and avrdude optdepends = python2: Intel Galileo Board installation options = !strip - source = arduino-1.6.12.tar.gz::https://github.com/arduino/Arduino/archive/1.6.12.tar.gz - source = https://github.com/arduino-libraries/WiFi101-FirmwareUpdater-Plugin/releases/download/v0.8.0/WiFi101-Updater-ArduinoIDE-Plugin-0.8.0.zip + source = arduino-1.6.13.tar.gz::https://github.com/arduino/Arduino/archive/1.6.13.tar.gz + source = https://github.com/arduino-libraries/WiFi101-FirmwareUpdater-Plugin/releases/download/v0.8.3/WiFi101-Updater-ArduinoIDE-Plugin-0.8.3.zip source = https://downloads.arduino.cc/libastylej-2.05.1-3.zip - source = https://downloads.arduino.cc/liblistSerials/liblistSerials-1.1.4.zip + source = https://downloads.arduino.cc/liblistSerials/liblistSerials-1.2.0.zip source = arduino.sh source = build.patch - sha512sums = 2d386ddf26babc920767db9062304b75bf0b6b12ac469a33597b9b8abcc306a1ea6c18dd8b59f51fa2ecd7ffd66f36e80ade1953fd104cf29f0d74b5ab9da2d9 - sha512sums = b4ef0f253c56529eef52fad353f8e448f1756714a7fcd61370d7fabab61d4d09867b82301b2d30e4698f2c5b70b202e7536fa16a98e5fab0210c2c7d8f977e78 + sha512sums = 54643199a56fd01ac9e031fc03f174c38a2cc7b0b13953e1c543aae58f2d0987ad127abe224e3863eb6ec9c81022288073613f86b75543babfc9d186f75a15f9 + sha512sums = fb2c5f77ea047c060e67705886d106379ac4a297f3a7d1f7d6d0b2410c4592f09cece4578aeeaed867c03a2efe5fe8d124ccc36c4189ee5c875cd16473a6faab sha512sums = 7f82d64e34ef2d85a6b037caeecfa338b72f8edfc57a9903af3ab89b1d42cf7dfd9a6170abe8131ae3e6506850d82ed5092c3b08983a16d9c80319cd24c14555 - sha512sums = db605a53bbe8ce9da2387e991da2401054bf25f6172c4ffc72cba1fff8c44d819ed967f7f0e666e38ce967359573f6e3c544774832dd446f8107849ee76aaaba - sha512sums = 6dae08b8687e897ed370cc51cfeeba9020bb749356acfd367c796bf34fb43b763888340501be6a577859c19c37fe857be2b8fb52f1295769403b8e826c4e3f28 - sha512sums = 71d36dcc21b399a9ebe70801f5738687d8c309ef0410bfb8b7f540d12d5df1771c09ecef8a271cdff492523b5a15e2ffb1b51b62cfccd6761eae28d0ffabcc02 + sha512sums = 79f2eaf75c5f948c8388b6d89d3ce1f14518390ee2df111e1603eafb490f54a5c071af61b228cae3bfa8c20bc0a5450b1131f2328c419241ba0d127837b97292 + sha512sums = d97e73a6764232c5fbcdbd46d98f1dfde1d95d8256f578fb05480694423842ec864c49d572a325c7d00b026619d84dc114f1e3e0d2f8219b94871dce1718f05a + sha512sums = 8f0186a6554a54c3067bcf71b8891a6e51b2613fd9135f4b0a10e6e24f4797757ca968ee1195f5bcac01f0aa22b73005b273939346a3aea9aee391e8d31a3588 source_i686 = https://downloads.arduino.cc/tools/arduino-builder-linux32-1.3.21_r1.tar.bz2 sha512sums_i686 = a0df7ba3d7f313aeac4c32365b9aaf32feb374c18e0b82516d61e51be10db897f368e46b6ff4e1574fec8b78fe584c39a76215974b32b440e85e27a1434e3d12 source_x86_64 = https://downloads.arduino.cc/tools/arduino-builder-linux64-1.3.21_r1.tar.bz2 @@ -1,4 +1,4 @@ -# Maintainer: NicoHood <aur {at} nicohood {dot} de> +# Maintainer: NicoHood <archlinux {at} nicohood {dot} de> # PGP ID: 97312D5EB9D7AE7D0BD4307351DAE9B7C1AE9161 # Contributor: Tomas Schertel <tschertel at gmail dot com> # Contributor: Christopher Loen <christopherloen at gmail dot com> @@ -9,34 +9,34 @@ # Contributor: tty0 <vt.tty0[d0t]gmail.com> pkgname=arduino -pkgver=1.6.12 -pkgrel=4 +pkgver=1.6.13 +pkgrel=1 epoch=1 pkgdesc="Arduino prototyping platform SDK" arch=('i686' 'x86_64') url="https://github.com/arduino/Arduino" license=('GPL' 'LGPL') depends=('gtk2' 'desktop-file-utils' 'shared-mime-info' 'java-runtime=8' 'arduino-builder') -makedepends=('java-environment=8' 'apache-ant' 'unzip') # TODO remove unzip once all deps are resolved +makedepends=('java-environment=8' 'apache-ant' 'unzip') optdepends=('arduino-docs: Offline documentation for arduino' 'arduino-avr-core: AVR core with upstream avr-gcc and avrdude' 'python2: Intel Galileo Board installation') options=(!strip) install="arduino.install" source=("${pkgname}-${pkgver}.tar.gz::https://github.com/arduino/Arduino/archive/${pkgver}.tar.gz" - "https://github.com/arduino-libraries/WiFi101-FirmwareUpdater-Plugin/releases/download/v0.8.0/WiFi101-Updater-ArduinoIDE-Plugin-0.8.0.zip" + "https://github.com/arduino-libraries/WiFi101-FirmwareUpdater-Plugin/releases/download/v0.8.3/WiFi101-Updater-ArduinoIDE-Plugin-0.8.3.zip" "https://downloads.arduino.cc/libastylej-2.05.1-3.zip" - "https://downloads.arduino.cc/liblistSerials/liblistSerials-1.1.4.zip" + "https://downloads.arduino.cc/liblistSerials/liblistSerials-1.2.0.zip" "arduino.sh" "build.patch") source_i686=("https://downloads.arduino.cc/tools/arduino-builder-linux32-1.3.21_r1.tar.bz2") source_x86_64=("https://downloads.arduino.cc/tools/arduino-builder-linux64-1.3.21_r1.tar.bz2") -sha512sums=('2d386ddf26babc920767db9062304b75bf0b6b12ac469a33597b9b8abcc306a1ea6c18dd8b59f51fa2ecd7ffd66f36e80ade1953fd104cf29f0d74b5ab9da2d9' - 'b4ef0f253c56529eef52fad353f8e448f1756714a7fcd61370d7fabab61d4d09867b82301b2d30e4698f2c5b70b202e7536fa16a98e5fab0210c2c7d8f977e78' +sha512sums=('54643199a56fd01ac9e031fc03f174c38a2cc7b0b13953e1c543aae58f2d0987ad127abe224e3863eb6ec9c81022288073613f86b75543babfc9d186f75a15f9' + 'fb2c5f77ea047c060e67705886d106379ac4a297f3a7d1f7d6d0b2410c4592f09cece4578aeeaed867c03a2efe5fe8d124ccc36c4189ee5c875cd16473a6faab' '7f82d64e34ef2d85a6b037caeecfa338b72f8edfc57a9903af3ab89b1d42cf7dfd9a6170abe8131ae3e6506850d82ed5092c3b08983a16d9c80319cd24c14555' - 'db605a53bbe8ce9da2387e991da2401054bf25f6172c4ffc72cba1fff8c44d819ed967f7f0e666e38ce967359573f6e3c544774832dd446f8107849ee76aaaba' - '6dae08b8687e897ed370cc51cfeeba9020bb749356acfd367c796bf34fb43b763888340501be6a577859c19c37fe857be2b8fb52f1295769403b8e826c4e3f28' - '71d36dcc21b399a9ebe70801f5738687d8c309ef0410bfb8b7f540d12d5df1771c09ecef8a271cdff492523b5a15e2ffb1b51b62cfccd6761eae28d0ffabcc02') + '79f2eaf75c5f948c8388b6d89d3ce1f14518390ee2df111e1603eafb490f54a5c071af61b228cae3bfa8c20bc0a5450b1131f2328c419241ba0d127837b97292' + 'd97e73a6764232c5fbcdbd46d98f1dfde1d95d8256f578fb05480694423842ec864c49d572a325c7d00b026619d84dc114f1e3e0d2f8219b94871dce1718f05a' + '8f0186a6554a54c3067bcf71b8891a6e51b2613fd9135f4b0a10e6e24f4797757ca968ee1195f5bcac01f0aa22b73005b273939346a3aea9aee391e8d31a3588') sha512sums_i686=('a0df7ba3d7f313aeac4c32365b9aaf32feb374c18e0b82516d61e51be10db897f368e46b6ff4e1574fec8b78fe584c39a76215974b32b440e85e27a1434e3d12') sha512sums_x86_64=('223b81ae4cdb14962e3e6b271f78a88c055185785991d0ff32b3dbb3db9a4861cec495e5e726718df484e8c9901f5d3f0650d4d1e3b8d7bdb8f197c23222e748') @@ -76,6 +76,7 @@ package() { # Link arduino-builder, ctags, libastylej, libserialport and docs # TODO ctags, astyle libserialport do not work yet + # TODO remove unzip dependency once all deps are resolved # https://github.com/arduino/ctags/issues/12 # https://github.com/arduino/Arduino/issues/5538 # https://github.com/arduino/listSerialPortsC/issues/9 diff --git a/arduino.install b/arduino.install index 9a2794a97038..fd69f8b229dc 100644 --- a/arduino.install +++ b/arduino.install @@ -1,4 +1,31 @@ post_install() { - echo "Add yourself to the uucp group to access the serial ports:" - echo "sudo usermod -a -G uucp <user>" + echo "Add yourself to the uucp group to access the serial ports:" + echo "sudo usermod -a -G uucp <user>" + echo "Please checkout the wiki for further information." +} + +pre_upgrade() { + if [[ $(vercmp 1:1.6.12-1 "$2") -eq 1 ]]; then + echo "If arduino fails to install try to manually remove it first:" + echo "sudo pacman -Rs arduino" + fi +} + +_1:1.6.12_1_changes() { + echo ":: arduino is now split into arduino-builder, arduino-avr-core and arduino-docs" + echo " If arduino fails to run, check for a zombie folder:" + echo " ls -la /usr/share/arduino/hardware/avr" + echo " It might be left from a very old upgrade. Please remove it." +} + +post_upgrade() { + local v upgrades=( + 1:1.6.12-1 + ) + + for v in "${upgrades[@]}"; do + if [[ $(vercmp "$v" "$2") -eq 1 ]]; then + "_${v//-/_}_changes" + fi + done } diff --git a/arduino.sh b/arduino.sh index 203c8d184802..e0f12fe8b500 100644 --- a/arduino.sh +++ b/arduino.sh @@ -1,4 +1,3 @@ #!/bin/sh - -export PATH=/usr/lib/jvm/java-8-openjdk/jre/bin/:$PATH +export PATH=/usr/lib/jvm/java-8-openjdk/jre/bin/:"$PATH" exec /usr/share/arduino/arduino "$@" diff --git a/build.patch b/build.patch index a1e51b2cb7d2..174612ada9ed 100644 --- a/build.patch +++ b/build.patch @@ -1,10 +1,10 @@ -diff -aur Arduino-1.6.12/build/build.xml Arduino-1.6.12.new/build/build.xml ---- Arduino-1.6.12/build/build.xml 2016-09-21 12:09:37.000000000 +0200 -+++ Arduino-1.6.12.new/build/build.xml 2016-10-04 00:05:43.459380000 +0200 +diff -aur Arduino-1.6.13/build/build.xml Arduino-1.6.13_new/build/build.xml +--- Arduino-1.6.13/build/build.xml 2016-11-22 15:49:35.000000000 +0100 ++++ Arduino-1.6.13_new/build/build.xml 2016-12-12 18:37:31.499962000 +0100 @@ -177,29 +177,7 @@ - + <mkdir dir="${target.path}/reference"/> - + - <!-- Unzip documentation --> - <antcall target="unzip"> - <param name="archive_file" value="shared/reference-1.6.6-3.zip" /> @@ -29,30 +29,30 @@ diff -aur Arduino-1.6.12/build/build.xml Arduino-1.6.12.new/build/build.xml - <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}" /> @@ -215,8 +193,35 @@ </antcall> </target> - + + <target name="assemble-docs" unless="no_docs"> + <!-- Unzip documentation --> + <antcall target="unzip"> + <param name="archive_file" value="shared/reference-1.6.6-3.zip" /> -+ <param name="archive_url" value="https://downloads.arduino.cc/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="https://downloads.arduino.cc/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="https://downloads.arduino.cc/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> @@ -69,19 +69,19 @@ diff -aur Arduino-1.6.12/build/build.xml Arduino-1.6.12.new/build/build.xml <copy todir="${target.path}/libraries"> <fileset dir="../libraries"/> </copy> -@@ -232,6 +237,9 @@ - <download-library name="Mouse" version="1.0.1"/> +@@ -233,6 +238,9 @@ <download-library name="Keyboard" version="1.0.1"/> + <download-library name="SD" version="1.0.9"/> </target> + <target name="assemble-libraries-light" if="light_bundle"> + <mkdir dir="${target.path}/libraries" /> + </target> - + <macrodef name="download-library"> <attribute name="name"/> -@@ -250,13 +258,17 @@ +@@ -251,13 +259,17 @@ </macrodef> - + <!-- copy hardware folder --> - <target name="assemble-hardware" unless="light_bundle"> + <target name="assemble-hardware" depends="assemble-hardware-full, assemble-hardware-light" /> @@ -95,110 +95,11 @@ diff -aur Arduino-1.6.12/build/build.xml Arduino-1.6.12.new/build/build.xml + <target name="assemble-hardware-light" if="light_bundle"> + <copy file="../hardware/package_index_bundled.json" todir="${target.path}/hardware" /> + </target> - + <!-- - - - - - - - - --> <!-- Revision check --> -@@ -362,7 +374,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 +459,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 +470,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 +481,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> -@@ -645,7 +657,7 @@ - <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="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> -@@ -658,7 +670,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> -@@ -670,7 +682,7 @@ - <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="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> -@@ -683,7 +695,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> -@@ -701,7 +713,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 +743,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> -@@ -761,7 +773,7 @@ - <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="archive_url" value="https://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> -@@ -822,8 +834,21 @@ - +@@ -823,8 +835,21 @@ + <!-- Retrieve tool --> <target name="untar-unzip-download" depends="untar-unzip-check" unless="${archive_file}_available"> + <antcall target="untar-unzip-download-web" /> @@ -216,83 +117,6 @@ diff -aur Arduino-1.6.12/build/build.xml Arduino-1.6.12.new/build/build.xml + <arg value="${archive_file}" /> + </exec> + </target> - + <target name="untar-unzip-checksum" depends="untar-unzip-download"> <echo>Testing checksum of "${archive_file}"</echo> -@@ -926,7 +951,7 @@ - <target name="download-launch4j-windows"> - <antcall target="unzip-with-ant-task"> - <param name="archive_file" value="windows/launch4j-3.8-win32.zip"/> -- <param name="archive_url" value="http://downloads.sourceforge.net/project/launch4j/launch4j-3/3.8/launch4j-3.8-win32.zip"/> -+ <param name="archive_url" value="https://downloads.sourceforge.net/project/launch4j/launch4j-3/3.8/launch4j-3.8-win32.zip"/> - <param name="final_folder" value="windows/launcher/launch4j"/> - <param name="dest_folder" value="windows/launcher/"/> - </antcall> -@@ -935,7 +960,7 @@ - <target name="download-launch4j-linux"> - <antcall target="untar"> - <param name="archive_file" value="windows/launch4j-3.8-linux.tgz"/> -- <param name="archive_url" value="http://downloads.sourceforge.net/project/launch4j/launch4j-3/3.8/launch4j-3.8-linux.tgz"/> -+ <param name="archive_url" value="https://downloads.sourceforge.net/project/launch4j/launch4j-3/3.8/launch4j-3.8-linux.tgz"/> - <param name="final_folder" value="windows/launcher/launch4j"/> - <param name="dest_folder" value="windows/launcher/"/> - </antcall> -@@ -977,7 +1002,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> -@@ -987,7 +1012,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> -@@ -998,7 +1023,7 @@ - <mkdir dir="${staging_folder}/arduino-builder-windows"/> - <antcall target="unzip-with-ant-task"> - <param name="archive_file" value="./arduino-builder-windows-${ARDUINO-BUILDER-VERSION}.zip" /> -- <param name="archive_url" value="http://downloads.arduino.cc/tools/arduino-builder-windows-${ARDUINO-BUILDER-VERSION}.zip" /> -+ <param name="archive_url" value="https://downloads.arduino.cc/tools/arduino-builder-windows-${ARDUINO-BUILDER-VERSION}.zip" /> - <param name="final_folder" value="${staging_folder}/arduino-builder-windows/arduino-builder.exe" /> - <param name="dest_folder" value="${staging_folder}/arduino-builder-windows" /> - </antcall> -@@ -1131,12 +1156,12 @@ - </target> - - <target name="avr-toolchain-bundle" unless="light_bundle"> -- <!-- Unzip AVR tools --> -+ <!-- - <mkdir dir="${staging_folder}/work/${staging_hardware_folder}/tmp/gcc"/> - - <antcall target="${unpack_target}"> - <param name="archive_file" value="${staging_folder}/${gcc_archive_file}"/> -- <param name="archive_url" value="http://downloads.arduino.cc/tools/${gcc_archive_file}"/> -+ <param name="archive_url" value="https://downloads.arduino.cc/tools/${gcc_archive_file}"/> - <param name="final_folder" value="${staging_folder}/work/${staging_hardware_folder}/tmp/gcc/${gcc_version}/"/> - <param name="dest_folder" value="${staging_folder}/work/${staging_hardware_folder}/tmp/gcc/"/> - </antcall> -@@ -1145,7 +1170,7 @@ - - <antcall target="${unpack_target}"> - <param name="archive_file" value="${staging_folder}/${avrdude_archive_file}"/> -- <param name="archive_url" value="http://downloads.arduino.cc/tools/${avrdude_archive_file}"/> -+ <param name="archive_url" value="https://downloads.arduino.cc/tools/${avrdude_archive_file}"/> - <param name="final_folder" value="${staging_folder}/work/${staging_hardware_folder}/tmp/avrdude/${avrdude_version}"/> - <param name="dest_folder" value="${staging_folder}/work/${staging_hardware_folder}/tmp/avrdude/"/> - </antcall> -@@ -1157,6 +1182,7 @@ - <echo append="true" file="${staging_folder}/work/${staging_hardware_folder}/tools/avr/builtin_tools_versions.txt" message="arduino.avr-gcc=${gcc_version}${line.separator}"/> - - <delete dir="${staging_folder}/work/${staging_hardware_folder}/tmp"/> -+ --> - </target> - - <target name="generate-hourly-build-txt" if="hourly"> |