Skip to content

Commit 6b56a6d

Browse files
author
[email protected]
committed
[Cocoa] Adopt the PRODUCT_BUNDLE_IDENTIFIER build setting
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: http://svn.webkit.org/repository/webkit/trunk@209288 268f45cc-cd09-0410-ab3c-d52691b4dbfc
1 parent b25bc94 commit 6b56a6d

File tree

46 files changed

+163
-21
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+163
-21
lines changed

‎Source/JavaScriptCore/ChangeLog

+12
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1+
2016-12-02 Andy Estes <[email protected]>
2+
3+
[Cocoa] Adopt the PRODUCT_BUNDLE_IDENTIFIER build setting
4+
https://bugs.webkit.org/show_bug.cgi?id=164492
5+
6+
Reviewed by Dan Bernstein.
7+
8+
* Configurations/JavaScriptCore.xcconfig: Set PRODUCT_BUNDLE_IDENTIFIER to
9+
com.apple.$(PRODUCT_NAME:rfc1034identifier).
10+
* Info.plist: Changed CFBundleIdentifier's value from com.apple.${PRODUCT_NAME} to
11+
${PRODUCT_BUNDLE_IDENTIFIER}.
12+
113
2016-12-02 JF Bastien <[email protected]>
214

315
WebAssembly: mark WasmOps.h as private

‎Source/JavaScriptCore/Configurations/JavaScriptCore.xcconfig

+1
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ INFOPLIST_FILE = Info.plist;
5151
INSTALL_PATH = $(JAVASCRIPTCORE_FRAMEWORKS_DIR);
5252
DYLIB_INSTALL_NAME_BASE = $(NORMAL_JAVASCRIPTCORE_FRAMEWORKS_DIR);
5353
PRODUCT_NAME = JavaScriptCore;
54+
PRODUCT_BUNDLE_IDENTIFIER = com.apple.$(PRODUCT_NAME:rfc1034identifier);
5455

5556
INSTALLHDRS_SCRIPT_PHASE = YES;
5657

‎Source/JavaScriptCore/Info.plist

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<key>CFBundleGetInfoString</key>
1010
<string>${BUNDLE_VERSION}, Copyright 2003-2016 Apple Inc.; Copyright 1999-2001 Harri Porten &lt;[email protected]&gt;; Copyright 2001 Peter Kelly &lt;[email protected]&gt;; Copyright 1997-2005 University of Cambridge; Copyright 1991, 2000, 2001 by Lucent Technologies.</string>
1111
<key>CFBundleIdentifier</key>
12-
<string>com.apple.${PRODUCT_NAME}</string>
12+
<string>${PRODUCT_BUNDLE_IDENTIFIER}</string>
1313
<key>CFBundleInfoDictionaryVersion</key>
1414
<string>6.0</string>
1515
<key>CFBundleName</key>

‎Source/WebCore/ChangeLog

+12
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1+
2016-12-02 Andy Estes <[email protected]>
2+
3+
[Cocoa] Adopt the PRODUCT_BUNDLE_IDENTIFIER build setting
4+
https://bugs.webkit.org/show_bug.cgi?id=164492
5+
6+
Reviewed by Dan Bernstein.
7+
8+
* Configurations/WebCore.xcconfig: Set PRODUCT_BUNDLE_IDENTIFIER to
9+
com.apple.$(PRODUCT_NAME:rfc1034identifier).
10+
* Info.plist: Changed CFBundleIdentifier's value from com.apple.${PRODUCT_NAME} to
11+
${PRODUCT_BUNDLE_IDENTIFIER}.
12+
113
2016-12-02 Chris Dumez <[email protected]>
214

315
HTML Interactive Form Validation popovers do not show in iOS WKWebViews

‎Source/WebCore/Configurations/WebCore.xcconfig

+1
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ DYLIB_INSTALL_NAME_BASE_PLATFORM[sdk=macosx*] = $(NORMAL_WEBCORE_FRAMEWORKS_DIR)
5656
INSTALLHDRS_COPY_PHASE = YES;
5757
INSTALLHDRS_SCRIPT_PHASE = YES;
5858
PRODUCT_NAME = WebCore;
59+
PRODUCT_BUNDLE_IDENTIFIER = com.apple.$(PRODUCT_NAME:rfc1034identifier);
5960
UNEXPORTED_SYMBOLS_FILE = Configurations/WebCore.unexp;
6061

