Changeset 63997 in webkit
- Timestamp:
- Jul 23, 2010 2:59:13 PM (14 years ago)
- Location:
- trunk/WebKitTools
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebKitTools/ChangeLog
r63949 r63997 1 2010-07-23 David Kilzer <ddkilzer@apple.com> 2 3 <http://webkit.org/b/42911> Update ruby tools to work with shallow framework bundles 4 5 Reviewed by Mark Rowe. 6 7 * Scripts/check-for-inappropriate-files-in-framework: Added 8 check for the SHALLOW_BUNDLE environment variable so that the 9 script will work with iOS WebKit builds. 10 * Scripts/check-for-webkit-framework-include-consistency: Ditto. 11 1 12 2010-07-22 Darin Adler <darin@apple.com> 2 13 -
trunk/WebKitTools/Scripts/check-for-inappropriate-files-in-framework
r57326 r63997 26 26 base_directory = ENV['TARGET_BUILD_DIR'] or throw "Unable to find TARGET_BUILD_DIR in the environment!" 27 27 project_name = ENV['PROJECT_NAME'] or throw "Unable to find PROJECT_NAME in the environment!" 28 is_shallow_bundle = (ENV['SHALLOW_BUNDLE'] || "NO").upcase == "YES" 28 29 29 30 $INAPPROPRIATE_FILES = { "WebCore" => { "Resources" => ["*.css", "*.in", "*.idl"] } } … … 42 43 end 43 44 44 def check_framework framework 45 def check_framework framework, is_shallow_bundle 45 46 $INAPPROPRIATE_FILES[framework].each do |directory, patterns| 46 Dir.chdir "#{framework}.framework/Versions/A/#{directory}" do 47 framework_bundle_path = is_shallow_bundle ? "#{framework}.framework" : "#{framework}.framework/Versions/A/#{directory}" 48 Dir.chdir framework_bundle_path do 47 49 patterns.each do |pattern| 48 50 Dir.glob(pattern).each do |inappropriate_file| 49 print_inappropriate_file_error framework, "Resources/#{inappropriate_file}"51 print_inappropriate_file_error framework, is_shallow_bundle ? inappropriate_file : "#{directory}/#{inappropriate_file}" 50 52 File.unlink inappropriate_file 51 53 end … … 55 57 end 56 58 57 check_framework project_name 59 check_framework project_name, is_shallow_bundle 58 60 59 61 if $error_printed -
trunk/WebKitTools/Scripts/check-for-webkit-framework-include-consistency
r55565 r63997 25 25 26 26 27 base_directory = ENV['TARGET_BUILD_DIR'] 27 base_directory = ENV['TARGET_BUILD_DIR'] or throw "Unable to find TARGET_BUILD_DIR in the environment!" 28 is_shallow_bundle = (ENV['SHALLOW_BUNDLE'] || "NO").upcase == "YES" 28 29 29 30 unless base_directory … … 45 46 end 46 47 47 def build_header_maps 48 all_headers = `find WebKit.framework/Versions/A/{,Private}Headers -type f -name '*.h'`.split 48 def build_header_maps is_shallow_bundle 49 current_version_path = is_shallow_bundle ? "" : "Versions/A/" 50 all_headers = `find WebKit.framework/#{current_version_path}{,Private}Headers -type f -name '*.h'`.split 49 51 50 52 all_headers.each do |header| … … 98 100 end 99 101 100 build_header_maps 102 build_header_maps is_shallow_bundle 101 103 102 104 $HEADERS_BY_TYPE.each do |header_type, headers|
Note: See TracChangeset
for help on using the changeset viewer.