Changeset 5494
- Timestamp:
- 02/05/08 11:19:07 (10 months ago)
- Files:
-
- tools/archive.rb (modified) (2 diffs)
- tools/compress_util.rb (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
tools/archive.rb
r5493 r5494 30 30 if flag_rubrikcs 31 31 if File.exists?(rubricks_base) 32 CompressUtil.js_compress _and_join(File.join(rubricks_base, 'public', 'javascripts'), 'src_', 'rubricks_common')33 CompressUtil.js_compress _and_join(File.join(rubricks_base, 'public', 'javascripts', 'components', 'system'), 'src_', 'system')32 CompressUtil.js_compress(File.join(rubricks_base, 'public', 'javascripts'), {:prefix => 'src_', :join => 'rubricks_common'}) 33 CompressUtil.js_compress(File.join(rubricks_base, 'public', 'javascripts', 'components', 'system'), {:prefix => 'src_', :join => 'system'}) 34 34 CompressUtil.system_css(File.join(rubricks_base, 'public', 'stylesheets', 'components', 'system')) 35 35 else … … 46 46 if flag_spinelz 47 47 if File.exists?(spinelz_base) 48 CompressUtil.js_compress(File.join(spinelz_base, 'src', 'javascripts', 'spinelz'), {:pattern => %r|.*/([^/]+)$|, :prefix => ' src_', :replace => File.join(spinelz_base, 'compress', 'javascripts', 'spinelz', '/\\1')})49 CompressUtil.js_compress(File.join(spinelz_base, 'src', 'javascripts', 'spinelz_lib'), {:pattern => %r|.*/([^/]+)$|, :prefix => ' src_', :replace => File.join(spinelz_base, 'compress', 'javascripts', 'spinelz_lib', '/\\1')})48 CompressUtil.js_compress(File.join(spinelz_base, 'src', 'javascripts', 'spinelz'), {:pattern => %r|.*/([^/]+)$|, :prefix => '', :replace => File.join(spinelz_base, 'compress', 'javascripts', 'spinelz', '/\\1')}) 49 CompressUtil.js_compress(File.join(spinelz_base, 'src', 'javascripts', 'spinelz_lib'), {:pattern => %r|.*/([^/]+)$|, :prefix => '', :replace => File.join(spinelz_base, 'compress', 'javascripts', 'spinelz_lib', '/\\1')}) 50 50 CompressUtil.spinelz_js(spinelz_base, spinelz_js, spinelz_utils) 51 51 CompressUtil.spinelz_img(File.join(spinelz_base, 'src', 'images', 'spinelz'), File.join(spinelz_base, 'compress', 'images', 'spinelz')) tools/compress_util.rb
r5492 r5494 14 14 def js_compress(base_dir, options = {}) 15 15 options = { 16 :join => nil, 16 17 :pattern => /src_/, 17 18 :prefix => 'src_', 18 19 :replace => '', 19 :tmp_file => false 20 :tmp_file => false, 20 21 }.merge(options) 22 data = '' 21 23 begin 22 24 Dir.glob("#{base_dir}/#{options[:prefix]}*.js").collect do |src_path| 23 dest_path = src_path.sub(options[:pattern], options[:replace]) 24 if options[:tmp_file] 25 temp = Tempfile::new('tmp.js', base_dir) 26 open(src_path) do |f| 27 f.each do |line| 28 temp.puts(line.sub(%r|//.*$|, '')) 25 if options[:join].nil? 26 dest_path = src_path.sub(options[:pattern], options[:replace]) 27 if options[:tmp_file] 28 temp = Tempfile::new('tmp.js', base_dir) 29 open(src_path) do |f| 30 f.each do |line| 31 temp.puts(line.sub(%r|//.*$|, '')) 32 end 29 33 end 34 temp.close 35 data = compress_js(temp.path) 36 temp.close(true) 37 else 38 data = compress_js(src_path) 30 39 end 31 temp.close 32 data = compress_js(temp.path) 33 temp.close(true) 40 write_js(dest_path, data) 34 41 else 35 data = compress_js(src_path) 36 write_js(dest_path, data) 42 data += compress_js(src_path) 37 43 end 38 44 end 39 rescue Exception 40 puts $!.to_s 41 end 42 end 43 44 def js_compress_and_join(base_dir, prefix = 'src_', filename = '') 45 data = '' 46 begin 47 Dir.glob("#{base_dir}/#{prefix}#{filename}*.js").collect do |src_path| 48 data += compress_js(src_path) 49 end 50 write_js("#{base_dir}/#{filename}.js", data) 45 write_js("#{base_dir}/#{options[:join]}.js", data) unless options[:join].nil? 51 46 rescue Exception 52 47 puts $!.to_s
