Changeset 143543 in webkit

Timestamp:

Feb 20, 2013 5:29:03 PM (11 years ago)

Author:

mrowe@apple.com

Message:

<​https://webkit.org/b/110409> Remove duplication between 32- and 64-bit PluginService plists.

Reviewed by Dan Bernstein.

The only difference between the plists was the CFBundleIdentifier. Since the values are the
same as the product name, we can just use the value of the PRODUCT_NAME configuration setting.

• Configurations/PluginService.32.xcconfig:
• Configurations/PluginService.64.xcconfig:
• PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64.Info.plist: Renamed from Source/WebKit2/PluginProcess/EntryPoint/mac/XPCService/PluginService.32/Info.plist.
• PluginProcess/EntryPoint/mac/XPCService/PluginService.64/Info.plist: Removed.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Configurations/PluginService.32.xcconfig (modified) (1 diff)
• Configurations/PluginService.64.xcconfig (modified) (1 diff)
• PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64.Info.plist (moved) (moved from trunk/Source/WebKit2/PluginProcess/EntryPoint/mac/XPCService/PluginService.64/Info.plist) (1 diff)
• PluginProcess/EntryPoint/mac/XPCService/PluginService.32/Info.plist (deleted)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-02-20  Mark Rowe  <mrowe@apple.com>
+
+        <https://webkit.org/b/110409> Remove duplication between 32- and 64-bit PluginService plists.
+
+        Reviewed by Dan Bernstein.
+
+        The only difference between the plists was the CFBundleIdentifier. Since the values are the
+        same as the product name, we can just use the value of the PRODUCT_NAME configuration setting.
+
+        * Configurations/PluginService.32.xcconfig:
+        * Configurations/PluginService.64.xcconfig:
+        * PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64.Info.plist: Renamed from Source/WebKit2/PluginProcess/EntryPoint/mac/XPCService/PluginService.32/Info.plist.
+        * PluginProcess/EntryPoint/mac/XPCService/PluginService.64/Info.plist: Removed.
+
 2013-02-20  Simon Fraser  <simon.fraser@apple.com>
 

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

@@ -26 +26 @@
 ARCHS = i386;
 PRODUCT_NAME = com.apple.WebKit.Plugin.32;
-INFOPLIST_FILE = PluginProcess/EntryPoint/mac/XPCService/PluginService.32/Info.plist;
+INFOPLIST_FILE = PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64.Info.plist;
 
 // Since this service is only used in production builds, in debug and release builds

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

@@ -26 +26 @@
 ARCHS = x86_64;
 PRODUCT_NAME = com.apple.WebKit.Plugin.64;
-INFOPLIST_FILE = PluginProcess/EntryPoint/mac/XPCService/PluginService.64/Info.plist;
+INFOPLIST_FILE = PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64.Info.plist;
 
 // Since this service is only used in production builds, in debug and release builds

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

@@ -10 +10 @@
         <string>${EXECUTABLE_NAME}</string>
         <key>CFBundleIdentifier</key>
-        <string>com.apple.WebKit.Plugin.64</string>
+        <string>${PRODUCT_NAME}</string>
         <key>CFBundleInfoDictionaryVersion</key>
         <string>6.0</string>