6162
WK_PREFIXED_IPHONEOS_DEPLOYMENT_TARGET = V$(IPHONEOS_DEPLOYMENT_TARGET);

‎Source/WebCore/Info.plist

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<key>CFBundleGetInfoString</key>
1010
<string>${BUNDLE_VERSION}, Copyright 2003-2016 Apple Inc.; Copyright 1997 Martin Jones &lt;[email protected]&gt;; Copyright 1998, 1999 Torben Weis &lt;[email protected]&gt;; Copyright 1998, 1999, 2002 Waldo Bastian &lt;[email protected]&gt;; Copyright 1998-2000 Lars Knoll &lt;[email protected]&gt;; Copyright 1999, 2001 Antti Koivisto &lt;[email protected]&gt;; Copyright 1999-2001 Harri Porten &lt;[email protected]&gt;; Copyright 2000 Simon Hausmann &lt;[email protected]&gt;; Copyright 2000, 2001 Dirk Mueller &lt;[email protected]&gt;; Copyright 2000, 2001 Peter Kelly &lt;[email protected]&gt;; Copyright 2000 Daniel Molkentin &lt;[email protected]&gt;; Copyright 2000 Stefan Schimanski &lt;[email protected]&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>
1111
<key>CFBundleIdentifier</key>
12-
<string>com.apple.${PRODUCT_NAME}</string>
12+
<string>${PRODUCT_BUNDLE_IDENTIFIER}</string>
1313
<key>CFBundleInfoDictionaryVersion</key>
1414
<string>6.0</string>
1515
<key>CFBundleName</key>

‎Source/WebInspectorUI/ChangeLog

+12
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1+
2016-12-02 Andy Estes <[email protected]>
2+
3+
[Cocoa] Adopt the PRODUCT_BUNDLE_IDENTIFIER build setting
4+
https://bugs.webkit.org/show_bug.cgi?id=164492
5+
6+
Reviewed by Dan Bernstein.
7+
8+
* Configurations/WebInspectorUIFramework.xcconfig: Set PRODUCT_BUNDLE_IDENTIFIER to
9+
com.apple.$(PRODUCT_NAME:rfc1034identifier).
10+
* Info.plist: Changed CFBundleIdentifier's value from
11+
com.apple.${PRODUCT_NAME:rfc1034identifier} to ${PRODUCT_BUNDLE_IDENTIFIER}.
12+
113
2016-12-02 Nikita Vasilyev <[email protected]>
214

315
REGRESSION (r192344): Web Inspector: Turning off Code Coverage or Type Profiler logs an error

‎Source/WebInspectorUI/Configurations/WebInspectorUIFramework.xcconfig

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ INSTALL_PATH_NO = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
1010
INSTALL_PATH_YES = $(WK_OVERRIDE_FRAMEWORKS_DIR);
1111
DYLIB_INSTALL_NAME_BASE = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
1212
PRODUCT_NAME = WebInspectorUI;
13+
PRODUCT_BUNDLE_IDENTIFIER = com.apple.$(PRODUCT_NAME:rfc1034identifier);
1314

1415
GCC_DYNAMIC_NO_PIC = NO;
1516
GCC_PRECOMPILE_PREFIX_HEADER = YES;

‎Source/WebInspectorUI/Info.plist

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<key>CFBundleExecutable</key>
88
<string>${EXECUTABLE_NAME}</string>
99
<key>CFBundleIdentifier</key>
10-
<string>com.apple.${PRODUCT_NAME:rfc1034identifier}</string>
10+
<string>${PRODUCT_BUNDLE_IDENTIFIER}</string>
1111
<key>CFBundleInfoDictionaryVersion</key>
1212
<string>6.0</string>
1313
<key>CFBundleName</key>

‎Source/WebKit/mac/ChangeLog

