[Cocoa] Adopt the PRODUCT_BUNDLE_IDENTIFIER build setting
authoraestes@apple.com <aestes@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 3 Dec 2016 01:31:48 +0000 (01:31 +0000)
committeraestes@apple.com <aestes@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 3 Dec 2016 01:31:48 +0000 (01:31 +0000)
https://bugs.webkit.org/show_bug.cgi?id=164492

Reviewed by Dan Bernstein.

Source/JavaScriptCore:

* Configurations/JavaScriptCore.xcconfig: Set PRODUCT_BUNDLE_IDENTIFIER to
com.apple.$(PRODUCT_NAME:rfc1034identifier).
* Info.plist: Changed CFBundleIdentifier's value from com.apple.${PRODUCT_NAME} to
${PRODUCT_BUNDLE_IDENTIFIER}.

Source/WebCore:

* Configurations/WebCore.xcconfig: Set PRODUCT_BUNDLE_IDENTIFIER to
com.apple.$(PRODUCT_NAME:rfc1034identifier).
* Info.plist: Changed CFBundleIdentifier's value from com.apple.${PRODUCT_NAME} to
${PRODUCT_BUNDLE_IDENTIFIER}.

Source/WebInspectorUI:

* Configurations/WebInspectorUIFramework.xcconfig: Set PRODUCT_BUNDLE_IDENTIFIER to
com.apple.$(PRODUCT_NAME:rfc1034identifier).
* Info.plist: Changed CFBundleIdentifier's value from
com.apple.${PRODUCT_NAME:rfc1034identifier} to ${PRODUCT_BUNDLE_IDENTIFIER}.

Source/WebKit/mac:

* Configurations/WebKitLegacy.xcconfig: Set PRODUCT_BUNDLE_IDENTIFIER to
com.apple.$(PRODUCT_NAME:rfc1034identifier).
* Info.plist: Changed CFBundleIdentifier's value from com.apple.${PRODUCT_NAME} to
${PRODUCT_BUNDLE_IDENTIFIER}.

Source/WebKit2:

* Configurations/DatabaseService.xcconfig: Set PRODUCT_BUNDLE_IDENTIFIER to
$(PRODUCT_NAME).
* Configurations/NetworkService.xcconfig: Ditto.
* Configurations/PluginService.32.xcconfig: Ditto.
* Configurations/PluginService.64.xcconfig: Ditto.
* Configurations/WebContentService.xcconfig: Ditto.
* Configurations/WebKit.xcconfig: Set PRODUCT_BUNDLE_IDENTIFIER to
com.apple.$(PRODUCT_NAME:rfc1034identifier).
* DatabaseProcess/EntryPoint/mac/XPCService/DatabaseService/Info.plist: Changed
CFBundleIdentifier's value from ${PRODUCT_NAME} to ${PRODUCT_BUNDLE_IDENTIFIER}.
* Info.plist: Changed CFBundleIdentifier's value from com.apple.${PRODUCT_NAME} to
${PRODUCT_BUNDLE_IDENTIFIER}.
* NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-OSX-10.9-10.10.plist: Changed
CFBundleIdentifier's value from ${PRODUCT_NAME} to ${PRODUCT_BUNDLE_IDENTIFIER}.
* NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-OSX.plist: Ditto.
* NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-iOS.plist: Ditto.
* PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64-10.9-10.10.Info.plist: Ditto.
* PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64.Info.plist: Ditto.
* WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-OSX-10.9-10.10.plist: Ditto.
* WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-OSX.plist: Ditto.
* WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-iOS.plist: Ditto.

Tools:

* DumpRenderTree/TestNetscapePlugIn/mac/Info.plist: Changed CFBundleIdentifier's value from
com.apple.testnetscapeplugin to ${PRODUCT_BUNDLE_IDENTIFIER}.
* DumpRenderTree/ios/Info.plist: Changed CFBundleIdentifier's value from
org.webkit.DumpRenderTree to ${PRODUCT_BUNDLE_IDENTIFIER}.
* DumpRenderTree/mac/Configurations/DumpRenderTreeApp.xcconfig: Set
PRODUCT_BUNDLE_IDENTIFIER to org.webkit.DumpRenderTree.
* DumpRenderTree/mac/Configurations/TestNetscapePlugIn.xcconfig: Set
PRODUCT_BUNDLE_IDENTIFIER to com.apple.testnetscapeplugin.
* MiniBrowser/Configurations/MiniBrowser.xcconfig: Set PRODUCT_BUNDLE_IDENTIFIER to
org.webkit.$(PRODUCT_NAME:rfc1034identifier).
* MiniBrowser/Configurations/MiniBrowserBundle.xcconfig: Set PRODUCT_BUNDLE_IDENTIFIER to
com.apple.$(PRODUCT_NAME:rfc1034identifier).
* MiniBrowser/mac/Bundle/Info.plist: Changed CFBundleIdentifier's value from
com.apple.${PRODUCT_NAME:rfc1034identifier} to ${PRODUCT_BUNDLE_IDENTIFIER}.
* MiniBrowser/mac/Info.plist: Changed CFBundleIdentifier's value from
org.webkit.${PRODUCT_NAME} to ${PRODUCT_BUNDLE_IDENTIFIER}.
* TestWebKitAPI/Configurations/InjectedBundle.xcconfig: Set INFOPLIST_FILE to
InjectedBundle-Info.plist and set PRODUCT_BUNDLE_IDENTIFIER to
com.apple.$(PRODUCT_NAME:rfc1034identifier).
* TestWebKitAPI/Configurations/WebProcessPlugIn.xcconfig: Set PRODUCT_BUNDLE_IDENTIFIER to
com.apple.$(PRODUCT_NAME:rfc1034identifier).
* TestWebKitAPI/InjectedBundle-Info.plist: Changed CFBundleIdentifier's value from
com.yourcompany.${PRODUCT_NAME:rfc1034identifier} to ${PRODUCT_BUNDLE_IDENTIFIER}.
* TestWebKitAPI/cocoa/WebProcessPlugIn/Info.plist: Added a CFBundleIdentifier key with the
value ${PRODUCT_BUNDLE_IDENTIFIER}.
* WebKitTestRunner/Configurations/InjectedBundle.xcconfig: Set INFOPLIST_FILE to
InjectedBundle-Info.plist and set PRODUCT_BUNDLE_IDENTIFIER to
com.apple.WebKitTestRunner.InjectedBundle.
* WebKitTestRunner/Configurations/WebKitTestRunnerApp.xcconfig: Set
PRODUCT_BUNDLE_IDENTIFIER to org.webkit.$(PRODUCT_NAME:rfc1034identifier).
* WebKitTestRunner/InjectedBundle-Info.plist: Changed CFBundleIdentifier's value from
com.apple.WebKitTestRunner.InjectedBundle to ${PRODUCT_BUNDLE_IDENTIFIER}.
* WebKitTestRunner/WebKitTestRunnerApp/WebKitTestRunnerApp-Info.plist: Changed
CFBundleIdentifier's value from org.webkit.${PRODUCT_NAME:rfc1034identifier} to
${PRODUCT_BUNDLE_IDENTIFIER}.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@209288 268f45cc-cd09-0410-ab3c-d52691b4dbfc

