kylefang/RubyMotion
1
0
Fork 0
mirror of https://github.com/zhigang1992/RubyMotion.git synced 2026-06-17 05:30:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix a bug in build system which updated resource files are not copied

Browse Source
This commit is contained in:
Watson
2013-02-27 23:29:20 +09:00
parent 7fd796a89b
commit a24596e830
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/motion/project/builder.rb
View File

@@ -444,13 +444,13 @@ EOS
config.resources_dirs.each do |dir|
if File.exist?(dir)
resources_paths << Dir.chdir(dir) do
Dir.glob('*').reject { |x| ['.xib', '.storyboard', '.xcdatamodeld', '.lproj'].include?(File.extname(x)) }.map { |file| File.join(dir, file) }
Dir.glob('**{,/*/**}/*').reject { |x| ['.xib', '.storyboard', '.xcdatamodeld', '.lproj'].include?(File.extname(x)) }.map { |file| File.join(dir, file) }
end
end
end
resources_paths.flatten!
resources_paths.each do |res_path|
res = File.basename(res_path)
res = resource_path_without_dir(config.resources_dirs, res_path)
if reserved_app_bundle_files.include?(res)
App.fail "Cannot use `#{res_path}' as a resource file because it's a reserved application bundle file"
end
@@ -463,7 +463,7 @@ EOS
end
# Delete old resource files.
resources_files = resources_paths.map { |x| File.basename(x) }
resources_files = resources_paths.map { |x| resource_path_without_dir(config.resources_dirs, x) }
Dir.chdir(bundle_path) do
Dir.glob('*').each do |bundle_res|
bundle_res = convert_filesystem_encoding(bundle_res)
@@ -489,6 +489,14 @@ EOS
end
end
def resource_path_without_dir(dirs, path)
dir = dirs.each do |dir|
break dir if path =~ /^#{dir}/
end
path = path.sub(/^#{dir}\/*/, '') if dir
path
end
def convert_filesystem_encoding(string)
begin
string.encode("UTF-8", "UTF8-MAC")