+12
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1+
2016-12-02 Andy Estes <[email protected]>
2+
3+
[Cocoa] Adopt the PRODUCT_BUNDLE_IDENTIFIER build setting
4+
https://bugs.webkit.org/show_bug.cgi?id=164492
5+
6+
Reviewed by Dan Bernstein.
7+
8+
* Configurations/WebKitLegacy.xcconfig: Set PRODUCT_BUNDLE_IDENTIFIER to
9+
com.apple.$(PRODUCT_NAME:rfc1034identifier).
10+
* Info.plist: Changed CFBundleIdentifier's value from com.apple.${PRODUCT_NAME} to
11+
${PRODUCT_BUNDLE_IDENTIFIER}.
12+
113
2016-12-02 Chris Dumez <[email protected]>
214

315
Regression(r209252): HTML interactive validation should not be enabled on iOS WK1 yet

‎Source/WebKit/mac/Configurations/WebKitLegacy.xcconfig

+1
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ DYLIB_INSTALL_NAME_BASE = $(NORMAL_WEBKIT_LEGACY_FRAMEWORKS_DIR);
7070
INSTALLHDRS_COPY_PHASE = YES;
7171
INSTALLHDRS_SCRIPT_PHASE = YES;
7272
PRODUCT_NAME = WebKitLegacy;
73+
PRODUCT_BUNDLE_IDENTIFIER = com.apple.$(PRODUCT_NAME:rfc1034identifier);
7374
UMBRELLA_FRAMEWORKS_DIR = $(PRODUCTION_FRAMEWORKS_DIR)/WebKit.framework/Versions/A/Frameworks;
7475

7576
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;

‎Source/WebKit/mac/Info.plist

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<key>CFBundleGetInfoString</key>
1010
<string>${BUNDLE_VERSION}, Copyright 2003-2016 Apple Inc.</string>
1111
<key>CFBundleIdentifier</key>
12-
<string>com.apple.${PRODUCT_NAME}</string>
12+
<string>${PRODUCT_BUNDLE_IDENTIFIER}</string>
1313
<key>CFBundleInfoDictionaryVersion</key>
1414
<string>6.0</string>
1515
<key>CFBundleName</key>

‎Source/WebKit2/ChangeLog

+29
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,32 @@
1+
2016-12-02 Andy Estes <[email protected]>
2+
3+
[Cocoa] Adopt the PRODUCT_BUNDLE_IDENTIFIER build setting
4+
https://bugs.webkit.org/show_bug.cgi?id=164492
5+
6+
Reviewed by Dan Bernstein.
7+
8+
* Configurations/DatabaseService.xcconfig: Set PRODUCT_BUNDLE_IDENTIFIER to
9+
$(PRODUCT_NAME).
10+
* Configurations/NetworkService.xcconfig: Ditto.
11+
* Configurations/PluginService.32.xcconfig: Ditto.
12+
* Configurations/PluginService.64.xcconfig: Ditto.
13+
* Configurations/WebContentService.xcconfig: Ditto.
14+
* Configurations/WebKit.xcconfig: Set PRODUCT_BUNDLE_IDENTIFIER to
15+
com.apple.$(PRODUCT_NAME:rfc1034identifier).
16+
* DatabaseProcess/EntryPoint/mac/XPCService/DatabaseService/Info.plist: Changed
17+
CFBundleIdentifier's value from ${PRODUCT_NAME} to ${PRODUCT_BUNDLE_IDENTIFIER}.
18+
* Info.plist: Changed CFBundleIdentifier's value from com.apple.${PRODUCT_NAME} to
19+
${PRODUCT_BUNDLE_IDENTIFIER}.
20+
* NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-OSX-10.9-10.10.plist: Changed
21+
CFBundleIdentifier's value from ${PRODUCT_NAME} to ${PRODUCT_BUNDLE_IDENTIFIER}.
22+
* NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-OSX.plist: Ditto.
23+
* NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-iOS.plist: Ditto.
24+
* PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64-10.9-10.10.Info.plist: Ditto.
25+
* PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64.Info.plist: Ditto.
26+
* WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-OSX-10.9-10.10.plist: Ditto.
27+
* WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-OSX.plist: Ditto.
28+
* WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-iOS.plist: Ditto.
29+
130
2016-12-02 Brent Fulgham <[email protected]>
231

332
[Mac] Update sandbox profiles to use modern syntax and avoid duplication