46 files changed:
Source/JavaScriptCore/ChangeLog
Source/JavaScriptCore/Configurations/JavaScriptCore.xcconfig
Source/JavaScriptCore/Info.plist
Source/WebCore/ChangeLog
Source/WebCore/Configurations/WebCore.xcconfig
Source/WebCore/Info.plist
Source/WebInspectorUI/ChangeLog
Source/WebInspectorUI/Configurations/WebInspectorUIFramework.xcconfig
Source/WebInspectorUI/Info.plist
Source/WebKit/mac/ChangeLog
Source/WebKit/mac/Configurations/WebKitLegacy.xcconfig
Source/WebKit/mac/Info.plist
Source/WebKit2/ChangeLog
Source/WebKit2/Configurations/DatabaseService.xcconfig
Source/WebKit2/Configurations/NetworkService.xcconfig
Source/WebKit2/Configurations/PluginService.32.xcconfig
Source/WebKit2/Configurations/PluginService.64.xcconfig
Source/WebKit2/Configurations/WebContentService.xcconfig
Source/WebKit2/Configurations/WebKit.xcconfig
Source/WebKit2/DatabaseProcess/EntryPoint/mac/XPCService/DatabaseService/Info.plist
Source/WebKit2/Info.plist
Source/WebKit2/NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-OSX-10.9-10.10.plist
Source/WebKit2/NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-OSX.plist
Source/WebKit2/NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-iOS.plist
Source/WebKit2/PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64-10.9-10.10.Info.plist
Source/WebKit2/PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64.Info.plist
Source/WebKit2/WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-OSX-10.9-10.10.plist
Source/WebKit2/WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-OSX.plist
Source/WebKit2/WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-iOS.plist
Tools/ChangeLog
Tools/DumpRenderTree/TestNetscapePlugIn/mac/Info.plist
Tools/DumpRenderTree/ios/Info.plist
Tools/DumpRenderTree/mac/Configurations/DumpRenderTreeApp.xcconfig
Tools/DumpRenderTree/mac/Configurations/TestNetscapePlugIn.xcconfig
Tools/MiniBrowser/Configurations/MiniBrowser.xcconfig
Tools/MiniBrowser/Configurations/MiniBrowserBundle.xcconfig
Tools/MiniBrowser/mac/Bundle/Info.plist
Tools/MiniBrowser/mac/Info.plist
Tools/TestWebKitAPI/Configurations/InjectedBundle.xcconfig
Tools/TestWebKitAPI/Configurations/WebProcessPlugIn.xcconfig
Tools/TestWebKitAPI/InjectedBundle-Info.plist
Tools/TestWebKitAPI/cocoa/WebProcessPlugIn/Info.plist
Tools/WebKitTestRunner/Configurations/InjectedBundle.xcconfig
Tools/WebKitTestRunner/Configurations/WebKitTestRunnerApp.xcconfig
Tools/WebKitTestRunner/InjectedBundle-Info.plist
Tools/WebKitTestRunner/WebKitTestRunnerApp/WebKitTestRunnerApp-Info.plist

index c2e70b5..5bffe06 100644 (file)
@@ -1,3 +1,15 @@
+2016-12-02  Andy Estes  <aestes@apple.com>
+
+        [Cocoa] Adopt the PRODUCT_BUNDLE_IDENTIFIER build setting
+        https://bugs.webkit.org/show_bug.cgi?id=164492
+
+        Reviewed by Dan Bernstein.
+
+        * Configurations/JavaScriptCore.xcconfig: Set PRODUCT_BUNDLE_IDENTIFIER to
+        com.apple.$(PRODUCT_NAME:rfc1034identifier).
+        * Info.plist: Changed CFBundleIdentifier's value from com.apple.${PRODUCT_NAME} to
+        ${PRODUCT_BUNDLE_IDENTIFIER}.
+
 2016-12-02  JF Bastien  <jfbastien@apple.com>
 
         WebAssembly: mark WasmOps.h as private
