Changeset 155787 in webkit

Timestamp:

Sep 14, 2013 2:33:53 PM (11 years ago)

Author:

mitz@apple.com

Message:

Remove non-Apple cruft from the installed WKBase.h
​https://bugs.webkit.org/show_bug.cgi?id=121370

Reviewed by Darin Adler.

• Configurations/WebKit2.xcconfig: Set INSTALLHDRS_SCRIPT_PHASE to YES.
• WebKit2.xcodeproj/project.pbxproj: Added a script build phase that runs unifdef on

the installed WKBase.h with APPLE defined and various BUILDING_* and WTF_USE_* symbols
undefined.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Configurations/WebKit2.xcconfig (modified) (1 diff)
• WebKit2.xcodeproj/project.pbxproj (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-09-14  Dan Bernstein  <mitz@apple.com>
+
+        Remove non-Apple cruft from the installed WKBase.h
+        https://bugs.webkit.org/show_bug.cgi?id=121370
+
+        Reviewed by Darin Adler.
+
+        * Configurations/WebKit2.xcconfig: Set INSTALLHDRS_SCRIPT_PHASE to YES.
+        * WebKit2.xcodeproj/project.pbxproj: Added a script build phase that runs unifdef on
+        the installed WKBase.h with __APPLE__ defined and various BUILDING_* and WTF_USE_* symbols
+        undefined.
+
 2013-09-14  Dan Bernstein  <mitz@apple.com>
 

trunk/Source/WebKit2/Configurations/WebKit2.xcconfig

@@ -41 +41 @@
 EXCLUDED_SOURCE_FILE_NAMES_iphoneos = *.pdf;
 EXCLUDED_SOURCE_FILE_NAMES_iphonesimulator = $(EXCLUDED_SOURCE_FILE_NAMES_iphoneos);
+
+INSTALLHDRS_SCRIPT_PHASE = YES;

trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj

@@ -5762 +5762 @@
                         buildPhases = (
                                 8DC2EF500486A6940098B216 /* Headers */,
+                                375A248817E5048E00C9A086 /* Postprocess WKBase.h */,
                                 8DC2EF520486A6940098B216 /* Resources */,
                                 7CB16FEE1724BA05007A0A95 /* Copy Plug-in Sandbox Profiles */,
@@ -6118 +6119 @@
                         shellPath = /bin/sh;
                         shellScript = "if [ \"${ACTION}\" = \"installhdrs\" ]; 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 WK || exit $?\nfi";
+                };
+                375A248817E5048E00C9A086 /* Postprocess WKBase.h */ = {
+                        isa = PBXShellScriptBuildPhase;
+                        buildActionMask = 2147483647;
+                        files = (
+                        );
+                        inputPaths = (
+                                "$(TARGET_BUILD_DIR)/$(PRIVATE_HEADERS_FOLDER_PATH)/WKBase.h",
+                        );
+                        name = "Postprocess WKBase.h";
+                        outputPaths = (
+                        );
+                        runOnlyForDeploymentPostprocessing = 0;
+                        shellPath = /bin/sh;
+                        shellScript = "WKBASE_H=${TARGET_BUILD_DIR}/${PRIVATE_HEADERS_FOLDER_PATH}/WKBase.h\n\nunifdef -B -D__APPLE__ -UBUILDING_GTK__ -UWTF_USE_SOUP -UBUILDING_EFL__ -UBUILDING_QT__ -o ${WKBASE_H} ${WKBASE_H}\n\nif [[ $? > 1 ]]; then\n    exit 1;\nfi";
                 };
                 5D1A239215E760590023E981 /* Remove Compiled Python Files */ = {