- Revision
- 269310
- Author
- [email protected]
- Date
- 2020-11-03 09:52:29 -0800 (Tue, 03 Nov 2020)
Log Message
Extend check-for-inappropriate-files-in-framework to WebKitLegacy and _javascript_Core
https://bugs.webkit.org/show_bug.cgi?id=218272
<rdar://problem/70748116>
Reviewed by Simon Fraser.
Bug 218268 reports that some *.txt files got included in WebKitLegacy.
To help protect against this happening in the future, extend
check-for-inappropriate-files-in-framework to check for *.txt files,
and apply the script to WebKitLegacy and _javascript_Core in addition to
WebCore and WebKit.
Source/_javascript_Core:
* _javascript_Core.xcodeproj/project.pbxproj:
Source/WebKitLegacy:
In order to prevent this change from breaking local engineering builds
that still have these files in their build output directories, add a
couple of lines that will delete those *.txt files before making the
check for them.
* WebKitLegacy.xcodeproj/project.pbxproj:
Tools:
* Scripts/check-for-inappropriate-files-in-framework:
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (269309 => 269310)
--- trunk/Source/_javascript_Core/ChangeLog 2020-11-03 17:37:43 UTC (rev 269309)
+++ trunk/Source/_javascript_Core/ChangeLog 2020-11-03 17:52:29 UTC (rev 269310)
@@ -1,3 +1,19 @@
+2020-11-03 Keith Rollin <[email protected]>
+
+ Extend check-for-inappropriate-files-in-framework to WebKitLegacy and _javascript_Core
+ https://bugs.webkit.org/show_bug.cgi?id=218272
+ <rdar://problem/70748116>
+
+ Reviewed by Simon Fraser.
+
+ Bug 218268 reports that some *.txt files got included in WebKitLegacy.
+ To help protect against this happening in the future, extend
+ check-for-inappropriate-files-in-framework to check for *.txt files,
+ and apply the script to WebKitLegacy and _javascript_Core in addition to
+ WebCore and WebKit.
+
+ * _javascript_Core.xcodeproj/project.pbxproj:
+
2020-11-03 Don Olmstead <[email protected]>
[CMake] Add remote inspector platforms
Modified: trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj (269309 => 269310)
--- trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj 2020-11-03 17:37:43 UTC (rev 269309)
+++ trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj 2020-11-03 17:52:29 UTC (rev 269310)
@@ -10819,6 +10819,7 @@
932F5BD20822A1C700736975 /* Frameworks */,
5D29D8BE0E9860B400C3D2D0 /* Check For Weak VTables and Externals */,
3713F014142905240036387F /* Check For Inappropriate Objective-C Class Names */,
+ 532424B0254905D900A6975B /* Check For Inappropriate Files In Framework */,
A55DEAA416703DF7003DB841 /* Check For Inappropriate Macros in External Headers */,
1A02D9A81B34A882000D1522 /* Add Symlink in /System/Library/PrivateFrameworks */,
53609F9021DFFA9C008FA60A /* Check .xcfilelists */,
@@ -11025,6 +11026,24 @@
shellPath = /bin/sh;
shellScript = "set -e\n\nif [[ -f \"${BUILT_PRODUCTS_DIR}/libWTF.a\" ]]; then\n ln -s -f -h \"${BUILT_PRODUCTS_DIR}/libWTF.a\" \"${BUILT_PRODUCTS_DIR}/DerivedSources/_javascript_Core/libWTF.a\"\nelse\n ln -s -f -h \"${SDK_DIR}${WK_ALTERNATE_WEBKIT_SDK_PATH}/usr/local/lib/libWTF.a\" \"${BUILT_PRODUCTS_DIR}/DerivedSources/_javascript_Core/libWTF.a\"\nfi\n";
};
+ 532424B0254905D900A6975B /* Check For Inappropriate Files In Framework */ = {
+ isa = PBXShellScriptBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ );
+ inputFileListPaths = (
+ );
+ inputPaths = (
+ );
+ name = "Check For Inappropriate Files In Framework";
+ outputFileListPaths = (
+ );
+ outputPaths = (
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ shellPath = /bin/sh;
+ shellScript = "if [ \"${ACTION}\" = \"installhdrs\" ] || [ \"${ACTION}\" = \"installapi\" ]; then\n exit 0;\nfi\n\nif [ -f ../../Tools/Scripts/check-for-inappropriate-files-in-framework ]; then\n ../../Tools/Scripts/check-for-inappropriate-files-in-framework || exit $?\nfi\n";
+ };
5325BDC521DFF2BA00A0DEE1 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
Modified: trunk/Source/WebKitLegacy/ChangeLog (269309 => 269310)
--- trunk/Source/WebKitLegacy/ChangeLog 2020-11-03 17:37:43 UTC (rev 269309)
+++ trunk/Source/WebKitLegacy/ChangeLog 2020-11-03 17:52:29 UTC (rev 269310)
@@ -1,3 +1,24 @@
+2020-11-03 Keith Rollin <[email protected]>
+
+ Extend check-for-inappropriate-files-in-framework to WebKitLegacy and _javascript_Core
+ https://bugs.webkit.org/show_bug.cgi?id=218272
+ <rdar://problem/70748116>
+
+ Reviewed by Simon Fraser.
+
+ Bug 218268 reports that some *.txt files got included in WebKitLegacy.
+ To help protect against this happening in the future, extend
+ check-for-inappropriate-files-in-framework to check for *.txt files,
+ and apply the script to WebKitLegacy and _javascript_Core in addition to
+ WebCore and WebKit.
+
+ In order to prevent this change from breaking local engineering builds
+ that still have these files in their build output directories, add a
+ couple of lines that will delete those *.txt files before making the
+ check for them.
+
+ * WebKitLegacy.xcodeproj/project.pbxproj:
+
2020-10-27 Keith Rollin <[email protected]>
Unexpected txt file: .../WebKitLegacy.framework/.../Sources.txt
Modified: trunk/Source/WebKitLegacy/WebKitLegacy.xcodeproj/project.pbxproj (269309 => 269310)
--- trunk/Source/WebKitLegacy/WebKitLegacy.xcodeproj/project.pbxproj 2020-11-03 17:37:43 UTC (rev 269309)
+++ trunk/Source/WebKitLegacy/WebKitLegacy.xcodeproj/project.pbxproj 2020-11-03 17:52:29 UTC (rev 269310)
@@ -3207,6 +3207,7 @@
939811270824BF01008DF038 /* Frameworks */,
5D0D54210E98631D0029E223 /* Check For Weak VTables and Externals */,
3713F018142905B70036387F /* Check For Inappropriate Objective-C Class Names */,
+ 532424B1254905FE00A6975B /* Check For Inappropriate Files In Framework */,
1A3193D5191856E500E1CF89 /* Symlink WebKitPluginHost */,
537CF83A22EFBFB100C6EBB3 /* Check .xcfilelists */,
);
@@ -3349,6 +3350,24 @@
shellPath = /bin/sh;
shellScript = "if [ \"${ACTION}\" = \"installhdrs\" ] || [ \"${ACTION}\" = \"installapi\" ]; then\n exit 0;\nfi\n\nif [ -f ../../Tools/Scripts/check-for-inappropriate-objc-class-names ]; then\n ../../Tools/Scripts/check-for-inappropriate-objc-class-names DOM Web _Web || exit $?\nfi";
};
+ 532424B1254905FE00A6975B /* Check For Inappropriate Files In Framework */ = {
+ isa = PBXShellScriptBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ );
+ inputFileListPaths = (
+ );
+ inputPaths = (
+ );
+ name = "Check For Inappropriate Files In Framework";
+ outputFileListPaths = (
+ );
+ outputPaths = (
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ shellPath = /bin/sh;
+ shellScript = "if [ \"${ACTION}\" = \"installhdrs\" ] || [ \"${ACTION}\" = \"installapi\" ]; then\n exit 0;\nfi\n\n# For a while, these files were incorrectly included in the builds (see\n# https://bugs.webkit.org/show_bug.cgi?id=218268). Manually delete them\n# from anyone's build directory so that the check performed by\n# check-for-inappropriate-files-in-framework won't fail. This step can be\n# removed after a reasonable amount of time has passed and we can assume\n# everyone's performed a clean build by now.\n\nFRAMEWORK_DIR=\"${TARGET_BUILD_DIR}/${PRODUCT_NAME}.framework\"\nRESOURCES_DIR=\"${FRAMEWORK_DIR}/Resources\"\n\nrm -f \"${RESOURCES_DIR}/Sources.txt\"\nrm -f \"${RESOURCES_DIR}/SourcesCocoa.txt\"\n\nif [ -f ../../Tools/Scripts/check-for-inappropriate-files-in-framework ]; then\n ../../Tools/Scripts/check-for-inappropriate-files-in-framework || exit $?\nfi\n\nexit 0\n";
+ };
537CF83A22EFBFB100C6EBB3 /* Check .xcfilelists */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
Modified: trunk/Tools/ChangeLog (269309 => 269310)
--- trunk/Tools/ChangeLog 2020-11-03 17:37:43 UTC (rev 269309)
+++ trunk/Tools/ChangeLog 2020-11-03 17:52:29 UTC (rev 269310)
@@ -1,3 +1,19 @@
+2020-11-03 Keith Rollin <[email protected]>
+
+ Extend check-for-inappropriate-files-in-framework to WebKitLegacy and _javascript_Core
+ https://bugs.webkit.org/show_bug.cgi?id=218272
+ <rdar://problem/70748116>
+
+ Reviewed by Simon Fraser.
+
+ Bug 218268 reports that some *.txt files got included in WebKitLegacy.
+ To help protect against this happening in the future, extend
+ check-for-inappropriate-files-in-framework to check for *.txt files,
+ and apply the script to WebKitLegacy and _javascript_Core in addition to
+ WebCore and WebKit.
+
+ * Scripts/check-for-inappropriate-files-in-framework:
+
2020-11-03 Carlos Garcia Campos <[email protected]>
[GTK] MiniBrowser: increase default window size
Modified: trunk/Tools/Scripts/check-for-inappropriate-files-in-framework (269309 => 269310)
--- trunk/Tools/Scripts/check-for-inappropriate-files-in-framework 2020-11-03 17:37:43 UTC (rev 269309)
+++ trunk/Tools/Scripts/check-for-inappropriate-files-in-framework 2020-11-03 17:52:29 UTC (rev 269310)
@@ -27,9 +27,12 @@
project_name = ENV['PRODUCT_NAME'] or throw "Unable to find PRODUCT_NAME in the environment!"
is_shallow_bundle = (ENV['SHALLOW_BUNDLE'] || "NO").upcase == "YES"
-$INAPPROPRIATE_FILES = { "WebCore" => { "Resources" => ["*.in", "*.idl", "*.h"] },
- "WebKit" => { "Resources" => ["*.in", "*.h"] },
- }
+$INAPPROPRIATE_FILES = {
+ "_javascript_Core" => { "Resources" => ["*.txt", "*.in", "*.idl", "*.h"] },
+ "WebCore" => { "Resources" => ["*.txt", "*.in", "*.idl", "*.h"] },
+ "WebKitLegacy" => { "Resources" => ["*.txt", "*.in", "*.idl", "*.h"] },
+ "WebKit" => { "Resources" => ["*.txt", "*.in", "*.idl", "*.h"] },
+}
Dir.chdir base_directory