index 1c2e459..b432db2 100644 (file)
@@ -51,6 +51,7 @@ INFOPLIST_FILE = Info.plist;
 INSTALL_PATH = $(JAVASCRIPTCORE_FRAMEWORKS_DIR);
 DYLIB_INSTALL_NAME_BASE = $(NORMAL_JAVASCRIPTCORE_FRAMEWORKS_DIR);
 PRODUCT_NAME = JavaScriptCore;
+PRODUCT_BUNDLE_IDENTIFIER = com.apple.$(PRODUCT_NAME:rfc1034identifier);
 
 INSTALLHDRS_SCRIPT_PHASE = YES;
 
index 41323e4..8335dd2 100644 (file)
@@ -9,7 +9,7 @@
        <key>CFBundleGetInfoString</key>
        <string>${BUNDLE_VERSION}, Copyright 2003-2016 Apple Inc.; Copyright 1999-2001 Harri Porten &lt;porten@kde.org&gt;; Copyright 2001 Peter Kelly &lt;pmk@post.com&gt;; Copyright 1997-2005 University of Cambridge; Copyright 1991, 2000, 2001 by Lucent Technologies.</string>
        <key>CFBundleIdentifier</key>
-       <string>com.apple.${PRODUCT_NAME}</string>
+       <string>${PRODUCT_BUNDLE_IDENTIFIER}</string>
        <key>CFBundleInfoDictionaryVersion</key>
        <string>6.0</string>
        <key>CFBundleName</key>
index a5070a9..f51869f 100644 (file)
@@ -1,3 +1,15 @@
+2016-12-02  Andy Estes  <aestes@apple.com>
+
+        [Cocoa] Adopt the PRODUCT_BUNDLE_IDENTIFIER build setting
+        https://bugs.webkit.org/show_bug.cgi?id=164492
+
+        Reviewed by Dan Bernstein.
+
+        * Configurations/WebCore.xcconfig: Set PRODUCT_BUNDLE_IDENTIFIER to
+        com.apple.$(PRODUCT_NAME:rfc1034identifier).
+        * Info.plist: Changed CFBundleIdentifier's value from com.apple.${PRODUCT_NAME} to
+        ${PRODUCT_BUNDLE_IDENTIFIER}.
+
 2016-12-02  Chris Dumez  <cdumez@apple.com>
 
         HTML Interactive Form Validation popovers do not show in iOS WKWebViews
index d69a8d5..c488f80 100644 (file)
@@ -56,6 +56,7 @@ DYLIB_INSTALL_NAME_BASE_PLATFORM[sdk=macosx*] = $(NORMAL_WEBCORE_FRAMEWORKS_DIR)
 INSTALLHDRS_COPY_PHASE = YES;
 INSTALLHDRS_SCRIPT_PHASE = YES;
 PRODUCT_NAME = WebCore;
+PRODUCT_BUNDLE_IDENTIFIER = com.apple.$(PRODUCT_NAME:rfc1034identifier);
 UNEXPORTED_SYMBOLS_FILE = Configurations/WebCore.unexp;
 
 WK_PREFIXED_IPHONEOS_DEPLOYMENT_TARGET = V$(IPHONEOS_DEPLOYMENT_TARGET);
index 02b47b9..d623a6e 100644 (file)
@@ -9,7 +9,7 @@
        <key>CFBundleGetInfoString</key>
        <string>${BUNDLE_VERSION}, Copyright 2003-2016 Apple Inc.; Copyright 1997 Martin Jones &lt;mjones@kde.org&gt;; Copyright 1998, 1999 Torben Weis &lt;weis@kde.org&gt;; Copyright 1998, 1999, 2002 Waldo Bastian &lt;bastian@kde.org&gt;; Copyright 1998-2000 Lars Knoll &lt;knoll@kde.org&gt;; Copyright 1999, 2001 Antti Koivisto &lt;koivisto@kde.org&gt;; Copyright 1999-2001 Harri Porten &lt;porten@kde.org&gt;; Copyright 2000 Simon Hausmann &lt;hausmann@kde.org&gt;; Copyright 2000, 2001 Dirk Mueller &lt;mueller@kde.org&gt;; Copyright 2000, 2001 Peter Kelly &lt;pmk@post.com&gt;; Copyright 2000 Daniel Molkentin &lt;molkentin@kde.org&gt;; Copyright 2000 Stefan Schimanski &lt;schimmi@kde.org&gt;; Copyright 1998-2000 Netscape Communications Corporation; Copyright 1998, 1999, 2000 Thai Open Source Software Center Ltd and Clark Cooper; Copyright 2001, 2002 Expat maintainers.</string>
        <key>CFBundleIdentifier</key>
-       <string>com.apple.${PRODUCT_NAME}</string>
+       <string>${PRODUCT_BUNDLE_IDENTIFIER}</string>
        <key>CFBundleInfoDictionaryVersion</key>
        <string>6.0</string>
        <key>CFBundleName</key>
