From 42e30545caeec5ee2a6a83c8ba031e52abbeb13e Mon Sep 17 00:00:00 2001 From: Ed Reel Date: Sun, 27 Nov 2022 22:38:17 -0600 Subject: [PATCH] Arduino_ide 1.8.10 => 1.8.19 (#7690) --- packages/arduino_ide.rb | 54 ++++++++++++++++++++--------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/packages/arduino_ide.rb b/packages/arduino_ide.rb index ef1eb28f0..7a58ff206 100644 --- a/packages/arduino_ide.rb +++ b/packages/arduino_ide.rb @@ -3,29 +3,27 @@ require 'package' class Arduino_ide < Package description 'Arduino is an open-source physical computing platform based on a simple I/O board and a development environment that implements the Processing/Wiring language.' homepage 'https://www.arduino.cc/' - version '1.8.10' + version '1.8.19' license 'GPL-2, LGPL-2.1 and CC-BY-SA-3.0' compatibility 'all' - source_url 'https://github.com/arduino/Arduino/releases/download/1.8.10/arduino-1.8.10.tar.xz' - source_sha256 '862e4b100d5214ca51d501edcc095467d7a4e3dc39b306146001da8b0c63343e' - - no_compile_needed + source_url 'https://github.com/arduino/Arduino/releases/download/1.8.19/arduino-1.8.19.tar.xz' + source_sha256 '350c7e64a38d562c3c5b61e9b93d4d64455a2c71bd0773a5c593198b8efa578d' binary_url({ - aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/arduino_ide/1.8.10_armv7l/arduino_ide-1.8.10-chromeos-armv7l.tar.xz', - armv7l: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/arduino_ide/1.8.10_armv7l/arduino_ide-1.8.10-chromeos-armv7l.tar.xz', - i686: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/arduino_ide/1.8.10_i686/arduino_ide-1.8.10-chromeos-i686.tar.xz', - x86_64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/arduino_ide/1.8.10_x86_64/arduino_ide-1.8.10-chromeos-x86_64.tar.xz' + aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/arduino_ide/1.8.19_armv7l/arduino_ide-1.8.19-chromeos-armv7l.tar.zst', + armv7l: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/arduino_ide/1.8.19_armv7l/arduino_ide-1.8.19-chromeos-armv7l.tar.zst', + i686: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/arduino_ide/1.8.19_i686/arduino_ide-1.8.19-chromeos-i686.tar.zst', + x86_64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/arduino_ide/1.8.19_x86_64/arduino_ide-1.8.19-chromeos-x86_64.tar.zst' }) binary_sha256({ - aarch64: 'cf323df5db4b7b3d225199539f185cdd66bb7d86705b8eec5125d1538508bf9b', - armv7l: 'cf323df5db4b7b3d225199539f185cdd66bb7d86705b8eec5125d1538508bf9b', - i686: '9755e405993c3608fa7ff631eab47b0ab25af9b043f369ebf96d512e4a0b0375', - x86_64: 'f3a6d2ae75065565c1891d09b4e5556647be4dd6e5a04d8345b5a3b0d1183792' + aarch64: '33bd83f692a6f241b14738bfef32a9118ebb6eb2f4936b69909e2c9f546d49d3', + armv7l: '33bd83f692a6f241b14738bfef32a9118ebb6eb2f4936b69909e2c9f546d49d3', + i686: '1636654217841dd03dc22b315228ced30f9c50f67d39b6892f75e0732624dcb3', + x86_64: 'd48a6cf203c563b343d3c33dd8c2767a8a416446ef73b34ca931ee964e88b244' }) depends_on 'xzutils' - depends_on 'jdk8' + depends_on 'openjdk8' depends_on 'ant' => :build depends_on 'sommelier' @@ -39,30 +37,32 @@ class Arduino_ide < Package end def self.build - Dir.chdir('build') do - system 'env', - "JAVA_HOME=#{CREW_PREFIX}/share/jdk8", - 'ant', + ENV['JAVA_HOME'] = CREW_PREFIX + Dir.chdir 'build' do + system 'ant', '-Djava.net.preferIPv4Stack=true', "-Dversion=#{version}", "-Dplatform=#{@platform}", 'clean', 'dist' - system "echo '#!/bin/bash' > arduino" - system 'echo >> arduino' - system "echo 'echo \"Enabling Arduino write access...\"' >> arduino" - system "echo 'sudo chmod o+rw /dev/ttyACM*' >> arduino" - system "echo '#{CREW_PREFIX}/share/arduino-#{version}/arduino \"$@\"' >> arduino" - system "echo 'echo \"Disabling Arduino write access...\"' >> arduino" - system "echo 'sudo chmod o-rw /dev/ttyACM*' >> arduino" + arduino = <<~EOF + #!/bin/bash + echo "Enabling Arduino write access..." + sudo chmod o+rw /dev/ttyACM* + #{CREW_PREFIX}/share/arduino-#{version}/arduino "$@" + echo "Disabling Arduino write access..." + sudo chmod o-rw /dev/ttyACM* + EOF + File.write('arduino', arduino) end end def self.install - Dir.chdir('build') do + Dir.chdir 'build' do + FileUtils.mkdir_p "#{CREW_DEST_PREFIX}/bin" FileUtils.mkdir_p "#{CREW_DEST_PREFIX}/share" system "tar xpf linux/arduino-#{version}-#{@platform}.tar.xz -C #{CREW_DEST_PREFIX}/share/" - system "install -Dm755 arduino #{CREW_DEST_PREFIX}/bin/arduino" + FileUtils.install 'arduino', "#{CREW_DEST_PREFIX}/bin/arduino", mode: 0o755 FileUtils.ln_s "../share/arduino-#{version}/arduino-builder", "#{CREW_DEST_PREFIX}/bin" end end