[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[ddkilzer at apple.com]

The following commit has been merged in the debian/experimental branch:
commit a2d754a809375d22587c2d081318c420498f40de
Author: ddkilzer at apple.com <ddkilzer at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jul 23 21:59:13 2010 +0000

    <http://webkit.org/b/42911> Update ruby tools to work with shallow framework bundles
    
    Reviewed by Mark Rowe.
    
    * Scripts/check-for-inappropriate-files-in-framework: Added
    check for the SHALLOW_BUNDLE environment variable so that the
    script will work with iOS WebKit builds.
    * Scripts/check-for-webkit-framework-include-consistency: Ditto.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63997 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index d4a8d96..81b4eb8 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,14 @@
+2010-07-23  David Kilzer  <ddkilzer at apple.com>
+
+        <http://webkit.org/b/42911> Update ruby tools to work with shallow framework bundles
+
+        Reviewed by Mark Rowe.
+
+        * Scripts/check-for-inappropriate-files-in-framework: Added
+        check for the SHALLOW_BUNDLE environment variable so that the
+        script will work with iOS WebKit builds.
+        * Scripts/check-for-webkit-framework-include-consistency: Ditto.
+
 2010-07-22  Darin Adler  <darin at apple.com>
 
         Reviewed by Sam Weinig.
diff --git a/WebKitTools/Scripts/check-for-inappropriate-files-in-framework b/WebKitTools/Scripts/check-for-inappropriate-files-in-framework
index 2bc65d4..a323bc4 100755
--- a/WebKitTools/Scripts/check-for-inappropriate-files-in-framework
+++ b/WebKitTools/Scripts/check-for-inappropriate-files-in-framework
@@ -25,6 +25,7 @@
 
 base_directory = ENV['TARGET_BUILD_DIR'] or throw "Unable to find TARGET_BUILD_DIR in the environment!"
 project_name = ENV['PROJECT_NAME'] or throw "Unable to find PROJECT_NAME in the environment!"
+is_shallow_bundle = (ENV['SHALLOW_BUNDLE'] || "NO").upcase == "YES"
 
 $INAPPROPRIATE_FILES = { "WebCore" => { "Resources" => ["*.css", "*.in", "*.idl"] } }
 
@@ -41,12 +42,13 @@ def print_inappropriate_file_error framework, relative_path
   print_error "#{framework}.framework/#{relative_path} should not be present in the framework."
 end
 
-def check_framework framework
+def check_framework framework, is_shallow_bundle
   $INAPPROPRIATE_FILES[framework].each do |directory, patterns|
-    Dir.chdir "#{framework}.framework/Versions/A/#{directory}" do
+    framework_bundle_path = is_shallow_bundle ? "#{framework}.framework" : "#{framework}.framework/Versions/A/#{directory}"
+    Dir.chdir framework_bundle_path do
       patterns.each do |pattern|
         Dir.glob(pattern).each do |inappropriate_file|
-          print_inappropriate_file_error framework, "Resources/#{inappropriate_file}"
+          print_inappropriate_file_error framework, is_shallow_bundle ? inappropriate_file : "#{directory}/#{inappropriate_file}"
           File.unlink inappropriate_file
         end
       end
@@ -54,7 +56,7 @@ def check_framework framework
   end
 end
 
-check_framework project_name
+check_framework project_name, is_shallow_bundle
 
 if $error_printed
   STDERR.puts
diff --git a/WebKitTools/Scripts/check-for-webkit-framework-include-consistency b/WebKitTools/Scripts/check-for-webkit-framework-include-consistency
index 693dd6a..339fa7e 100755
--- a/WebKitTools/Scripts/check-for-webkit-framework-include-consistency
+++ b/WebKitTools/Scripts/check-for-webkit-framework-include-consistency
@@ -24,7 +24,8 @@
 # THE POSSIBILITY OF SUCH DAMAGE.
 
 
-base_directory = ENV['TARGET_BUILD_DIR']
+base_directory = ENV['TARGET_BUILD_DIR'] or throw "Unable to find TARGET_BUILD_DIR in the environment!"
+is_shallow_bundle = (ENV['SHALLOW_BUNDLE'] || "NO").upcase == "YES"
 
 unless base_directory
   throw "Unable to find TARGET_BUILD_DIR in the environment!"
@@ -44,8 +45,9 @@ def print_error msg
   STDERR.puts "ERROR: #{msg}"
 end
 
-def build_header_maps
-  all_headers = `find WebKit.framework/Versions/A/{,Private}Headers -type f -name '*.h'`.split
+def build_header_maps is_shallow_bundle
+  current_version_path = is_shallow_bundle ? "" : "Versions/A/"
+  all_headers = `find WebKit.framework/#{current_version_path}{,Private}Headers -type f -name '*.h'`.split
 
   all_headers.each do |header|
     if /\/Headers\/(.*)/.match(header)
@@ -97,7 +99,7 @@ def verify_includes(header, permitted_types)
   end
 end
 
-build_header_maps
+build_header_maps is_shallow_bundle
 
 $HEADERS_BY_TYPE.each do |header_type, headers|
   permitted_types = $PERMITTED_INCLUDE_TYPES[header_type]

-- 
WebKit Debian packaging