raspbian ready

Author: monkstone

CHANGELOG.md

@@ -1,4 +1,4 @@
-**v1.5.0** Update to jruby-complete-9.2.0.0.
+**v1.5.0** Update to jruby-complete-9.2.0.0, make native loader work with raspberrypi.
 
 **v1.4.9** Update to jruby-complete-9.1.17.0.
 

README.md

@@ -2,15 +2,15 @@
 # JRubyArt
 [![Gem Version](https://badge.fury.io/rb/jruby_art.svg)](http://badge.fury.io/rb/jruby_art)
 ![Travis CI](https://travis-ci.org/ruby-processing/JRubyArt.svg)
-Versions before JRubyArt-1.2.0, are unsupported, please update, preferably to latest version, especially if you are on windows (_library_loader_ fix 1.4.2+)...
+Versions before JRubyArt-1.5.0, are unsupported, please update, preferably to latest version, especially if you are on windows or raspberrypi
 
 _Note the main reason for the current build to fail on travis is when the current version of [processing is not available from maven central][testing], it has only ever been available by third parties (I am eternally hopeful that one day processing.org will see the light), actually rvm with jruby as used by travis-ci is also pretty crap as judged by the build traces._
 
 ## Requirements
 A clean start for `jruby_art` that works best with the latest version of [processing-3.3.7](https://github.com/processing/processing/releases) and [jruby-9.1.17.0](http://jruby.org/download) see [wiki](https://github.com/ruby-processing/JRubyArt/wiki/Building-latest-gem) for building gem from this repo.  Changes from processing-2.0 to [processing-3.0 here](https://github.com/processing/processing/wiki/Changes-in-3.0). Should work on same platforms as vanilla processing (windows, mac, linux) for Android see Yuki Morohoshi [rubuto-processing3][].
 ## Requirements
 
-A suitable version of ruby (MRI `ruby 2.4+` or `jruby-9.1.17.0`) to download gem.
+A suitable version of ruby (MRI `ruby 2.3+` or `jruby-9.2.0.0`) to download gem.
 
 `processing-3.3.7`
 

lib/jruby_art/config.rb

@@ -29,10 +29,11 @@ def self.os
       detect_os = RbConfig::CONFIG['host_os']
       case detect_os
       when /mac|darwin/ then :mac
+      when /gnueabihf/ then :arm 
       when /linux/ then :linux
       when /solaris|bsd/ then :unix
       else
-        WIN_PATTERNS.find { |reg| detect_os =~ reg }
+        WIN_PATTERNS.find { |reg| reg.match?(detect_os) }
         raise "unsupported os: #{detect_os.inspect}" if Regexp.last_match.nil?
         :windows
       end

lib/jruby_art/installer.rb

@@ -21,8 +21,11 @@ def set_processing_root
     Dir.mkdir(folder) unless File.exist? folder
     path = File.join(folder, 'config.yml')
     proot = "#{HOME}/processing-#{VERSION}"
+    proot = "/usr/local/lib/processing-#{VERSION}" if os == :arm
     proot = "/Java/Processing-#{VERSION}" if os == :windows
     proot = '/Applications/Processing.app/Contents/Java' if os == :mac
+    jruby = true
+    jruby = false if os == :arm
     settings = %w[
       PROCESSING_ROOT JRUBY sketchbook_path template MAX_WATCH sketch_title width height
     ]

lib/jruby_art/native_folder.rb

@@ -1,11 +1,14 @@
 require 'rbconfig'
 
 # Utility to load native binaries on Java CLASSPATH
+# HACK until jruby returns a more specific 'host_os' than 'linux'
 class NativeFolder
   attr_reader :os, :bit
 
+  LINUX_FORMAT = 'linux%s'.freeze
+  ARM32 = '-armv6hf'.freeze
+  # ARM64 = '-aarch64'.freeze
   WIN_FORMAT = 'windows%d'.freeze
-  LINUX_FORMAT = 'linux%d'.freeze
   WIN_PATTERNS = [
     /bccwin/i,
     /cygwin/i,
@@ -17,18 +20,25 @@ class NativeFolder
 
   def initialize
     @os = RbConfig::CONFIG['host_os'].downcase
-    @bit = java.lang.System.get_property('os.arch') =~ /64/ ? 64 : 32
+    @bit = java.lang.System.get_property('os.arch')
   end
 
   def name
-    return 'macosx' if os =~ /darwin/ || os =~ /mac/
-    return format(WIN_FORMAT, bit) if WIN_PATTERNS.any? { |pat| pat =~ os }
-    return format(LINUX_FORMAT, bit) if os =~ /linux/
+    return 'macosx' if /darwin|mac/.match?(os)
+    if /linux/.match?(os)
+      return format(LINUX_FORMAT, '64') if /amd64/.match?(bit)
+      return format(LINUX_FORMAT, ARM32) if /arm/.match?(bit)
+    end
+    if WIN_PATTERNS.any? { |pat| pat.match?(os) }
+      return format(WINDOWS_FORMAT, '64') if /64/.match?(bit)
+      return format(WINDOWS_FORMAT, '32') if /32/.match?(bit)
+    end
+    raise 'Unsupported Architecture'
   end
 
   def extension
-    return '*.so' if os =~ /linux/
-    return '*.dll' if WIN_PATTERNS.any? { |pat| pat =~ os }
+    return '*.so' if /linux/.match?(os)
+    return '*.dll' if WIN_PATTERNS.any? { |pat| pat.match?(os) }
     '*.dylib' # MacOS
   end
-end
+end