Skip to content

Commit

Permalink
Getting ready for release
Browse files Browse the repository at this point in the history
  • Loading branch information
monkstone committed Mar 22, 2020
1 parent d7bcf6a commit 90e131b
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 11 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
v1.3.0 Last version for jdk8. But should run OK jdk11 with JRuby-9.2.11.0 and --add-opens in ~/.jruby.java_opts to suppress reflective access warnings.
v1.3.0 Last version for jdk8. But should run OK jdk11 with JRuby-9.2.11.0 and with included jogl-2.4.0-rc.

v1.2.4 Extract picrate examples to ~/projects/examples instead of ~/picrate_samples for tighter integration with geany editor. Remove non-functioning sound library as an install option (direct toward minim as option).
v1.2.3 Favor latest beta Video2 library over GLVideo.
Expand Down
10 changes: 3 additions & 7 deletions Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,11 @@ task default: %i[init compile install test gem]
# depends on installed processing, with processing on path
desc 'Copy Jars'
task :init do
# for Archlinux etc
# processing_root = File.dirname(`readlink -f $(which processing)`)
# alternative for debian linux etc
processing_root = File.join(HOME_DIR, 'processing-3.5.3')
jar_dir = File.join(processing_root, 'core', 'library')
opengl = Dir.entries(jar_dir).grep(/amd64|armv6hf/).select { |jar| jar =~ /linux/ }
jogl24 = File.join(HOME_DIR, 'jogl24')
opengl = Dir.entries(jogl24).grep(/amd64|armv6hf/).select { |jar| jar =~ /linux/ }
opengl.concat %w[jogl-all.jar gluegen-rt.jar]
opengl.each do |gl|
FileUtils.cp(File.join(jar_dir, gl), File.join('.', 'lib'))
FileUtils.cp(File.join(jogl24, gl), File.join('.', 'lib'))
end
end

Expand Down
3 changes: 1 addition & 2 deletions picrate.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,14 @@ Gem::Specification.new do |gem|
gem.files << 'lib/jogl-all.jar'
gem.files << 'lib/gluegen-rt-natives-linux-amd64.jar'
gem.files << 'lib/gluegen-rt-natives-linux-armv6hf.jar'
# gem.files << 'lib/gluegen-rt-natives-linux-aarch64.jar'
gem.files << 'lib/jogl-all-natives-linux-amd64.jar'
gem.files << 'lib/jogl-all-natives-linux-armv6hf.jar'
# gem.files << 'lib/jogl-all-natives-linux-aarch64.jar'
gem.executables = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
gem.test_files = gem.files.grep(%r{^(test|spec|features)/})
gem.add_development_dependency 'rake', '~> 12.3'
gem.add_development_dependency 'minitest', '~> 5.10'
gem.add_runtime_dependency 'arcball', '~> 1.0.1'
# geomerative + wordcram dependency since they may update to jdk11+ soon
gem.add_runtime_dependency 'geomerative', '~> 1.1'
gem.add_runtime_dependency 'ruby_wordcram', '~> 2.0.4'
gem.require_paths = ['lib']
Expand Down
2 changes: 1 addition & 1 deletion vendors/Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ SOUND = 'sound.zip'
SOUND_VERSION = 'v1.3.2'
VIDEO = 'video-2.0-beta4.zip'
VIDEO_VERSION = 'r6-v2.0-beta4'
EXAMPLES = '0.5.2'
EXAMPLES = '0.5.3'
HOME_DIR = ENV['HOME']
LIBRARY = File.join(HOME_DIR, '.picrate', 'libraries')
PROJECT_DIR = File.join(HOME_DIR, 'projects')
Expand Down

0 comments on commit 90e131b

Please sign in to comment.