FreeBSD Bugzilla – Attachment 181372 Details for
Bug 218282
[PATCH] devel/arduino16: Update to Arduino 1.8.2, MOVE to devel/arduino18, random fixes
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
svn(1) diff of devel/arduino16
arduino18-1.8.2.diff (text/plain), 37.79 KB, created by
Kyle Evans
on 2017-04-01 02:51:50 UTC
(
hide
)
Description:
svn(1) diff of devel/arduino16
Filename:
MIME Type:
Creator:
Kyle Evans
Created:
2017-04-01 02:51:50 UTC
Size:
37.79 KB
patch
obsolete
>Index: Makefile >=================================================================== >--- Makefile (revision 437263) >+++ Makefile (working copy) >@@ -1,65 +1,67 @@ > # $FreeBSD$ > >-PORTNAME= arduino >-PORTVERSION= 1.6.12 >-PORTREVISION= 4 >-CATEGORIES= devel java >-PKGNAMESUFFIX= 16 >-DIST_SUBDIR= ${PORTNAME} >+PORTNAME= arduino >+PORTVERSION= 1.8.2 >+CATEGORIES= devel java >+PKGNAMESUFFIX= 18 >+DIST_SUBDIR= ${PORTNAME} > >-MAINTAINER= bsdports@kyle-evans.net >-COMMENT= Open-source electronics prototyping platform >+MAINTAINER= bsdports@kyle-evans.net >+COMMENT= Open-source electronics prototyping platform > >-LICENSE= GPLv2 >-LICENSE_FILE= ${WRKSRC}/../license.txt >+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 \ >- ${JAVA_HOME}/jre/lib/ext/jssc-2.8.0.jar:comms/java-simple-serial-connector >+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 \ >+ ${JAVA_HOME}/jre/lib/ext/jssc-2.8.0.jar:comms/java-simple-serial-connector > >-CONFLICTS= arduino-[0-9]* >+CONFLICTS= arduino-[0-9]* > > BUNDLE_GH_ACCOUNT= arduino-libraries >-BUNDLE_LIBRARIES= Firmata:2.5.3:firmata \ >+BUNDLE_LIBRARIES= Firmata:2.5.5:firmata \ > Bridge:1.6.3:bridge \ > Robot_Control:1.0.2:robotcontrol \ >- Robot_Motor:1.0.1:robotmotor \ >+ Robot_Motor:1.0.2:robotmotor \ > RobotIRremote:1.0.2:robotir \ > SpacebrewYun:1.0.1:spacebrew \ >- Temboo:1.1.7:temboo \ >+ Temboo:1.1.8:temboo \ > Esplora:1.0.4:esplora \ > Mouse:1.0.1:mouse \ >- Keyboard:1.0.1:keyboard >+ Keyboard:1.0.1:keyboard \ >+ SD:1.1.1:sd \ >+ Servo:1.1.2:servo > >-GH_TUPLE+= ${BUNDLE_GH_ACCOUNT}:WiFi101-FirmwareUpdater-Plugin:v0.8.0:wifi10/linux/work/tools/WiFi101 >+GH_TUPLE+= ${BUNDLE_GH_ACCOUNT}:WiFi101-FirmwareUpdater-Plugin:v0.9.0:wifi10/linux/work/tools/WiFi101 > >-USE_GITHUB= yes >-GH_ACCOUNT= arduino >-GH_PROJECT= Arduino >+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/\:.*//} >+GH_TUPLE+= ${BUNDLE_GH_ACCOUNT}:${blib}/linux/work/libraries/${blib:C/\:.*//} > .endfor > >-USES= desktop-file-utils >-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 >+USES= desktop-file-utils >+LIB_DIRS+= ${LOCALBASE}/lib ${LOCALBASE}/lib/jni >+WRKSRC_SUBDIR= build >+PATCH_WRKSRC= ${WRKSRC}/../ >+MAKE_ARGS+= -Dlight_bundle=true -Dlocal_sources=true -Dno_arduino_builder=true >+USE_JAVA= yes >+USE_ANT= yes >+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_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 \ >@@ -69,11 +71,11 @@ > .include <bsd.port.options.mk> > > .if ${PORT_OPTIONS:MDOCS} >-INSLIST+= reference >+INSLIST+= reference > .endif > > .if ${PORT_OPTIONS:MEXAMPLES} >-INSLIST+= examples >+INSLIST+= examples > .endif > > post-extract: >@@ -102,5 +104,6 @@ > ${LN} -s ../bin/arduino-builder ${STAGEDIR}${PREFIX}/arduino/arduino-builder > ${CP} ${WRKSRC}/shared/icons/arduino.xpm ${STAGEDIR}/${PREFIX}/share/pixmaps > ${CP} ${PATCH_WRKSRC}/build/linux/dist/desktop.template ${STAGEDIR}/${PREFIX}/share/applications/arduino.desktop >+ ${REINPLACE_CMD} -e 's|$${version}|${PORTVERSION}|' ${STAGEDIR}${PREFIX}/${PORTNAME}/lib/version.txt > > .include <bsd.port.mk> >Index: distinfo >=================================================================== >--- distinfo (revision 437263) >+++ distinfo (working copy) >@@ -1,4 +1,4 @@ >-TIMESTAMP = 1476591503 >+TIMESTAMP = 1490197071 > 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 >@@ -5,24 +5,24 @@ > 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-Arduino-1.8.2_GH0.tar.gz) = df7dba7ad20ca315788d309b9e52d45d1ec509c701a52121426098133e87d674 >+SIZE (arduino/arduino-Arduino-1.8.2_GH0.tar.gz) = 48191808 >+SHA256 (arduino/arduino-libraries-WiFi101-FirmwareUpdater-Plugin-v0.9.0_GH0.tar.gz) = 43f3f992bb1cda45f8609eb0269e394d9c7e2ffab45a29a2bc312579c489d9d1 >+SIZE (arduino/arduino-libraries-WiFi101-FirmwareUpdater-Plugin-v0.9.0_GH0.tar.gz) = 810749 >+SHA256 (arduino/arduino-libraries-Firmata-2.5.5_GH0.tar.gz) = c34732d01e27cfabfc47a12cc684a8d66a484252a19aed41c19b2f06a971535b >+SIZE (arduino/arduino-libraries-Firmata-2.5.5_GH0.tar.gz) = 162998 > 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-Robot_Motor-1.0.2_GH0.tar.gz) = b7bf0d33288e92801410332c53033fa83540fcdfcd14edda890133f1fedba288 >+SIZE (arduino/arduino-libraries-Robot_Motor-1.0.2_GH0.tar.gz) = 7892 > 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-Temboo-1.1.8_GH0.tar.gz) = 1aee8614db469e43e2333ff47efcbe3b83fcdb34dd02cd656ec73de2815e39ac >+SIZE (arduino/arduino-libraries-Temboo-1.1.8_GH0.tar.gz) = 90457 > 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 >@@ -29,3 +29,7 @@ > 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 >+SHA256 (arduino/arduino-libraries-SD-1.1.1_GH0.tar.gz) = bee40dae69eebc39a3cbd37dc3985324d212d352d0b236f876ac61f73815aa92 >+SIZE (arduino/arduino-libraries-SD-1.1.1_GH0.tar.gz) = 47102 >+SHA256 (arduino/arduino-libraries-Servo-1.1.2_GH0.tar.gz) = a58f5b9087efa12d30afb67e5f0f7bdb9b22548d6ad3c5241eec3dd3d851641d >+SIZE (arduino/arduino-libraries-Servo-1.1.2_GH0.tar.gz) = 14059 >Index: files/patch-app_src_processing_app_Base.java >=================================================================== >--- files/patch-app_src_processing_app_Base.java (revision 437263) >+++ files/patch-app_src_processing_app_Base.java (working copy) >@@ -1,6 +1,6 @@ >---- app/src/processing/app/Base.java.orig 2016-09-21 10:09:37 UTC >+--- app/src/processing/app/Base.java.orig 2017-03-16 17:38:01 UTC > +++ app/src/processing/app/Base.java >-@@ -463,7 +463,7 @@ public class Base { >+@@ -460,7 +460,7 @@ public class Base { > new Thread(new NewBoardListener(this)).start(); > > // Check for updates >@@ -9,7 +9,7 @@ > new UpdateCheck(this); > > contributionsSelfCheck = new ContributionsSelfCheck(this, new UpdatableBoardsLibsFakeURLsHandler(this), contributionInstaller, libraryInstaller); >-@@ -1060,12 +1060,7 @@ public class Base { >+@@ -1055,12 +1055,7 @@ public class Base { > if (importMenu == null) > return; > importMenu.removeAll(); >@@ -23,7 +23,7 @@ > JMenuItem addLibraryMenuItem = new JMenuItem(tr("Add .ZIP Library...")); > addLibraryMenuItem.addActionListener(new ActionListener() { > public void actionPerformed(ActionEvent e) { >-@@ -1392,31 +1387,12 @@ public class Base { >+@@ -1388,31 +1383,12 @@ public class Base { > boardMenu.putClientProperty("removeOnWindowDeactivation", true); > MenuScroller.setScrollerFor(boardMenu); > >@@ -53,5 +53,5 @@ > - boardMenu.add(new JSeparator()); > - > // Generate custom menus for all platforms >- Set<String> customMenusTitles = new HashSet<String>(); >+ Set<String> customMenusTitles = new HashSet<>(); > for (TargetPackage targetPackage : BaseNoGui.packages.values()) { >Index: files/patch-arduino-core_src_cc_arduino_contributions_libraries_LibraryInstaller.java >=================================================================== >--- files/patch-arduino-core_src_cc_arduino_contributions_libraries_LibraryInstaller.java (revision 437263) >+++ files/patch-arduino-core_src_cc_arduino_contributions_libraries_LibraryInstaller.java (working copy) >@@ -1,4 +1,4 @@ >---- 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.orig 2017-03-16 17:38:01 UTC > +++ arduino-core/src/cc/arduino/contributions/libraries/LibraryInstaller.java > @@ -55,31 +55,7 @@ public class LibraryInstaller { > } >Index: files/patch-arduino-core_src_cc_arduino_contributions_packages_ContributionInstaller.java >=================================================================== >--- files/patch-arduino-core_src_cc_arduino_contributions_packages_ContributionInstaller.java (revision 437263) >+++ files/patch-arduino-core_src_cc_arduino_contributions_packages_ContributionInstaller.java (working copy) >@@ -1,4 +1,4 @@ >---- 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.orig 2017-03-16 17:38:01 UTC > +++ arduino-core/src/cc/arduino/contributions/packages/ContributionInstaller.java > @@ -281,47 +281,11 @@ public class ContributionInstaller { > } >Index: files/patch-arduino-core_src_cc_arduino_contributions_packages_ContributionsIndexer.java >=================================================================== >--- files/patch-arduino-core_src_cc_arduino_contributions_packages_ContributionsIndexer.java (revision 437263) >+++ files/patch-arduino-core_src_cc_arduino_contributions_packages_ContributionsIndexer.java (working copy) >@@ -1,8 +1,8 @@ >---- 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.orig 2017-03-16 17:38:01 UTC > +++ arduino-core/src/cc/arduino/contributions/packages/ContributionsIndexer.java >-@@ -85,17 +85,6 @@ public class ContributionsIndexer { >+@@ -86,17 +86,6 @@ public class ContributionsIndexer { > File bundledIndexFile = new File(builtInHardwareFolder, Constants.BUNDLED_INDEX_FILE_NAME); >- index = parseIndex(bundledIndexFile); >+ mergeContributions(bundledIndexFile); > > - // ...and overlay the default index if present > - File defaultIndexFile = getIndexFile(Constants.DEFAULT_INDEX_FILE_NAME); >@@ -12,7 +12,7 @@ > - throw new SignatureVerificationFailedException(Constants.DEFAULT_INDEX_FILE_NAME); > - } > - >-- mergeContributions(parseIndex(defaultIndexFile), defaultIndexFile); >+- mergeContributions(defaultIndexFile); > - } > - > // Set main and bundled indexes as trusted >Index: files/patch-arduino-core_src_cc_arduino_contributions_packages_HostDependentDownloadableContribution.java >=================================================================== >--- files/patch-arduino-core_src_cc_arduino_contributions_packages_HostDependentDownloadableContribution.java (revision 437263) >+++ files/patch-arduino-core_src_cc_arduino_contributions_packages_HostDependentDownloadableContribution.java (nonexistent) >@@ -1,19 +0,0 @@ >---- 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; >- } >- } >Index: files/patch-arduino-core_src_processing_app_BaseNoGui.java >=================================================================== >--- files/patch-arduino-core_src_processing_app_BaseNoGui.java (revision 437263) >+++ files/patch-arduino-core_src_processing_app_BaseNoGui.java (working copy) >@@ -1,6 +1,6 @@ >---- arduino-core/src/processing/app/BaseNoGui.java.orig 2016-09-21 10:09:37 UTC >+--- arduino-core/src/processing/app/BaseNoGui.java.orig 2017-03-16 17:38:01 UTC > +++ arduino-core/src/processing/app/BaseNoGui.java >-@@ -851,7 +851,7 @@ public class BaseNoGui { >+@@ -688,7 +688,7 @@ public class BaseNoGui { > if (installedFolder != null) { > toolPath = installedFolder.getAbsolutePath(); > } else { >Index: files/patch-build_build.xml >=================================================================== >--- files/patch-build_build.xml (revision 437263) >+++ files/patch-build_build.xml (working copy) >@@ -1,6 +1,6 @@ >---- build/build.xml.orig 2016-09-21 10:09:37 UTC >+--- build/build.xml.orig 2017-03-16 17:38:01 UTC > +++ build/build.xml >-@@ -99,7 +99,7 @@ >+@@ -100,7 +100,7 @@ > </fileset> > > <target name="build" description="Build Arduino."> >@@ -9,64 +9,47 @@ > > <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! --> >+@@ -184,37 +184,9 @@ > <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="archive_file" value="shared/WiFi101-Updater-ArduinoIDE-Plugin-0.9.0.zip" /> >+- <param name="archive_url" value="https://github.com/arduino-libraries/WiFi101-FirmwareUpdater-Plugin/releases/download/v0.9.0/WiFi101-Updater-ArduinoIDE-Plugin-0.9.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 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="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="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="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" /> >+@@ -239,6 +211,9 @@ >+ <download-library name="SD" version="1.1.1"/> >+ <download-library githubuser="Adafruit" name="Adafruit_CircuitPlayground" version="1.6.4"/> > </target> > + <target name="assemble-libraries-light" if="light_bundle"> > + <mkdir dir="${target.path}/libraries" /> >@@ -74,7 +57,7 @@ > > <macrodef name="download-library"> > <attribute name="name"/> >-@@ -250,13 +230,17 @@ >+@@ -257,13 +232,17 @@ > </macrodef> > > <!-- copy hardware folder --> >@@ -93,49 +76,13 @@ > > <!-- - - - - - - - - --> > <!-- 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 @@ >+@@ -638,53 +617,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="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> >@@ -148,7 +95,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> >@@ -160,7 +107,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> >@@ -173,7 +120,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> >@@ -183,137 +130,3 @@ > </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}"/> >-- </antcall> >- </target> >- >- <target name="linux-jvm-noop"/> >-@@ -822,8 +744,21 @@ >- >- <!-- Retrieve tool --> >- <target name="untar-unzip-download" depends="untar-unzip-check" unless="${archive_file}_available"> >-+ <antcall target="untar-unzip-download-web" /> >-+ <antcall target="untar-unzip-download-local" /> >-+ </target> >-+ <target name="untar-unzip-download-web" unless="local_sources"> >- <get src="${archive_url}" dest="${archive_file}" verbose="true" ignoreerrors="true" /> >- </target> >-+ <target name="untar-unzip-download-local" if="local_sources"> >-+ <basename file="${archive_file}" property="basename" /> >-+ <echo>Skipping download of ${archive_url}, using makepkg downloaded ${basename}</echo> >-+ <exec executable="ln" failonerror="true"> >-+ <arg value="-s" /> >-+ <arg value="${basedir}/../../${basename}" /> >-+ <arg value="${archive_file}" /> >-+ </exec> >-+ </target> >- >- <target name="untar-unzip-checksum" depends="untar-unzip-download"> >- <echo>Testing checksum of "${archive_file}"</echo> >-@@ -926,7 +861,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 +870,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 +912,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 +922,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 +933,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> >-@@ -1136,7 +1071,7 @@ >- >- <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 +1080,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> >Index: pkg-plist >=================================================================== >--- pkg-plist (revision 437263) >+++ pkg-plist (working copy) >@@ -283,9 +283,9 @@ > arduino/lib/jackson-databind-2.6.3.jar > arduino/lib/jackson-module-mrbean-2.6.3.jar > arduino/lib/java-semver-0.8.0.jar >-arduino/lib/jmdns-3.4.1.jar >-arduino/lib/jna-4.1.0.jar >-arduino/lib/jna-platform-4.1.0.jar >+arduino/lib/jmdns-3.5.1.jar >+arduino/lib/jna-4.2.2.jar >+arduino/lib/jna-platform-4.2.2.jar > arduino/lib/jsch-0.1.50.jar > arduino/lib/keywords.txt > arduino/lib/libastylej.so >@@ -293,7 +293,9 @@ > arduino/lib/pde.jar > arduino/lib/preferences.txt > arduino/lib/public.gpg.key >-arduino/lib/rsyntaxtextarea-2.5.8.1+arduino.jar >+arduino/lib/rsyntaxtextarea-2.6.1.jar >+arduino/lib/slf4j-api-1.7.22.jar >+arduino/lib/slf4j-simple-1.7.22.jar > arduino/lib/splash.bmp > arduino/lib/splash.png > arduino/lib/theme/buttons.png >@@ -440,6 +442,13 @@ > arduino/libraries/Firmata/Boards.h > arduino/libraries/Firmata/Firmata.cpp > arduino/libraries/Firmata/Firmata.h >+arduino/libraries/Firmata/FirmataConstants.h >+arduino/libraries/Firmata/FirmataDefines.h >+arduino/libraries/Firmata/FirmataMarshaller.cpp >+arduino/libraries/Firmata/FirmataMarshaller.h >+arduino/libraries/Firmata/FirmataParser.cpp >+arduino/libraries/Firmata/FirmataParser.h >+arduino/libraries/Firmata/LICENSE.txt > %%EXAMPLES%%arduino/libraries/Firmata/examples/AllInputsFirmata/AllInputsFirmata.ino > %%EXAMPLES%%arduino/libraries/Firmata/examples/AnalogFirmata/AnalogFirmata.ino > %%EXAMPLES%%arduino/libraries/Firmata/examples/EchoString/EchoString.ino >@@ -463,7 +472,6 @@ > %%EXAMPLES%%arduino/libraries/Firmata/examples/StandardFirmataWiFi/LICENSE.txt > %%EXAMPLES%%arduino/libraries/Firmata/examples/StandardFirmataWiFi/StandardFirmataWiFi.ino > %%EXAMPLES%%arduino/libraries/Firmata/examples/StandardFirmataWiFi/wifiConfig.h >-arduino/libraries/Firmata/extras/LICENSE.txt > arduino/libraries/Firmata/extras/revisions.txt > arduino/libraries/Firmata/keywords.txt > arduino/libraries/Firmata/library.properties >@@ -715,10 +723,14 @@ > arduino/libraries/Servo/src/Servo.h > arduino/libraries/Servo/src/avr/Servo.cpp > arduino/libraries/Servo/src/avr/ServoTimers.h >+arduino/libraries/Servo/src/nrf52/Servo.cpp >+arduino/libraries/Servo/src/nrf52/ServoTimers.h > arduino/libraries/Servo/src/sam/Servo.cpp > arduino/libraries/Servo/src/sam/ServoTimers.h > arduino/libraries/Servo/src/samd/Servo.cpp > arduino/libraries/Servo/src/samd/ServoTimers.h >+arduino/libraries/Servo/src/stm32f4/Servo.cpp >+arduino/libraries/Servo/src/stm32f4/ServoTimers.h > arduino/libraries/SpacebrewYun/README.adoc > %%EXAMPLES%%arduino/libraries/SpacebrewYun/examples/inputOutput/inputOutput.ino > %%EXAMPLES%%arduino/libraries/SpacebrewYun/examples/spacebrewBoolean/spacebrewBoolean.ino >@@ -848,11 +860,17 @@ > arduino/libraries/Temboo/src/utility/TembooCoAPIPStack.h > arduino/libraries/Temboo/src/utility/TembooCoAPSession.cpp > arduino/libraries/Temboo/src/utility/TembooCoAPSession.h >+arduino/libraries/Temboo/src/utility/TembooDS18B20.cpp >+arduino/libraries/Temboo/src/utility/TembooDS18B20.h >+arduino/libraries/Temboo/src/utility/TembooGPIO.c >+arduino/libraries/Temboo/src/utility/TembooGPIO.h > arduino/libraries/Temboo/src/utility/TembooGlobal.c > arduino/libraries/Temboo/src/utility/TembooGlobal.h > arduino/libraries/Temboo/src/utility/TembooMQTTIPStack.h > arduino/libraries/Temboo/src/utility/TembooMQTTSession.cpp > arduino/libraries/Temboo/src/utility/TembooMQTTSession.h >+arduino/libraries/Temboo/src/utility/TembooOneWire.cpp >+arduino/libraries/Temboo/src/utility/TembooOneWire.h > arduino/libraries/Temboo/src/utility/TembooSession.cpp > arduino/libraries/Temboo/src/utility/TembooSession.h > arduino/libraries/Temboo/src/utility/TembooTags.h >@@ -2032,9 +2050,11 @@ > arduino/tools/WiFi101/.gitignore > arduino/tools/WiFi101/.travis.yml > arduino/tools/WiFi101/README.md >+arduino/tools/WiFi101/assets/default.html > arduino/tools/WiFi101/build.sh > arduino/tools/WiFi101/firmwares/19.4.4/m2m_aio_2b0.bin > arduino/tools/WiFi101/firmwares/19.4.4/m2m_aio_3a0.bin >+arduino/tools/WiFi101/firmwares/19.5.2/m2m_aio_3a0.bin > arduino/tools/WiFi101/screenshot-0.png > arduino/tools/WiFi101/screenshot-1.png > arduino/tools/WiFi101/screenshot-2.png
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Flags:
kevans
:
maintainer-approval+
Actions:
View
|
Diff
Attachments on
bug 218282
: 181372 |
181373