‎Source/WebKit2/Configurations/DatabaseService.xcconfig

+1
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,5 @@
2626
WK_XPC_SERVICE_IOS_ENTITLEMENTS_BASE = Databases-iOS;
2727

2828
PRODUCT_NAME = com.apple.WebKit.Databases;
29+
PRODUCT_BUNDLE_IDENTIFIER = $(PRODUCT_NAME);
2930
INFOPLIST_FILE = DatabaseProcess/EntryPoint/mac/XPCService/DatabaseService/Info.plist;

‎Source/WebKit2/Configurations/NetworkService.xcconfig

+1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
WK_XPC_SERVICE_IOS_ENTITLEMENTS_BASE = Network-iOS;
2727

2828
PRODUCT_NAME = com.apple.WebKit.Networking;
29+
PRODUCT_BUNDLE_IDENTIFIER = $(PRODUCT_NAME);
2930
INFOPLIST_FILE[sdk=iphone*] = NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-iOS.plist;
3031
INFOPLIST_FILE[sdk=macosx*] = NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-OSX$(WK_XPC_SERVICE_INFOPLIST_SUFFIX).plist;
3132

‎Source/WebKit2/Configurations/PluginService.32.xcconfig

+1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
VALID_ARCHS_macosx_NO = i386;
2727

2828
PRODUCT_NAME = com.apple.WebKit.Plugin.32;
29+
PRODUCT_BUNDLE_IDENTIFIER = $(PRODUCT_NAME);
2930
INFOPLIST_FILE = PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64$(WK_XPC_SERVICE_INFOPLIST_SUFFIX).Info.plist;
3031

3132
OTHER_LDFLAGS = $(OTHER_LDFLAGS) $(OTHER_LDFLAGS_PLATFORM) $(OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH) $(WK_RELOCATABLE_FRAMEWORKS_LDFLAGS);

‎Source/WebKit2/Configurations/PluginService.64.xcconfig

+1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
VALID_ARCHS_macosx_NO = x86_64;
2727

2828
PRODUCT_NAME = com.apple.WebKit.Plugin.64;
29+
PRODUCT_BUNDLE_IDENTIFIER = $(PRODUCT_NAME);
2930
INFOPLIST_FILE = PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64$(WK_XPC_SERVICE_INFOPLIST_SUFFIX).Info.plist;
3031

3132
OTHER_LDFLAGS = $(OTHER_LDFLAGS) $(OTHER_LDFLAGS_PLATFORM) $(OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH) $(WK_RELOCATABLE_FRAMEWORKS_LDFLAGS);

‎Source/WebKit2/Configurations/WebContentService.xcconfig

+1
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ CODE_SIGN_ENTITLEMENTS_OSX_WITH_XPC_DOMAIN_EXTENSION_YES = Configurations/WebCon
3030
OTHER_CODE_SIGN_FLAGS[sdk=macosx*] = $(WK_XPC_DOMAIN_EXTENSION_CODE_SIGN_FLAGS);
3131

3232
PRODUCT_NAME = com.apple.WebKit.WebContent;
33+
PRODUCT_BUNDLE_IDENTIFIER = $(PRODUCT_NAME);
3334
INFOPLIST_FILE[sdk=iphone*] = WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-iOS.plist;
3435
INFOPLIST_FILE[sdk=macosx*] = WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-OSX$(WK_XPC_SERVICE_INFOPLIST_SUFFIX).plist;
3536

‎Source/WebKit2/Configurations/WebKit.xcconfig

+1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
#include "BaseTarget.xcconfig"
2525

2626
PRODUCT_NAME = WebKit;
27+
PRODUCT_BUNDLE_IDENTIFIER = com.apple.$(PRODUCT_NAME:rfc1034identifier);
2728
INFOPLIST_FILE = Info.plist;
2829

2930
DEFINES_MODULE=YES;

‎Source/WebKit2/DatabaseProcess/EntryPoint/mac/XPCService/DatabaseService/Info.plist

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<key>CFBundleExecutable</key>
1010
<string>${EXECUTABLE_NAME}</string>
1111
<key>CFBundleIdentifier</key>
12-
<string>${PRODUCT_NAME}</string>
12+
<string>${PRODUCT_BUNDLE_IDENTIFIER}</string>
1313
<key>CFBundleInfoDictionaryVersion</key>
1414
<string>6.0</string>
1515
<key>CFBundleName</key>

