Skip to content

Commit 50565f0

Browse files
committed
get ready for release
1 parent a06f651 commit 50565f0

3 files changed

Lines changed: 19 additions & 11 deletions

File tree

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
**v2.7.2** Slight re-factor of control_panel, fix virgin install of libraries folder, add grafica library examples suggest upgrade to jruby-9.1.17.0
2+
13
**v2.7.1** Avoid calling protected method in control_panel (ready for jdk9)
24

35
**v2.7.0** Now using custom icons, nice blue ruby image

lib/propane/version.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# frozen_string_literal: true
22
module Propane
3-
VERSION = '2.7.1'.freeze
3+
VERSION = '2.7.2'.freeze
44
end

vendors/Rakefile

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,12 @@ SOUND_VERSION = 'v1.3.2' # version 1.3.2
1010
GLVIDEO = 'processing-glvideo.zip'
1111
VIDEO = 'video-2.zip'
1212
VIDEO_VERSION = '2' # version 1.0.1
13-
EXAMPLES = '2.1'.freeze
13+
EXAMPLES = '2.3'.freeze
1414
HOME_DIR = ENV['HOME']
1515
MAC_OR_LINUX = /linux|mac|darwin/ =~ RbConfig::CONFIG['host_os']
1616

17+
CLOBBER.include(EXAMPLES, SOUND, GLVIDEO, VIDEO)
18+
1719
desc 'download, and copy propane examples'
1820
task default: [:download_and_copy_samples]
1921

@@ -33,13 +35,13 @@ file file_name do
3335
end
3436

3537
desc 'download and copy sound library to ~/.propane'
36-
task download_and_copy_sound: [:download_sound, :copy_sound]
38+
task download_and_copy_sound: [:init_dir, :download_sound, :copy_sound, :clobber]
3739

3840
desc 'download and copy video library to ~/.propane'
39-
task download_and_copy_video: [:download_video, :copy_video]
41+
task download_and_copy_video: [:init_dir, :download_video, :copy_video, :clobber]
4042

4143
desc 'download and copy glvideo library to ~/.propane'
42-
task download_and_copy_glvideo: [:download_glvideo, :copy_glvideo]
44+
task download_and_copy_glvideo: [:init_dir, :download_glvideo, :copy_glvideo, :clobber]
4345

4446

4547
desc 'download sound library'
@@ -75,6 +77,15 @@ task :download_video do
7577
end
7678
end
7779

80+
desc 'initialize ~/.propane directories'
81+
task :init_dir do
82+
unless File.exist? "#{HOME_DIR}/.propane/libraries"
83+
sh "mkdir -p ~/.propane"
84+
sh "mkdir -p ~/.propane/libraries"
85+
end
86+
end
87+
88+
7889
desc 'copy examples'
7990
task :copy_examples => file_name do
8091
if MAC_OR_LINUX.nil?
@@ -93,18 +104,15 @@ task :copy_sound => SOUND do
93104
directory "~/.propane/libraries"
94105
sh "unzip #{SOUND}"
95106
sh "rm -r #{HOME_DIR}/.propane/libraries/sound" if File.exist? "#{HOME_DIR}/.propane/libraries/sound"
96-
sh "mkdir -p ~/.propane"
97-
sh "mkdir -p ~/.propane/libraries"
98107
sh "cp -r sound #{HOME_DIR}/.propane/libraries"
99108
sh 'rm -r sound'
109+
sh 'rm -r __MACOSX'
100110
end
101111

102112
desc 'copy video library'
103113
task :copy_video => VIDEO do
104114
sh "unzip #{VIDEO}"
105115
sh "rm -r #{HOME_DIR}/.propane/libraries/video" if File.exist? "#{HOME_DIR}/.propane/libraries/video"
106-
sh "mkdir -p ~/.propane"
107-
sh "mkdir -p ~/.propane/libraries"
108116
sh "cp -r video #{HOME_DIR}/.propane/libraries/video"
109117
sh 'rm -r video'
110118
end
@@ -114,8 +122,6 @@ task :copy_glvideo => GLVIDEO do
114122
directory "~/.propane/libraries/glvideo"
115123
sh "unzip #{GLVIDEO}"
116124
sh "rm -r #{HOME_DIR}/.propane/libraries/glvideo" if File.exist? "#{HOME_DIR}/.propane/libraries/glvideo"
117-
sh "mkdir -p ~/.propane"
118-
sh "mkdir -p ~/.propane/libraries"
119125
sh "cp -r glvideo #{HOME_DIR}/.propane/libraries/glvideo"
120126
sh 'rm -r glvideo'
121127
end

0 commit comments

Comments
 (0)