Skip to content

Commit dc8c432

Browse files
committed
ditch GLVideo in favor of latest Video
1 parent 2873e44 commit dc8c432

File tree

1 file changed

+11
-32
lines changed

1 file changed

+11
-32
lines changed

vendors/Rakefile

Lines changed: 11 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,12 @@ require 'rake/clean'
55
WARNING = 'WARNING: wget download failed you could do a manual download'
66
SOUND = 'sound.zip'
77
SOUND_VERSION = 'v1.3.2'
8-
GLVIDEO = 'processing-glvideo.zip'
9-
VIDEO = 'video-2.zip'
10-
VIDEO_VERSION = '2'
8+
VIDEO = 'video-2.0-beta4.zip'
9+
VIDEO_VERSION = 'r6-v2.0-beta4'
1110
EXAMPLES = '0.5.1'
1211
HOME_DIR = ENV['HOME']
1312
LIBRARY = File.join(HOME_DIR, '.picrate', 'libraries')
14-
CLOBBER.include(EXAMPLES, SOUND, GLVIDEO, VIDEO)
13+
CLOBBER.include(EXAMPLES, SOUND, VIDEO)
1514

1615
def dependency
1716
system 'which wget'
@@ -40,29 +39,19 @@ task install_sound: %i[init_dir download_sound copy_sound clobber]
4039
desc 'download and copy video library to ~/.picrate'
4140
task install_video: %i[init_dir download_video copy_video clobber]
4241

43-
desc 'download and copy glvideo library to ~/.picrate'
44-
task install_glvideo: %i[init_dir download_glvideo copy_glvideo clobber]
45-
4642
desc 'download, and copy picrate examples'
4743
task download_samples: ["#{EXAMPLES}.tar.gz"]
4844

4945
desc 'download sound library'
5046
task :download_sound do
51-
wget_base = 'wget https://github.com/processing/processing-sound'
47+
wget_base = 'wget -P https://github.com/processing/processing-sound'
5248
wget_string = [wget_base, 'releases/download/latest', SOUND].join('/')
5349
system wget_string
5450
end
5551

56-
desc 'download glvideo library'
57-
task :download_glvideo do
58-
wget_base = 'wget https://github.com/gohai/processing-glvideo'
59-
wget_string = [wget_base, 'releases/download/latest', GLVIDEO].join('/')
60-
system wget_string
61-
end
62-
6352
desc 'download video library'
6453
task :download_video do
65-
wget_base = 'wget https://github.com/processing/processing-video'
54+
wget_base = 'wget -P /tmp https://github.com/processing/processing-video'
6655
wget_string = [wget_base, 'releases/download', VIDEO_VERSION, VIDEO].join('/')
6756
system wget_string
6857
end
@@ -94,25 +83,15 @@ end
9483

9584
desc 'copy sound library'
9685
task copy_sound: SOUND do
97-
system "unzip #{SOUND}"
86+
system "unzip -d /tmp /tmp/#{SOUND}"
9887
FileUtils.rm_r "#{LIBRARY}/sound" if File.exist? "#{LIBRARY}/sound"
99-
FileUtils.cp_r 'sound', LIBRARY
100-
FileUtils.rm_r 'sound'
88+
FileUtils.cp_r '/tmp/sound', LIBRARY
10189
end
10290

10391
desc 'copy video library'
104-
task copy_video: VIDEO do
105-
system "unzip #{VIDEO}"
92+
task copy_video: "/tmp/#{VIDEO}" do
93+
system "unzip -d /tmp /tmp/#{VIDEO}"
10694
FileUtils.rm_r "#{LIBRARY}/video" if File.exist? "#{LIBRARY}/video"
107-
FileUtils.cp_r 'video', LIBRARY
108-
FileUtils.rm_r 'video'
109-
end
110-
111-
desc 'copy glvideo library'
112-
task copy_glvideo: GLVIDEO do
113-
directory "#{LIBRARY}/glvideo"
114-
system "unzip #{GLVIDEO}"
115-
FileUtils.rm_r "#{LIBRARY}/glvideo" if File.exist? "#{LIBRARY}/glvideo"
116-
FileUtils.cp_r 'glvideo', LIBRARY
117-
FileUtils.rm_r 'glvideo'
95+
FileUtils.mkdir_p "#{LIBRARY}/video/library"
96+
FileUtils.mv Dir.glob("/tmp/video/library/*.jar"), "#{LIBRARY}/video/library"
11897
end

0 commit comments

Comments
 (0)