index 29dee3e..6e2107a 100644 (file)
@@ -1,3 +1,15 @@
+2016-12-02  Andy Estes  <aestes@apple.com>
+
+        [Cocoa] Adopt the PRODUCT_BUNDLE_IDENTIFIER build setting
+        https://bugs.webkit.org/show_bug.cgi?id=164492
+
+        Reviewed by Dan Bernstein.
+
+        * Configurations/WebInspectorUIFramework.xcconfig: Set PRODUCT_BUNDLE_IDENTIFIER to
+        com.apple.$(PRODUCT_NAME:rfc1034identifier).
+        * Info.plist: Changed CFBundleIdentifier's value from
+        com.apple.${PRODUCT_NAME:rfc1034identifier} to ${PRODUCT_BUNDLE_IDENTIFIER}.
+
 2016-12-02  Nikita Vasilyev  <nvasilyev@apple.com>
 
         REGRESSION (r192344): Web Inspector: Turning off Code Coverage or Type Profiler logs an error
index 710be1a..34b1cce 100644 (file)
@@ -10,6 +10,7 @@ INSTALL_PATH_NO = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
 INSTALL_PATH_YES = $(WK_OVERRIDE_FRAMEWORKS_DIR);
 DYLIB_INSTALL_NAME_BASE = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
 PRODUCT_NAME = WebInspectorUI;
+PRODUCT_BUNDLE_IDENTIFIER = com.apple.$(PRODUCT_NAME:rfc1034identifier);
 
 GCC_DYNAMIC_NO_PIC = NO;
 GCC_PRECOMPILE_PREFIX_HEADER = YES;
index 8bd35f2..a59a7d6 100644 (file)
@@ -7,7 +7,7 @@
        <key>CFBundleExecutable</key>
        <string>${EXECUTABLE_NAME}</string>
        <key>CFBundleIdentifier</key>
-       <string>com.apple.${PRODUCT_NAME:rfc1034identifier}</string>
+       <string>${PRODUCT_BUNDLE_IDENTIFIER}</string>
        <key>CFBundleInfoDictionaryVersion</key>
        <string>6.0</string>
        <key>CFBundleName</key>
index 8db8c2d..ae9d2dc 100644 (file)
@@ -1,3 +1,15 @@
+2016-12-02  Andy Estes  <aestes@apple.com>
+
+        [Cocoa] Adopt the PRODUCT_BUNDLE_IDENTIFIER build setting
+        https://bugs.webkit.org/show_bug.cgi?id=164492
+
+        Reviewed by Dan Bernstein.
+
+        * Configurations/WebKitLegacy.xcconfig: Set PRODUCT_BUNDLE_IDENTIFIER to
+        com.apple.$(PRODUCT_NAME:rfc1034identifier).
+        * Info.plist: Changed CFBundleIdentifier's value from com.apple.${PRODUCT_NAME} to
+        ${PRODUCT_BUNDLE_IDENTIFIER}.
+
 2016-12-02  Chris Dumez  <cdumez@apple.com>
 
         Regression(r209252): HTML interactive validation should not be enabled on iOS WK1 yet
index 7492e06..73a19e6 100644 (file)
@@ -70,6 +70,7 @@ DYLIB_INSTALL_NAME_BASE = $(NORMAL_WEBKIT_LEGACY_FRAMEWORKS_DIR);
 INSTALLHDRS_COPY_PHASE = YES;
 INSTALLHDRS_SCRIPT_PHASE = YES;
 PRODUCT_NAME = WebKitLegacy;
+PRODUCT_BUNDLE_IDENTIFIER = com.apple.$(PRODUCT_NAME:rfc1034identifier);
 UMBRELLA_FRAMEWORKS_DIR = $(PRODUCTION_FRAMEWORKS_DIR)/WebKit.framework/Versions/A/Frameworks;
 
 OTHER_LDFLAGS[sdk=iphone*] = $(inherited) -lobjc -lsqlite3 -framework CFNetwork -framework CoreFoundation -framework CoreGraphics -framework CoreText -framework Foundation -framework GraphicsServices -framework ImageIO -framework OpenGLES -framework MobileCoreServices -lMobileGestalt;
index a6df1e5..a042520 100644 (file)
@@ -9,7 +9,7 @@
        <key>CFBundleGetInfoString</key>
        <string>${BUNDLE_VERSION}, Copyright 2003-2016 Apple Inc.</string>
        <key>CFBundleIdentifier</key>
-       <string>com.apple.${PRODUCT_NAME}</string>
+       <string>${PRODUCT_BUNDLE_IDENTIFIER}</string>
        <key>CFBundleInfoDictionaryVersion</key>
        <string>6.0</string>
        <key>CFBundleName</key>
index 6c05e16..7661511 100644 (file)
@@ -1,3 +1,32 @@
+2016-12-02  Andy Estes  <aestes@apple.com>
+
+        [Cocoa] Adopt the PRODUCT_BUNDLE_IDENTIFIER build setting
+        https://bugs.webkit.org/show_bug.cgi?id=164492
+
+        Reviewed by Dan Bernstein.
+
+        * Configurations/DatabaseService.xcconfig: Set PRODUCT_BUNDLE_IDENTIFIER to
+        $(PRODUCT_NAME).
+        * Configurations/NetworkService.xcconfig: Ditto.
+        * Configurations/PluginService.32.xcconfig: Ditto.
+        * Configurations/PluginService.64.xcconfig: Ditto.
+        * Configurations/WebContentService.xcconfig: Ditto.
+        * Configurations/WebKit.xcconfig: Set PRODUCT_BUNDLE_IDENTIFIER to
+        com.apple.$(PRODUCT_NAME:rfc1034identifier).
+        * DatabaseProcess/EntryPoint/mac/XPCService/DatabaseService/Info.plist: Changed
+        CFBundleIdentifier's value from ${PRODUCT_NAME} to ${PRODUCT_BUNDLE_IDENTIFIER}.
+        * Info.plist: Changed CFBundleIdentifier's value from com.apple.${PRODUCT_NAME} to
+        ${PRODUCT_BUNDLE_IDENTIFIER}.
+        * NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-OSX-10.9-10.10.plist: Changed
+        CFBundleIdentifier's value from ${PRODUCT_NAME} to ${PRODUCT_BUNDLE_IDENTIFIER}.
+        * NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-OSX.plist: Ditto.
+        * NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-iOS.plist: Ditto.
+        * PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64-10.9-10.10.Info.plist: Ditto.
+        * PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64.Info.plist: Ditto.
+        * WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-OSX-10.9-10.10.plist: Ditto.
+        * WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-OSX.plist: Ditto.
+        * WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-iOS.plist: Ditto.
+
 2016-12-02  Brent Fulgham  <bfulgham@apple.com>
 
         [Mac] Update sandbox profiles to use modern syntax and avoid duplication
