jruby_art 1.4.9 → 1.5.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/jruby_art/config.rb +2 -1
- data/lib/jruby_art/creators/sketch_writer.rb +1 -1
- data/lib/jruby_art/installer.rb +3 -0
- data/lib/jruby_art/native_folder.rb +18 -8
- data/lib/jruby_art/version.rb +1 -1
- data/lib/rpextras.jar +0 -0
- data/library/control_panel/control_panel.rb +2 -3
- data/vendors/Rakefile +2 -2
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 20966364c7191224c052ca9a3e34198ef198f18b166a57d302a2d950c5c05f83
|
4
|
+
data.tar.gz: 6ec471e3fa76fcf4e7aae579cd41a5c43cf510a2d1531ddc1e152a6d27dc3f76
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 19d6a6521b7b101c4f0c5df0c21197eb9d72cf2ebe05c7984e03f407b05c57a0603b07df892788c40721db9dd053dcb34008954c2d4f95d41557235c1da19f29
|
7
|
+
data.tar.gz: 710e0d2063719445c20558c14feb8dac182cfaa8601b4bde4945600156ef497336086e08f5d124cae11d5ddc99eb50860376ab5cf117e0dc30ec10e17a8fb637
|
data/lib/jruby_art/config.rb
CHANGED
@@ -29,10 +29,11 @@ module Processing
|
|
29
29
|
detect_os = RbConfig::CONFIG['host_os']
|
30
30
|
case detect_os
|
31
31
|
when /mac|darwin/ then :mac
|
32
|
+
when /gnueabihf/ then :arm
|
32
33
|
when /linux/ then :linux
|
33
34
|
when /solaris|bsd/ then :unix
|
34
35
|
else
|
35
|
-
WIN_PATTERNS.find { |reg| detect_os
|
36
|
+
WIN_PATTERNS.find { |reg| reg.match?(detect_os) }
|
36
37
|
raise "unsupported os: #{detect_os.inspect}" if Regexp.last_match.nil?
|
37
38
|
:windows
|
38
39
|
end
|
data/lib/jruby_art/installer.rb
CHANGED
@@ -21,8 +21,11 @@ class Installer
|
|
21
21
|
Dir.mkdir(folder) unless File.exist? folder
|
22
22
|
path = File.join(folder, 'config.yml')
|
23
23
|
proot = "#{HOME}/processing-#{VERSION}"
|
24
|
+
proot = "/usr/local/lib/processing-#{VERSION}" if os == :arm
|
24
25
|
proot = "/Java/Processing-#{VERSION}" if os == :windows
|
25
26
|
proot = '/Applications/Processing.app/Contents/Java' if os == :mac
|
27
|
+
jruby = true
|
28
|
+
jruby = false if os == :arm
|
26
29
|
settings = %w[
|
27
30
|
PROCESSING_ROOT JRUBY sketchbook_path template MAX_WATCH sketch_title width height
|
28
31
|
]
|
@@ -1,11 +1,14 @@
|
|
1
1
|
require 'rbconfig'
|
2
2
|
|
3
3
|
# Utility to load native binaries on Java CLASSPATH
|
4
|
+
# HACK until jruby returns a more specific 'host_os' than 'linux'
|
4
5
|
class NativeFolder
|
5
6
|
attr_reader :os, :bit
|
6
7
|
|
8
|
+
LINUX_FORMAT = 'linux%s'.freeze
|
9
|
+
ARM32 = '-armv6hf'.freeze
|
10
|
+
# ARM64 = '-aarch64'.freeze
|
7
11
|
WIN_FORMAT = 'windows%d'.freeze
|
8
|
-
LINUX_FORMAT = 'linux%d'.freeze
|
9
12
|
WIN_PATTERNS = [
|
10
13
|
/bccwin/i,
|
11
14
|
/cygwin/i,
|
@@ -17,18 +20,25 @@ class NativeFolder
|
|
17
20
|
|
18
21
|
def initialize
|
19
22
|
@os = RbConfig::CONFIG['host_os'].downcase
|
20
|
-
@bit = java.lang.System.get_property('os.arch')
|
23
|
+
@bit = java.lang.System.get_property('os.arch')
|
21
24
|
end
|
22
25
|
|
23
26
|
def name
|
24
|
-
return 'macosx' if
|
25
|
-
|
26
|
-
|
27
|
+
return 'macosx' if /darwin|mac/.match?(os)
|
28
|
+
if /linux/.match?(os)
|
29
|
+
return format(LINUX_FORMAT, '64') if /amd64/.match?(bit)
|
30
|
+
return format(LINUX_FORMAT, ARM32) if /arm/.match?(bit)
|
31
|
+
end
|
32
|
+
if WIN_PATTERNS.any? { |pat| pat.match?(os) }
|
33
|
+
return format(WINDOWS_FORMAT, '64') if /64/.match?(bit)
|
34
|
+
return format(WINDOWS_FORMAT, '32') if /32/.match?(bit)
|
35
|
+
end
|
36
|
+
raise 'Unsupported Architecture'
|
27
37
|
end
|
28
38
|
|
29
39
|
def extension
|
30
|
-
return '*.so' if
|
31
|
-
return '*.dll' if WIN_PATTERNS.any? { |pat| pat
|
40
|
+
return '*.so' if /linux/.match?(os)
|
41
|
+
return '*.dll' if WIN_PATTERNS.any? { |pat| pat.match?(os) }
|
32
42
|
'*.dylib' # MacOS
|
33
43
|
end
|
34
|
-
end
|
44
|
+
end
|
data/lib/jruby_art/version.rb
CHANGED
data/lib/rpextras.jar
CHANGED
Binary file
|
@@ -15,7 +15,8 @@ module ControlPanel
|
|
15
15
|
mx = range.end
|
16
16
|
mx = range.max if range.exclude_end? && range.begin.respond_to?(:succ)
|
17
17
|
max = mx * 100
|
18
|
-
|
18
|
+
val = range.cover?(initial) ? initial * 100 : (range.first + range.last) * 50
|
19
|
+
super(min, max, val)
|
19
20
|
set_minor_tick_spacing((max - min).abs / 10)
|
20
21
|
set_paint_ticks true
|
21
22
|
# paint_labels = true
|
@@ -26,8 +27,6 @@ module ControlPanel
|
|
26
27
|
ControlPanel.app_value(name, value)
|
27
28
|
proc.call(value) if proc
|
28
29
|
end
|
29
|
-
val = initial.nil? ? (range.first + range.last) * 50 : initial * 100
|
30
|
-
set_value(val)
|
31
30
|
ControlPanel.app_value(name, val)
|
32
31
|
end
|
33
32
|
|
data/vendors/Rakefile
CHANGED
@@ -9,7 +9,7 @@ WARNING = <<-EOS.freeze
|
|
9
9
|
EOS
|
10
10
|
|
11
11
|
|
12
|
-
JRUBYC_VERSION = '9.
|
12
|
+
JRUBYC_VERSION = '9.2.0.0'
|
13
13
|
|
14
14
|
EXAMPLES = '3.1'
|
15
15
|
HOME_DIR = ENV['HOME']
|
@@ -29,7 +29,7 @@ file "jruby-complete-#{JRUBYC_VERSION}.jar" do
|
|
29
29
|
rescue
|
30
30
|
warn(WARNING)
|
31
31
|
end
|
32
|
-
check_sha256("jruby-complete-#{JRUBYC_VERSION}.jar", "
|
32
|
+
check_sha256("jruby-complete-#{JRUBYC_VERSION}.jar", "0db6726861b57e927c3a49725c30278795434c8b27a4520013efb4aabdc59def")
|
33
33
|
end
|
34
34
|
|
35
35
|
directory "../lib/ruby"
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: jruby_art
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.
|
4
|
+
version: 1.5.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Jeremy Ashkenas
|
@@ -10,7 +10,7 @@ authors:
|
|
10
10
|
autorequire:
|
11
11
|
bindir: bin
|
12
12
|
cert_chain: []
|
13
|
-
date: 2018-
|
13
|
+
date: 2018-05-31 00:00:00.000000000 Z
|
14
14
|
dependencies:
|
15
15
|
- !ruby/object:Gem::Dependency
|
16
16
|
name: rake
|