‎Source/WebKit2/Info.plist

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<key>CFBundleGetInfoString</key>
1010
<string>${BUNDLE_VERSION}, Copyright 2003-2016 Apple Inc.</string>
1111
<key>CFBundleIdentifier</key>
12-
<string>com.apple.${PRODUCT_NAME}</string>
12+
<string>${PRODUCT_BUNDLE_IDENTIFIER}</string>
1313
<key>CFBundleInfoDictionaryVersion</key>
1414
<string>6.0</string>
1515
<key>CFBundleName</key>

‎Source/WebKit2/NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-OSX-10.9-10.10.plist

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<key>CFBundleExecutable</key>
1010
<string>${EXECUTABLE_NAME}</string>
1111
<key>CFBundleIdentifier</key>
12-
<string>${PRODUCT_NAME}</string>
12+
<string>${PRODUCT_BUNDLE_IDENTIFIER}</string>
1313
<key>CFBundleInfoDictionaryVersion</key>
1414
<string>6.0</string>
1515
<key>CFBundleName</key>

‎Source/WebKit2/NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-OSX.plist

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<key>CFBundleExecutable</key>
1010
<string>${EXECUTABLE_NAME}</string>
1111
<key>CFBundleIdentifier</key>
12-
<string>${PRODUCT_NAME}</string>
12+
<string>${PRODUCT_BUNDLE_IDENTIFIER}</string>
1313
<key>CFBundleInfoDictionaryVersion</key>
1414
<string>6.0</string>
1515
<key>CFBundleName</key>

‎Source/WebKit2/NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-iOS.plist

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<key>CFBundleExecutable</key>
1010
<string>${EXECUTABLE_NAME}</string>
1111
<key>CFBundleIdentifier</key>
12-
<string>${PRODUCT_NAME}</string>
12+
<string>${PRODUCT_BUNDLE_IDENTIFIER}</string>
1313
<key>CFBundleInfoDictionaryVersion</key>
1414
<string>6.0</string>
1515
<key>CFBundleName</key>

‎Source/WebKit2/PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64-10.9-10.10.Info.plist

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<key>CFBundleExecutable</key>
1010
<string>${EXECUTABLE_NAME}</string>
1111
<key>CFBundleIdentifier</key>
12-
<string>${PRODUCT_NAME}</string>
12+
<string>${PRODUCT_BUNDLE_IDENTIFIER}</string>
1313
<key>CFBundleInfoDictionaryVersion</key>
1414
<string>6.0</string>
1515
<key>CFBundleName</key>

‎Source/WebKit2/PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64.Info.plist

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<key>CFBundleExecutable</key>
1010
<string>${EXECUTABLE_NAME}</string>
1111
<key>CFBundleIdentifier</key>
12-
<string>${PRODUCT_NAME}</string>
12+
<string>${PRODUCT_BUNDLE_IDENTIFIER}</string>
1313
<key>CFBundleInfoDictionaryVersion</key>
1414
<string>6.0</string>
1515
<key>CFBundleName</key>

‎Source/WebKit2/WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-OSX-10.9-10.10.plist

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<key>CFBundleExecutable</key>
1212
<string>${EXECUTABLE_NAME}</string>
1313
<key>CFBundleIdentifier</key>
14-
<string>${PRODUCT_NAME}</string>
14+
<string>${PRODUCT_BUNDLE_IDENTIFIER}</string>
1515
<key>CFBundleInfoDictionaryVersion</key>
1616
<string>6.0</string>
1717
<key>CFBundleName</key>

‎Source/WebKit2/WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-OSX.plist

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<key>CFBundleExecutable</key>
1212
<string>${EXECUTABLE_NAME}</string>
1313
<key>CFBundleIdentifier</key>
14-
<string>${PRODUCT_NAME}</string>
14+
<string>${PRODUCT_BUNDLE_IDENTIFIER}</string>
1515
<key>CFBundleInfoDictionaryVersion</key>
1616
<string>6.0</string>
1717
<key>CFBundleName</key>