index b2f107d..c8ccf05 100644 (file)
@@ -26,4 +26,5 @@
 WK_XPC_SERVICE_IOS_ENTITLEMENTS_BASE = Databases-iOS;
 
 PRODUCT_NAME = com.apple.WebKit.Databases;
+PRODUCT_BUNDLE_IDENTIFIER = $(PRODUCT_NAME);
 INFOPLIST_FILE = DatabaseProcess/EntryPoint/mac/XPCService/DatabaseService/Info.plist;
index e04addf..1ddd761 100644 (file)
@@ -26,6 +26,7 @@
 WK_XPC_SERVICE_IOS_ENTITLEMENTS_BASE = Network-iOS;
 
 PRODUCT_NAME = com.apple.WebKit.Networking;
+PRODUCT_BUNDLE_IDENTIFIER = $(PRODUCT_NAME);
 INFOPLIST_FILE[sdk=iphone*] = NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-iOS.plist;
 INFOPLIST_FILE[sdk=macosx*] = NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-OSX$(WK_XPC_SERVICE_INFOPLIST_SUFFIX).plist;
 
index bcaa05f..0200c19 100644 (file)
@@ -26,6 +26,7 @@
 VALID_ARCHS_macosx_NO = i386;
 
 PRODUCT_NAME = com.apple.WebKit.Plugin.32;
+PRODUCT_BUNDLE_IDENTIFIER = $(PRODUCT_NAME);
 INFOPLIST_FILE = PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64$(WK_XPC_SERVICE_INFOPLIST_SUFFIX).Info.plist;
 
 OTHER_LDFLAGS = $(OTHER_LDFLAGS) $(OTHER_LDFLAGS_PLATFORM) $(OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH) $(WK_RELOCATABLE_FRAMEWORKS_LDFLAGS);
index 845ed72..52dd583 100644 (file)
@@ -26,6 +26,7 @@
 VALID_ARCHS_macosx_NO = x86_64;
 
 PRODUCT_NAME = com.apple.WebKit.Plugin.64;
+PRODUCT_BUNDLE_IDENTIFIER = $(PRODUCT_NAME);
 INFOPLIST_FILE = PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64$(WK_XPC_SERVICE_INFOPLIST_SUFFIX).Info.plist;
 
 OTHER_LDFLAGS = $(OTHER_LDFLAGS) $(OTHER_LDFLAGS_PLATFORM) $(OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH) $(WK_RELOCATABLE_FRAMEWORKS_LDFLAGS);
index 7f583d8..89f940c 100644 (file)
@@ -30,6 +30,7 @@ CODE_SIGN_ENTITLEMENTS_OSX_WITH_XPC_DOMAIN_EXTENSION_YES = Configurations/WebCon
 OTHER_CODE_SIGN_FLAGS[sdk=macosx*] = $(WK_XPC_DOMAIN_EXTENSION_CODE_SIGN_FLAGS);
 
 PRODUCT_NAME = com.apple.WebKit.WebContent;
+PRODUCT_BUNDLE_IDENTIFIER = $(PRODUCT_NAME);
 INFOPLIST_FILE[sdk=iphone*] = WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-iOS.plist;
 INFOPLIST_FILE[sdk=macosx*] = WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-OSX$(WK_XPC_SERVICE_INFOPLIST_SUFFIX).plist;
 
index a9d3e94..4ec878a 100644 (file)
@@ -24,6 +24,7 @@
 #include "BaseTarget.xcconfig"
 
 PRODUCT_NAME = WebKit;
+PRODUCT_BUNDLE_IDENTIFIER = com.apple.$(PRODUCT_NAME:rfc1034identifier);
 INFOPLIST_FILE = Info.plist;
 
 DEFINES_MODULE=YES;
index c3e2213..c082592 100644 (file)
@@ -9,7 +9,7 @@
        <key>CFBundleExecutable</key>
        <string>${EXECUTABLE_NAME}</string>
        <key>CFBundleIdentifier</key>
-       <string>${PRODUCT_NAME}</string>
+       <string>${PRODUCT_BUNDLE_IDENTIFIER}</string>
        <key>CFBundleInfoDictionaryVersion</key>
        <string>6.0</string>
        <key>CFBundleName</key>
index a6df1e5..a042520 100644 (file)
@@ -9,7 +9,7 @@
        <key>CFBundleGetInfoString</key>
        <string>${BUNDLE_VERSION}, Copyright 2003-2016 Apple Inc.</string>
        <key>CFBundleIdentifier</key>
