Title: [155788] trunk/Tools
- Revision
- 155788
- Author
- m...@apple.com
- Date
- 2013-09-14 14:35:47 -0700 (Sat, 14 Sep 2013)
Log 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.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (155787 => 155788)
--- trunk/Tools/ChangeLog 2013-09-14 21:33:53 UTC (rev 155787)
+++ trunk/Tools/ChangeLog 2013-09-14 21:35:47 UTC (rev 155788)
@@ -1,3 +1,15 @@
+2013-09-14 Dan Bernstein <m...@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 <be...@igalia.com>
[GTK] Fails to compile if the build directory is in a different partition
Modified: trunk/Tools/Scripts/check-for-webkit-framework-include-consistency (155787 => 155788)
--- trunk/Tools/Scripts/check-for-webkit-framework-include-consistency 2013-09-14 21:33:53 UTC (rev 155787)
+++ trunk/Tools/Scripts/check-for-webkit-framework-include-consistency 2013-09-14 21:35:47 UTC (rev 155788)
@@ -1,6 +1,6 @@
#!/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
# modification, are permitted provided that the following conditions
@@ -25,7 +25,6 @@
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
@@ -38,12 +37,11 @@
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|
if /\/Headers\/(.*)/.match(header)
@@ -92,7 +90,7 @@
end
end
-build_header_maps is_shallow_bundle
+build_header_maps
$HEADERS_BY_TYPE.each do |header_type, headers|
permitted_types = $PERMITTED_INCLUDE_TYPES[header_type]
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
