From 36b65f3f30b3c8e397cf1744ffe53a22428252c2 Mon Sep 17 00:00:00 2001 From: Francisco Tolmasky Date: Mon, 18 May 2009 19:13:08 -0700 Subject: [PATCH] Partial fix for NibApplication no longer containing a valid .cib. Reviewed by me. --- Tools/Rake/lib/objective-j/bundletask.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Tools/Rake/lib/objective-j/bundletask.rb b/Tools/Rake/lib/objective-j/bundletask.rb index 988507bc9..aead019df 100644 --- a/Tools/Rake/lib/objective-j/bundletask.rb +++ b/Tools/Rake/lib/objective-j/bundletask.rb @@ -373,7 +373,7 @@ module ObjectiveJ resources_path = File.join(build_path, 'Resources') copied_resources = copy_resources resources, resources_path do |resource, copied_resource| - extname = File.extname(copied_resource) + extname = File.extname(resource) if extname == '.xib' || extname == '.nib' copied_resource = File.join(File.dirname(copied_resource), File.basename(copied_resource, extname)) + '.cib' @@ -390,7 +390,7 @@ module ObjectiveJ copied_resource else - extensionless = File.join(File.dirname(copied_resource), File.basename(copied_resource, extname)) + extensionless = File.join(File.dirname(resource), File.basename(resource, extname)) if extname == '.cib' and (File.exists?(extensionless + '.xib') or File.exists?(extensionless + '.nib')) false