‎Source/WebKit2/WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-iOS.plist

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<key>CFBundleExecutable</key>
1212
<string>${EXECUTABLE_NAME}</string>
1313
<key>CFBundleIdentifier</key>
14-
<string>${PRODUCT_NAME}</string>
14+
<string>${PRODUCT_BUNDLE_IDENTIFIER}</string>
1515
<key>CFBundleInfoDictionaryVersion</key>
1616
<string>6.0</string>
1717
<key>CFBundleName</key>

‎Tools/ChangeLog

+43
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,46 @@
1+
2016-12-02 Andy Estes <[email protected]>
2+
3+
[Cocoa] Adopt the PRODUCT_BUNDLE_IDENTIFIER build setting
4+
https://bugs.webkit.org/show_bug.cgi?id=164492
5+
6+
Reviewed by Dan Bernstein.
7+
8+
* DumpRenderTree/TestNetscapePlugIn/mac/Info.plist: Changed CFBundleIdentifier's value from
9+
com.apple.testnetscapeplugin to ${PRODUCT_BUNDLE_IDENTIFIER}.
10+
* DumpRenderTree/ios/Info.plist: Changed CFBundleIdentifier's value from
11+
org.webkit.DumpRenderTree to ${PRODUCT_BUNDLE_IDENTIFIER}.
12+
* DumpRenderTree/mac/Configurations/DumpRenderTreeApp.xcconfig: Set
13+
PRODUCT_BUNDLE_IDENTIFIER to org.webkit.DumpRenderTree.
14+
* DumpRenderTree/mac/Configurations/TestNetscapePlugIn.xcconfig: Set
15+
PRODUCT_BUNDLE_IDENTIFIER to com.apple.testnetscapeplugin.
16+
* MiniBrowser/Configurations/MiniBrowser.xcconfig: Set PRODUCT_BUNDLE_IDENTIFIER to
17+
org.webkit.$(PRODUCT_NAME:rfc1034identifier).
18+
* MiniBrowser/Configurations/MiniBrowserBundle.xcconfig: Set PRODUCT_BUNDLE_IDENTIFIER to
19+
com.apple.$(PRODUCT_NAME:rfc1034identifier).
20+
* MiniBrowser/mac/Bundle/Info.plist: Changed CFBundleIdentifier's value from
21+
com.apple.${PRODUCT_NAME:rfc1034identifier} to ${PRODUCT_BUNDLE_IDENTIFIER}.
22+
* MiniBrowser/mac/Info.plist: Changed CFBundleIdentifier's value from
23+
org.webkit.${PRODUCT_NAME} to ${PRODUCT_BUNDLE_IDENTIFIER}.
24+
* TestWebKitAPI/Configurations/InjectedBundle.xcconfig: Set INFOPLIST_FILE to
25+
InjectedBundle-Info.plist and set PRODUCT_BUNDLE_IDENTIFIER to
26+
com.apple.$(PRODUCT_NAME:rfc1034identifier).
27+
* TestWebKitAPI/Configurations/WebProcessPlugIn.xcconfig: Set PRODUCT_BUNDLE_IDENTIFIER to
28+
com.apple.$(PRODUCT_NAME:rfc1034identifier).
29+
* TestWebKitAPI/InjectedBundle-Info.plist: Changed CFBundleIdentifier's value from
30+
com.yourcompany.${PRODUCT_NAME:rfc1034identifier} to ${PRODUCT_BUNDLE_IDENTIFIER}.
31+
* TestWebKitAPI/cocoa/WebProcessPlugIn/Info.plist: Added a CFBundleIdentifier key with the
32+
value ${PRODUCT_BUNDLE_IDENTIFIER}.
33+
* WebKitTestRunner/Configurations/InjectedBundle.xcconfig: Set INFOPLIST_FILE to
34+
InjectedBundle-Info.plist and set PRODUCT_BUNDLE_IDENTIFIER to
35+
com.apple.WebKitTestRunner.InjectedBundle.
36+
* WebKitTestRunner/Configurations/WebKitTestRunnerApp.xcconfig: Set
37+
PRODUCT_BUNDLE_IDENTIFIER to org.webkit.$(PRODUCT_NAME:rfc1034identifier).
38+
* WebKitTestRunner/InjectedBundle-Info.plist: Changed CFBundleIdentifier's value from
39+
com.apple.WebKitTestRunner.InjectedBundle to ${PRODUCT_BUNDLE_IDENTIFIER}.
40+
* WebKitTestRunner/WebKitTestRunnerApp/WebKitTestRunnerApp-Info.plist: Changed
41+
CFBundleIdentifier's value from org.webkit.${PRODUCT_NAME:rfc1034identifier} to
42+
${PRODUCT_BUNDLE_IDENTIFIER}.
43+
144
2016-12-02 Brady Eidson <[email protected]>
245

