Skip to content

Commit 0e69a01

Browse files
committed
Don't install sound library, put examples in projects folder.
1 parent 29af855 commit 0e69a01

File tree

4 files changed

+11
-5
lines changed

4 files changed

+11
-5
lines changed

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
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).
2+
13
v1.2.3 Favor latest beta Video2 library over GLVideo.
24

35
v1.2.2 Removed landscape from example as too taxing for raspberryPI. Improved geany tools.

lib/picrate/runner.rb

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ def parse_options(args)
4040
end
4141

4242
options[:install] = false
43-
message = '<Samples><GLVideo><Video><Sound> Install samples or library'
43+
message = '<Samples><Video> Install samples or library'
4444
opts.on('-i', '--install', message) do
4545
options[:install] = true
4646
end
@@ -80,7 +80,9 @@ def install(library = nil)
8080
library ||= 'new'
8181
choice = library.downcase
8282
case choice
83-
when /samples|sound|video/
83+
when /sound/
84+
warn 'The sound library is broken, try minim instead'
85+
when /samples|video/
8486
system "cd #{PICRATE_ROOT}/vendors && rake install_#{choice}"
8587
when /new/
8688
# install samples and config geany

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ DO NOT MODIFIY - GENERATED CODE
1111
<modelVersion>4.0.0</modelVersion>
1212
<groupId>ruby-processing</groupId>
1313
<artifactId>picrate</artifactId>
14-
<version>1.2.2</version>
14+
<version>1.2.3</version>
1515
<name>picrate</name>
1616
<description>An integrated processing-core (somewhat hacked), with additional java code for a jruby version of processing.</description>
1717
<url>http://maven.apache.org</url>

vendors/Rakefile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ VIDEO_VERSION = 'r6-v2.0-beta4'
1010
EXAMPLES = '0.5.1'
1111
HOME_DIR = ENV['HOME']
1212
LIBRARY = File.join(HOME_DIR, '.picrate', 'libraries')
13+
EXAMPLES_DIR = File.join(HOME_DIR, 'projects', 'examples')
1314
CLOBBER.include(EXAMPLES, SOUND, VIDEO)
1415

1516
def dependency
@@ -76,8 +77,9 @@ end
7677
desc 'copy examples'
7778
task copy_examples: %i[download_samples] do
7879
system "tar xzvf #{EXAMPLES}.tar.gz"
79-
FileUtils.rm_r "#{HOME_DIR}/picrate_samples" if File.exist? "#{HOME_DIR}/picrate_samples"
80-
FileUtils.cp_r "picrate-examples-#{EXAMPLES}", "#{HOME_DIR}/picrate_samples"
80+
FileUtils.rm_r EXAMPLES_DIR if File.exist? EXAMPLES_DIR
81+
FileUtils.mkdir_p EXAMPLES_DIR
82+
FileUtils.cp_r "picrate-examples-#{EXAMPLES}", EXAMPLES_DIR
8183
FileUtils.rm_r "picrate-examples-#{EXAMPLES}"
8284
end
8385

0 commit comments

Comments
 (0)