-       <string>com.apple.${PRODUCT_NAME}</string>
+       <string>${PRODUCT_BUNDLE_IDENTIFIER}</string>
        <key>CFBundleInfoDictionaryVersion</key>
        <string>6.0</string>
        <key>CFBundleName</key>
index 630f1b8..f163cfd 100644 (file)
@@ -9,7 +9,7 @@
        <key>CFBundleExecutable</key>
        <string>${EXECUTABLE_NAME}</string>
        <key>CFBundleIdentifier</key>
-       <string>${PRODUCT_NAME}</string>
+       <string>${PRODUCT_BUNDLE_IDENTIFIER}</string>
        <key>CFBundleInfoDictionaryVersion</key>
        <string>6.0</string>
        <key>CFBundleName</key>
index e96093d..7067a57 100644 (file)
@@ -9,7 +9,7 @@
        <key>CFBundleExecutable</key>
        <string>${EXECUTABLE_NAME}</string>
        <key>CFBundleIdentifier</key>
-       <string>${PRODUCT_NAME}</string>
+       <string>${PRODUCT_BUNDLE_IDENTIFIER}</string>
        <key>CFBundleInfoDictionaryVersion</key>
        <string>6.0</string>
        <key>CFBundleName</key>
index 3379392..7e93780 100644 (file)
@@ -9,7 +9,7 @@
        <key>CFBundleExecutable</key>
        <string>${EXECUTABLE_NAME}</string>
        <key>CFBundleIdentifier</key>
-       <string>${PRODUCT_NAME}</string>
+       <string>${PRODUCT_BUNDLE_IDENTIFIER}</string>
        <key>CFBundleInfoDictionaryVersion</key>
        <string>6.0</string>
        <key>CFBundleName</key>
index fcb1e41..22dfaf3 100644 (file)
@@ -9,7 +9,7 @@
        <key>CFBundleExecutable</key>
        <string>${EXECUTABLE_NAME}</string>
        <key>CFBundleIdentifier</key>
-       <string>${PRODUCT_NAME}</string>
+       <string>${PRODUCT_BUNDLE_IDENTIFIER}</string>
        <key>CFBundleInfoDictionaryVersion</key>
        <string>6.0</string>
        <key>CFBundleName</key>
index 16d1161..67cc203 100644 (file)
@@ -9,7 +9,7 @@
        <key>CFBundleExecutable</key>
        <string>${EXECUTABLE_NAME}</string>
        <key>CFBundleIdentifier</key>
-       <string>${PRODUCT_NAME}</string>
+       <string>${PRODUCT_BUNDLE_IDENTIFIER}</string>
        <key>CFBundleInfoDictionaryVersion</key>
        <string>6.0</string>
        <key>CFBundleName</key>
index d7d67e6..5999423 100644 (file)
@@ -11,7 +11,7 @@
        <key>CFBundleExecutable</key>
        <string>${EXECUTABLE_NAME}</string>
        <key>CFBundleIdentifier</key>
-       <string>${PRODUCT_NAME}</string>
+       <string>${PRODUCT_BUNDLE_IDENTIFIER}</string>
        <key>CFBundleInfoDictionaryVersion</key>
        <string>6.0</string>
        <key>CFBundleName</key>
index 75cc4cd..9fff1d4 100644 (file)
@@ -11,7 +11,7 @@
        <key>CFBundleExecutable</key>
        <string>${EXECUTABLE_NAME}</string>
        <key>CFBundleIdentifier</key>
-       <string>${PRODUCT_NAME}</string>
+       <string>${PRODUCT_BUNDLE_IDENTIFIER}</string>
        <key>CFBundleInfoDictionaryVersion</key>
        <string>6.0</string>
        <key>CFBundleName</key>
index eae4c89..b69d1d1 100644 (file)
@@ -11,7 +11,7 @@
        <key>CFBundleExecutable</key>
        <string>${EXECUTABLE_NAME}</string>
        <key>CFBundleIdentifier</key>
-       <string>${PRODUCT_NAME}</string>
+       <string>${PRODUCT_BUNDLE_IDENTIFIER}</string>
        <key>CFBundleInfoDictionaryVersion</key>
        <string>6.0</string>
        <key>CFBundleName</key>