346
Make IndexedDB.WebProcessKillIDBCleanup even more reliable.

‎Tools/DumpRenderTree/TestNetscapePlugIn/mac/Info.plist

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<key>CFBundleIconFile</key>
1212
<string></string>
1313
<key>CFBundleIdentifier</key>
14-
<string>com.apple.testnetscapeplugin</string>
14+
<string>${PRODUCT_BUNDLE_IDENTIFIER}</string>
1515
<key>CFBundleInfoDictionaryVersion</key>
1616
<string>6.0</string>
1717
<key>CFBundlePackageType</key>

‎Tools/DumpRenderTree/ios/Info.plist

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<key>CFBundleExecutable</key>
1010
<string>DumpRenderTree</string>
1111
<key>CFBundleIdentifier</key>
12-
<string>org.webkit.DumpRenderTree</string>
12+
<string>${PRODUCT_BUNDLE_IDENTIFIER}</string>
1313
<key>CFBundleInfoDictionaryVersion</key>
1414
<string>6.0</string>
1515
<key>CFBundleName</key>

‎Tools/DumpRenderTree/mac/Configurations/DumpRenderTreeApp.xcconfig

+1
Original file line numberDiff line numberDiff line change
@@ -38,5 +38,6 @@ EXCLUDED_SOURCE_FILE_NAMES[sdk=appletv*] = ios/Launch.storyboard;
3838
EXCLUDED_SOURCE_FILE_NAMES[sdk=watch*] = ios/Launch.storyboard;
3939

4040
PRODUCT_NAME = DumpRenderTree;
41+
PRODUCT_BUNDLE_IDENTIFIER = org.webkit.DumpRenderTree;
4142

4243
TARGETED_DEVICE_FAMILY = 1,2;

‎Tools/DumpRenderTree/mac/Configurations/TestNetscapePlugIn.xcconfig

+1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
#include "BaseTarget.xcconfig"
2525

2626
PRODUCT_NAME = TestNetscapePlugIn
27+
PRODUCT_BUNDLE_IDENTIFIER = com.apple.testnetscapeplugin
2728
WRAPPER_EXTENSION = plugin
2829
INFOPLIST_FILE = TestNetscapePlugIn.subproj/Info.plist
2930
INSTALL_PATH = "$(USER_LIBRARY_DIR)/Plugins"

‎Tools/MiniBrowser/Configurations/MiniBrowser.xcconfig

+1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2323

2424
PRODUCT_NAME = MiniBrowser
25+
PRODUCT_BUNDLE_IDENTIFIER = org.webkit.$(PRODUCT_NAME:rfc1034identifier)
2526
GCC_PREFIX_HEADER = mac/MiniBrowser_Prefix.pch
2627
INFOPLIST_FILE = mac/Info.plist
2728
EXCLUDED_SOURCE_FILE_NAMES[sdk=iphone*] = *

‎Tools/MiniBrowser/Configurations/MiniBrowserBundle.xcconfig

+1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2323

2424
PRODUCT_NAME = MiniBrowser
25+
PRODUCT_BUNDLE_IDENTIFIER = com.apple.$(PRODUCT_NAME:rfc1034identifier)
2526
GCC_PREFIX_HEADER = mac/Bundle/MiniBrowserBundle_Prefix.pch
2627
INFOPLIST_FILE = mac/Bundle/Info.plist
2728
EXCLUDED_SOURCE_FILE_NAMES[sdk=iphone*] = *

0 commit comments

Comments
 (0)