Title: [161834] trunk/Source/WebKit2
- Revision
- 161834
- Author
- m...@apple.com
- Date
- 2014-01-12 13:23:45 -0800 (Sun, 12 Jan 2014)
Log Message
OS X build fix.
* WebKit2.xcodeproj/project.pbxproj:
* WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-OSX.plist: Copied from WebProcess/EntryPoint/mac/XPCService/WebContentService/Info.plist.
* WebProcess/EntryPoint/mac/XPCService/WebContentService/Info.plist: Removed.
Modified Paths
Added Paths
Removed Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (161833 => 161834)
--- trunk/Source/WebKit2/ChangeLog 2014-01-12 21:14:37 UTC (rev 161833)
+++ trunk/Source/WebKit2/ChangeLog 2014-01-12 21:23:45 UTC (rev 161834)
@@ -1,3 +1,11 @@
+2014-01-12 Dan Bernstein <m...@apple.com>
+
+ OS X build fix.
+
+ * WebKit2.xcodeproj/project.pbxproj:
+ * WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-OSX.plist: Copied from WebProcess/EntryPoint/mac/XPCService/WebContentService/Info.plist.
+ * WebProcess/EntryPoint/mac/XPCService/WebContentService/Info.plist: Removed.
+
2014-01-12 Andy Estes <aes...@apple.com>
Build Fix: Objective-C GC should be unsupported in iOS WebKit2
Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (161833 => 161834)
--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2014-01-12 21:14:37 UTC (rev 161833)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2014-01-12 21:23:45 UTC (rev 161834)
@@ -2791,7 +2791,7 @@
BCACC40D16B0B7BE00B6E092 /* BaseXPCService.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = BaseXPCService.xcconfig; sourceTree = "<group>"; };
BCACC40E16B0B8A800B6E092 /* WebContentService.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = WebContentService.xcconfig; sourceTree = "<group>"; };
BCACC40F16B0B8A800B6E092 /* WebContentService.Development.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = WebContentService.Development.xcconfig; sourceTree = "<group>"; };
- BCACC44016B24CAA00B6E092 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+ BCACC44016B24CAA00B6E092 /* Info-OSX.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "Info-OSX.plist"; sourceTree = "<group>"; };
BCACC44316B24CAA00B6E092 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
BCAE9DE9160C097400A33217 /* com.apple.WebKit.WebContent.Development.xpc */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = com.apple.WebKit.WebContent.Development.xpc; sourceTree = BUILT_PRODUCTS_DIR; };
BCB0AEE7122F53E300B1341E /* MutableDictionary.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MutableDictionary.h; sourceTree = "<group>"; };
@@ -5387,7 +5387,7 @@
BCACC43F16B24CAA00B6E092 /* WebContentService */ = {
isa = PBXGroup;
children = (
- BCACC44016B24CAA00B6E092 /* Info.plist */,
+ BCACC44016B24CAA00B6E092 /* Info-OSX.plist */,
);
path = WebContentService;
sourceTree = "<group>";
Copied: trunk/Source/WebKit2/WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-OSX.plist (from rev 161832, trunk/Source/WebKit2/WebProcess/EntryPoint/mac/XPCService/WebContentService/Info.plist) (0 => 161834)
--- trunk/Source/WebKit2/WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-OSX.plist (rev 0)
+++ trunk/Source/WebKit2/WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-OSX.plist 2014-01-12 21:23:45 UTC (rev 161834)
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-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>CFBundleGetInfoString</key>
+ <string>${BUNDLE_VERSION}, Copyright 2003-2014 Apple Inc.</string>
+ <key>CFBundleDevelopmentRegion</key>
+ <string>English</string>
+ <key>CFBundleExecutable</key>
+ <string>${EXECUTABLE_NAME}</string>
+ <key>CFBundleIdentifier</key>
+ <string>com.apple.WebKit.WebContent</string>
+ <key>CFBundleInfoDictionaryVersion</key>
+ <string>6.0</string>
+ <key>CFBundleName</key>
+ <string>${PRODUCT_NAME}</string>
+ <key>CFBundlePackageType</key>
+ <string>XPC!</string>
+ <key>CFBundleShortVersionString</key>
+ <string>${SHORT_VERSION_STRING}</string>
+ <key>CFBundleSignature</key>
+ <string>????</string>
+ <key>CFBundleVersion</key>
+ <string>${BUNDLE_VERSION}</string>
+ <key>LSFileQuarantineEnabled</key>
+ <true/>
+ <key>NSPrincipalClass</key>
+ <string>NSApplication</string>
+ <key>WebKitEntryPoint</key>
+ <string>WebContentServiceInitializer</string>
+ <key>CFBundleAllowMixedLocalizations</key>
+ <true/>
+ <key>LSUIElement</key>
+ <true/>
+ <key>NSSupportsAutomaticGraphicsSwitching</key>
+ <true/>
+ <key>NSSupportsAppNap</key>
+ <true/>
+ <key>NSMainNibFile</key>
+ <string>WebContentProcess</string>
+ <key>XPCService</key>
+ <dict>
+ <key>JoinExistingSession</key>
+ <true/>
+ <key>ServiceType</key>
+ <string>Application</string>
+ <key>RunLoopType</key>
+ <string>_NSApplicationMain</string>
+ <key>_MultipleInstances</key>
+ <true/>
+ <key>EnvironmentVariables</key>
+ <dict>
+ <key>DYLD_INSERT_LIBRARIES</key>
+ <string>$(WEBKIT2_FRAMEWORKS_DIR)/WebKit2.framework/WebProcess.app/Contents/MacOS/WebProcessShim.dylib</string>
+ </dict>
+ </dict>
+</dict>
+</plist>
Deleted: trunk/Source/WebKit2/WebProcess/EntryPoint/mac/XPCService/WebContentService/Info.plist (161833 => 161834)
--- trunk/Source/WebKit2/WebProcess/EntryPoint/mac/XPCService/WebContentService/Info.plist 2014-01-12 21:14:37 UTC (rev 161833)
+++ trunk/Source/WebKit2/WebProcess/EntryPoint/mac/XPCService/WebContentService/Info.plist 2014-01-12 21:23:45 UTC (rev 161834)
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-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>CFBundleGetInfoString</key>
- <string>${BUNDLE_VERSION}, Copyright 2003-2014 Apple Inc.</string>
- <key>CFBundleDevelopmentRegion</key>
- <string>English</string>
- <key>CFBundleExecutable</key>
- <string>${EXECUTABLE_NAME}</string>
- <key>CFBundleIdentifier</key>
- <string>com.apple.WebKit.WebContent</string>
- <key>CFBundleInfoDictionaryVersion</key>
- <string>6.0</string>
- <key>CFBundleName</key>
- <string>${PRODUCT_NAME}</string>
- <key>CFBundlePackageType</key>
- <string>XPC!</string>
- <key>CFBundleShortVersionString</key>
- <string>${SHORT_VERSION_STRING}</string>
- <key>CFBundleSignature</key>
- <string>????</string>
- <key>CFBundleVersion</key>
- <string>${BUNDLE_VERSION}</string>
- <key>LSFileQuarantineEnabled</key>
- <true/>
- <key>NSPrincipalClass</key>
- <string>NSApplication</string>
- <key>WebKitEntryPoint</key>
- <string>WebContentServiceInitializer</string>
- <key>CFBundleAllowMixedLocalizations</key>
- <true/>
- <key>LSUIElement</key>
- <true/>
- <key>NSSupportsAutomaticGraphicsSwitching</key>
- <true/>
- <key>NSSupportsAppNap</key>
- <true/>
- <key>NSMainNibFile</key>
- <string>WebContentProcess</string>
- <key>XPCService</key>
- <dict>
- <key>JoinExistingSession</key>
- <true/>
- <key>ServiceType</key>
- <string>Application</string>
- <key>RunLoopType</key>
- <string>_NSApplicationMain</string>
- <key>_MultipleInstances</key>
- <true/>
- <key>EnvironmentVariables</key>
- <dict>
- <key>DYLD_INSERT_LIBRARIES</key>
- <string>$(WEBKIT2_FRAMEWORKS_DIR)/WebKit2.framework/WebProcess.app/Contents/MacOS/WebProcessShim.dylib</string>
- </dict>
- </dict>
-</dict>
-</plist>
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