index b74e563..afb2292 100644 (file)
@@ -1,3 +1,46 @@
+2016-12-02  Andy Estes  <aestes@apple.com>
+
+        [Cocoa] Adopt the PRODUCT_BUNDLE_IDENTIFIER build setting
+        https://bugs.webkit.org/show_bug.cgi?id=164492
+
+        Reviewed by Dan Bernstein.
+
+        * DumpRenderTree/TestNetscapePlugIn/mac/Info.plist: Changed CFBundleIdentifier's value from
+        com.apple.testnetscapeplugin to ${PRODUCT_BUNDLE_IDENTIFIER}.
+        * DumpRenderTree/ios/Info.plist: Changed CFBundleIdentifier's value from
+        org.webkit.DumpRenderTree to ${PRODUCT_BUNDLE_IDENTIFIER}.
+        * DumpRenderTree/mac/Configurations/DumpRenderTreeApp.xcconfig: Set
+        PRODUCT_BUNDLE_IDENTIFIER to org.webkit.DumpRenderTree.
+        * DumpRenderTree/mac/Configurations/TestNetscapePlugIn.xcconfig: Set
+        PRODUCT_BUNDLE_IDENTIFIER to com.apple.testnetscapeplugin.
+        * MiniBrowser/Configurations/MiniBrowser.xcconfig: Set PRODUCT_BUNDLE_IDENTIFIER to
+        org.webkit.$(PRODUCT_NAME:rfc1034identifier).
+        * MiniBrowser/Configurations/MiniBrowserBundle.xcconfig: Set PRODUCT_BUNDLE_IDENTIFIER to
+        com.apple.$(PRODUCT_NAME:rfc1034identifier).
+        * MiniBrowser/mac/Bundle/Info.plist: Changed CFBundleIdentifier's value from
+        com.apple.${PRODUCT_NAME:rfc1034identifier} to ${PRODUCT_BUNDLE_IDENTIFIER}.
+        * MiniBrowser/mac/Info.plist: Changed CFBundleIdentifier's value from
+        org.webkit.${PRODUCT_NAME} to ${PRODUCT_BUNDLE_IDENTIFIER}.
+        * TestWebKitAPI/Configurations/InjectedBundle.xcconfig: Set INFOPLIST_FILE to
+        InjectedBundle-Info.plist and set PRODUCT_BUNDLE_IDENTIFIER to
+        com.apple.$(PRODUCT_NAME:rfc1034identifier).
+        * TestWebKitAPI/Configurations/WebProcessPlugIn.xcconfig: Set PRODUCT_BUNDLE_IDENTIFIER to
+        com.apple.$(PRODUCT_NAME:rfc1034identifier).
+        * TestWebKitAPI/InjectedBundle-Info.plist: Changed CFBundleIdentifier's value from
+        com.yourcompany.${PRODUCT_NAME:rfc1034identifier} to ${PRODUCT_BUNDLE_IDENTIFIER}.
+        * TestWebKitAPI/cocoa/WebProcessPlugIn/Info.plist: Added a CFBundleIdentifier key with the
+        value ${PRODUCT_BUNDLE_IDENTIFIER}.
+        * WebKitTestRunner/Configurations/InjectedBundle.xcconfig: Set INFOPLIST_FILE to
+        InjectedBundle-Info.plist and set PRODUCT_BUNDLE_IDENTIFIER to
+        com.apple.WebKitTestRunner.InjectedBundle.
+        * WebKitTestRunner/Configurations/WebKitTestRunnerApp.xcconfig: Set
+        PRODUCT_BUNDLE_IDENTIFIER to org.webkit.$(PRODUCT_NAME:rfc1034identifier).
+        * WebKitTestRunner/InjectedBundle-Info.plist: Changed CFBundleIdentifier's value from
+        com.apple.WebKitTestRunner.InjectedBundle to ${PRODUCT_BUNDLE_IDENTIFIER}.
+        * WebKitTestRunner/WebKitTestRunnerApp/WebKitTestRunnerApp-Info.plist: Changed
+        CFBundleIdentifier's value from org.webkit.${PRODUCT_NAME:rfc1034identifier} to
+        ${PRODUCT_BUNDLE_IDENTIFIER}.
+
 2016-12-02  Brady Eidson  <beidson@apple.com>
 
         Make IndexedDB.WebProcessKillIDBCleanup even more reliable.
index ef45e66..172c229 100644 (file)
@@ -11,7 +11,7 @@
        <key>CFBundleIconFile</key>
        <string></string>
        <key>CFBundleIdentifier</key>
-       <string>com.apple.testnetscapeplugin</string>
+       <string>${PRODUCT_BUNDLE_IDENTIFIER}</string>
        <key>CFBundleInfoDictionaryVersion</key>
        <string>6.0</string>
        <key>CFBundlePackageType</key>
index e5059b0..a9f28fc 100644 (file)
@@ -9,7 +9,7 @@
        <key>CFBundleExecutable</key>
        <string>DumpRenderTree</string>
        <key>CFBundleIdentifier</key>
-       <string>org.webkit.DumpRenderTree</string>
+       <string>${PRODUCT_BUNDLE_IDENTIFIER}</string>
        <key>CFBundleInfoDictionaryVersion</key>
        <string>6.0</string>
        <key>CFBundleName</key>
index 9fe06d0..3dbe05c 100644 (file)
@@ -38,5 +38,6 @@ EXCLUDED_SOURCE_FILE_NAMES[sdk=appletv*] = ios/Launch.storyboard;
 EXCLUDED_SOURCE_FILE_NAMES[sdk=watch*] = ios/Launch.storyboard;
 
 PRODUCT_NAME = DumpRenderTree;
+PRODUCT_BUNDLE_IDENTIFIER = org.webkit.DumpRenderTree;
 
 TARGETED_DEVICE_FAMILY = 1,2;
index fa5637c..84a8364 100644 (file)
@@ -24,6 +24,7 @@
 #include "BaseTarget.xcconfig"
 
 PRODUCT_NAME = TestNetscapePlugIn
+PRODUCT_BUNDLE_IDENTIFIER = com.apple.testnetscapeplugin
 WRAPPER_EXTENSION = plugin
 INFOPLIST_FILE = TestNetscapePlugIn.subproj/Info.plist
 INSTALL_PATH = "$(USER_LIBRARY_DIR)/Plugins"
index f5c9e17..5dced87 100644 (file)
@@ -22,6 +22,7 @@
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
 
 PRODUCT_NAME = MiniBrowser
+PRODUCT_BUNDLE_IDENTIFIER = org.webkit.$(PRODUCT_NAME:rfc1034identifier)
 GCC_PREFIX_HEADER = mac/MiniBrowser_Prefix.pch
 INFOPLIST_FILE = mac/Info.plist
 EXCLUDED_SOURCE_FILE_NAMES[sdk=iphone*] = *
index 1ad40d4..3eb6d23 100644 (file)
@@ -22,6 +22,7 @@
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
 
 PRODUCT_NAME = MiniBrowser
