Changeset 155788 in webkit

Timestamp:

Sep 14, 2013 2:35:47 PM (11 years ago)

Author:

mitz@apple.com

Message:

[mac] Check For Framework Include Consistency build phase checks the wrong framework
​https://bugs.webkit.org/show_bug.cgi?id=121215

Reviewed by Mark Rowe.

• Scripts/check-for-webkit-framework-include-consistency: Replaced hard-coded paths to

WebKit.framework’s Headers and PrivateHeaders directories with the current target’s
public and private headers folder paths. Also tweaked the error messages’ format to make
Xcode recognize them as errors.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/check-for-webkit-framework-include-consistency (modified) (4 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2013-09-14  Dan Bernstein  <mitz@apple.com>
+
+        [mac] Check For Framework Include Consistency build phase checks the wrong framework
+        https://bugs.webkit.org/show_bug.cgi?id=121215
+
+        Reviewed by Mark Rowe.
+
+        * Scripts/check-for-webkit-framework-include-consistency: Replaced hard-coded paths to
+        WebKit.framework’s Headers and PrivateHeaders directories with the current target’s
+        public and private headers folder paths. Also tweaked the error messages’ format to make
+        Xcode recognize them as errors.
+
 2013-09-14  Alberto Garcia  <berto@igalia.com>
 

trunk/Tools/Scripts/check-for-webkit-framework-include-consistency

@@ -1 +1 @@
 #!/usr/bin/env ruby
 
-# Copyright (C) 2010 Apple Inc. All rights reserved.
+# Copyright (C) 2010, 2013 Apple Inc. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -26 +26 @@
 
 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"
 
 Dir.chdir base_directory
@@ -39 +38 @@
 def print_error msg
   $error_printed = true
-  STDERR.puts "ERROR: #{msg}"
+  STDERR.puts "error: #{msg}"
 end
 
-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
+def build_header_maps
+  all_headers = `find #{ENV['PUBLIC_HEADERS_FOLDER_PATH']} #{ENV['PRIVATE_HEADERS_FOLDER_PATH']} -type f -name '*.h'`.split
 
   all_headers.each do |header|
@@ -93 +91 @@
 end
 
-build_header_maps is_shallow_bundle
+build_header_maps
 
 $HEADERS_BY_TYPE.each do |header_type, headers|