+PRODUCT_BUNDLE_IDENTIFIER = com.apple.$(PRODUCT_NAME:rfc1034identifier)
 GCC_PREFIX_HEADER = mac/Bundle/MiniBrowserBundle_Prefix.pch
 INFOPLIST_FILE = mac/Bundle/Info.plist
 EXCLUDED_SOURCE_FILE_NAMES[sdk=iphone*] = *
index 0568bb2..f7dd83d 100644 (file)
@@ -9,7 +9,7 @@
        <key>CFBundleIconFile</key>
        <string></string>
        <key>CFBundleIdentifier</key>
-       <string>com.apple.${PRODUCT_NAME:rfc1034identifier}</string>
+       <string>${PRODUCT_BUNDLE_IDENTIFIER}</string>
        <key>CFBundleInfoDictionaryVersion</key>
        <string>6.0</string>
        <key>CFBundleName</key>
index 32216bb..dfc9a58 100644 (file)
@@ -9,7 +9,7 @@
        <key>CFBundleIconFile</key>
        <string>MiniBrowser</string>
        <key>CFBundleIdentifier</key>
-       <string>org.webkit.${PRODUCT_NAME}</string>
+       <string>${PRODUCT_BUNDLE_IDENTIFIER}</string>
        <key>CFBundleInfoDictionaryVersion</key>
        <string>6.0</string>
        <key>CFBundleName</key>
index 3772b79..4121fc3 100644 (file)
@@ -21,7 +21,9 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
 
+INFOPLIST_FILE = InjectedBundle-Info.plist;
 PRODUCT_NAME = InjectedBundleTestWebKitAPI;
+PRODUCT_BUNDLE_IDENTIFIER = com.apple.$(PRODUCT_NAME:rfc1034identifier);
 
 FRAMEWORK_AND_LIBRARY_LDFLAGS[sdk=iphone*] = -lobjc -framework UIKit;
 FRAMEWORK_AND_LIBRARY_LDFLAGS[sdk=macosx*] = -framework JavaScriptCore -framework WebKit -framework CoreGraphics -framework Cocoa;
index accda00..41fa170 100644 (file)
@@ -27,6 +27,7 @@
 
 INFOPLIST_FILE = cocoa/WebProcessPlugIn/Info.plist;
 PRODUCT_NAME = TestWebKitAPI;
+PRODUCT_BUNDLE_IDENTIFIER = com.apple.$(PRODUCT_NAME:rfc1034identifier);
 EXECUTABLE_SUFFIX = .bundle;
 WRAPPER_EXTENSION = wkbundle;
 OTHER_LDFLAGS = $(inherited) -framework JavaScriptCore -framework WebKit -lWebCoreTestSupport;
index c285a47..31ee759 100644 (file)
@@ -7,7 +7,7 @@
        <key>CFBundleExecutable</key>
        <string>${EXECUTABLE_NAME}</string>
        <key>CFBundleIdentifier</key>
-       <string>com.yourcompany.${PRODUCT_NAME:rfc1034identifier}</string>
+       <string>${PRODUCT_BUNDLE_IDENTIFIER}</string>
        <key>CFBundleInfoDictionaryVersion</key>
        <string>6.0</string>
        <key>CFBundlePackageType</key>
index d1f2a20..8c98e63 100644 (file)
@@ -2,6 +2,8 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+       <key>CFBundleIdentifier</key>
+       <string>${PRODUCT_BUNDLE_IDENTIFIER}</string>
        <key>CFBundleDevelopmentRegion</key>
        <string>en</string>
        <key>CFBundleExecutable</key>
index 9435e92..91cab59 100644 (file)
 
 #include "BaseTarget.xcconfig"
 
+INFOPLIST_FILE = InjectedBundle-Info.plist;
 LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../..";
 PRODUCT_NAME = WebKitTestRunnerInjectedBundle;
+PRODUCT_BUNDLE_IDENTIFIER = com.apple.WebKitTestRunner.InjectedBundle;
 
 SKIP_INSTALL = NO;
 
index 715f136..3abd74a 100644 (file)
@@ -26,6 +26,7 @@
 #include "BaseTarget.xcconfig"
 
 PRODUCT_NAME = WebKitTestRunner;
+PRODUCT_BUNDLE_IDENTIFIER = org.webkit.$(PRODUCT_NAME:rfc1034identifier);
 
 GCC_ENABLE_OBJC_EXCEPTIONS = YES;
 
index a21fbde..31ee759 100644 (file)
@@ -7,7 +7,7 @@
        <key>CFBundleExecutable</key>
        <string>${EXECUTABLE_NAME}</string>
        <key>CFBundleIdentifier</key>
-       <string>com.apple.WebKitTestRunner.InjectedBundle</string>
+       <string>${PRODUCT_BUNDLE_IDENTIFIER}</string>
        <key>CFBundleInfoDictionaryVersion</key>
        <string>6.0</string>
        <key>CFBundlePackageType</key>
index af222bf..c8b1bba 100644 (file)
@@ -9,7 +9,7 @@
        <key>CFBundleExecutable</key>
        <string>${EXECUTABLE_NAME}</string>
        <key>CFBundleIdentifier</key>
-       <string>org.webkit.${PRODUCT_NAME:rfc1034identifier}</string>
+       <string>${PRODUCT_BUNDLE_IDENTIFIER}</string>
        <key>CFBundleInfoDictionaryVersion</key>
        <string>6.0</string>
        <key>CFBundleName</key>