Title: [163063] trunk/Source/WebKit
- Revision
- 163063
- Author
- m...@apple.com
- Date
- 2014-01-29 18:50:28 -0800 (Wed, 29 Jan 2014)
Log Message
Moved linking against common frameworks and a library from the .xcconfig file into the target.
Reviewed by Tim Horton.
../WebKit:
* WebKit.xcodeproj/project.pbxproj:
../WebKit/mac:
* Configurations/WebKit.xcconfig:
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (163062 => 163063)
--- trunk/Source/WebKit/ChangeLog 2014-01-30 02:49:27 UTC (rev 163062)
+++ trunk/Source/WebKit/ChangeLog 2014-01-30 02:50:28 UTC (rev 163063)
@@ -1,3 +1,11 @@
+2014-01-29 Dan Bernstein <m...@apple.com>
+
+ Moved linking against common frameworks and a library from the .xcconfig file into the target.
+
+ Reviewed by Tim Horton.
+
+ * WebKit.xcodeproj/project.pbxproj:
+
2014-01-29 Sam Weinig <s...@webkit.org>
Fix windows.
Modified: trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj (163062 => 163063)
--- trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2014-01-30 02:49:27 UTC (rev 163062)
+++ trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2014-01-30 02:50:28 UTC (rev 163063)
@@ -83,6 +83,11 @@
312E2FE914E48215007CCA18 /* WebNotificationInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 312E2FE814E48215007CCA18 /* WebNotificationInternal.h */; };
31C11A6E1476552E0049A4CC /* WebNotificationClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 31C11A6C1476552E0049A4CC /* WebNotificationClient.h */; };
31C11A6F1476552E0049A4CC /* WebNotificationClient.mm in Sources */ = {isa = PBXBuildFile; fileRef = 31C11A6D1476552E0049A4CC /* WebNotificationClient.mm */; };
+ 37A453371899EC720034DC25 /* libicucore.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 93D623DD051E791F002F47DD /* libicucore.dylib */; };
+ 37A453381899EC760034DC25 /* _javascript_Core.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F738C9E903FAD3DF0321FBE0 /* _javascript_Core.framework */; };
+ 37A453391899EC790034DC25 /* WebCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F738C9EA03FAD3DF0321FBE0 /* WebCore.framework */; };
+ 37A4533B1899EC880034DC25 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 37A4533A1899EC880034DC25 /* QuartzCore.framework */; };
+ 37A4533D1899EE710034DC25 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 37A4533C1899EE710034DC25 /* Security.framework */; };
37B6FB4E1063530C000FDB3B /* WebPDFDocumentExtras.h in Headers */ = {isa = PBXBuildFile; fileRef = 37B6FB4C1063530C000FDB3B /* WebPDFDocumentExtras.h */; };
37B6FB4F1063530C000FDB3B /* WebPDFDocumentExtras.mm in Sources */ = {isa = PBXBuildFile; fileRef = 37B6FB4D1063530C000FDB3B /* WebPDFDocumentExtras.mm */; };
37D1DCA81065928C0068F7EF /* WebJSPDFDoc.h in Headers */ = {isa = PBXBuildFile; fileRef = 37D1DCA61065928C0068F7EF /* WebJSPDFDoc.h */; };
@@ -537,6 +542,8 @@
35081D9502B6D4D80ACA2ACA /* WebHTMLView.mm */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebHTMLView.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
35081D9602B6D4D80ACA2ACA /* WebHTMLViewPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebHTMLViewPrivate.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
35081DAE02B6D4F50ACA2ACA /* WebDocument.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebDocument.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
+ 37A4533A1899EC880034DC25 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
+ 37A4533C1899EE710034DC25 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; };
37B6FB4C1063530C000FDB3B /* WebPDFDocumentExtras.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebPDFDocumentExtras.h; sourceTree = "<group>"; };
37B6FB4D1063530C000FDB3B /* WebPDFDocumentExtras.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebPDFDocumentExtras.mm; sourceTree = "<group>"; };
37D1DCA61065928C0068F7EF /* WebJSPDFDoc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebJSPDFDoc.h; sourceTree = "<group>"; };
@@ -695,7 +702,7 @@
93AEB17E032C1735008635CE /* WebKitLogging.m */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.objc; path = WebKitLogging.m; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
93C6F14507920B93002449CD /* WebFrameViewPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebFrameViewPrivate.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
93D1FE13067EB10B009CE68A /* WebNSObjectExtras.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebNSObjectExtras.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
- 93D623DD051E791F002F47DD /* libicucore.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libicucore.dylib; path = /usr/lib/libicucore.dylib; sourceTree = "<absolute>"; };
+ 93D623DD051E791F002F47DD /* libicucore.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libicucore.dylib; path = usr/lib/libicucore.dylib; sourceTree = SDKROOT; };
93E2A1A2123B0B3C009FE12A /* WebDashboardRegion.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebDashboardRegion.h; sourceTree = "<group>"; };
93E2A1A3123B0B3C009FE12A /* WebDashboardRegion.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebDashboardRegion.mm; sourceTree = "<group>"; };
93EB178C09F88D460091F8FF /* WebSystemInterface.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebSystemInterface.mm; sourceTree = "<group>"; };
@@ -905,6 +912,11 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
+ 37A453381899EC760034DC25 /* _javascript_Core.framework in Frameworks */,
+ 37A453371899EC720034DC25 /* libicucore.dylib in Frameworks */,
+ 37A4533B1899EC880034DC25 /* QuartzCore.framework in Frameworks */,
+ 37A4533D1899EE710034DC25 /* Security.framework in Frameworks */,
+ 37A453391899EC790034DC25 /* WebCore.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -953,6 +965,8 @@
children = (
F738C9E903FAD3DF0321FBE0 /* _javascript_Core.framework */,
93D623DD051E791F002F47DD /* libicucore.dylib */,
+ 37A4533A1899EC880034DC25 /* QuartzCore.framework */,
+ 37A4533C1899EE710034DC25 /* Security.framework */,
F738C9EA03FAD3DF0321FBE0 /* WebCore.framework */,
);
name = "Frameworks and Libraries";
Modified: trunk/Source/WebKit/mac/ChangeLog (163062 => 163063)
--- trunk/Source/WebKit/mac/ChangeLog 2014-01-30 02:49:27 UTC (rev 163062)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-01-30 02:50:28 UTC (rev 163063)
@@ -1,3 +1,11 @@
+2014-01-29 Dan Bernstein <m...@apple.com>
+
+ Moved linking against common frameworks and a library from the .xcconfig file into the target.
+
+ Reviewed by Tim Horton.
+
+ * Configurations/WebKit.xcconfig:
+
2014-01-29 Ryosuke Niwa <rn...@webkit.org>
checkTextOfParagraph releases NSString twice
Modified: trunk/Source/WebKit/mac/Configurations/WebKit.xcconfig (163062 => 163063)
--- trunk/Source/WebKit/mac/Configurations/WebKit.xcconfig 2014-01-30 02:49:27 UTC (rev 163062)
+++ trunk/Source/WebKit/mac/Configurations/WebKit.xcconfig 2014-01-30 02:50:28 UTC (rev 163063)
@@ -76,11 +76,10 @@
PRODUCT_NAME = WebKit;
UMBRELLA_FRAMEWORKS_DIR = $(PRODUCTION_FRAMEWORKS_DIR)/WebKit.framework/Versions/A/Frameworks;
-OTHER_LDFLAGS_BASE = -licucore -framework _javascript_Core -framework QuartzCore -framework WebCore;
-OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_BASE) $(OTHER_LDFLAGS_$(PLATFORM_NAME));
-OTHER_LDFLAGS_iphoneos = -lobjc -framework CFNetwork -framework CoreFoundation -framework CoreGraphics -framework CoreText -framework Foundation -framework GraphicsServices -framework ImageIO -lMobileGestalt -framework Security;
+OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_$(PLATFORM_NAME));
+OTHER_LDFLAGS_iphoneos = -lobjc -framework CFNetwork -framework CoreFoundation -framework CoreGraphics -framework CoreText -framework Foundation -framework GraphicsServices -framework ImageIO -lMobileGestalt;
OTHER_LDFLAGS_iphonesimulator = $(OTHER_LDFLAGS_iphoneos);
-OTHER_LDFLAGS_macosx = -sub_umbrella WebCore -framework Carbon -framework Cocoa -framework DiskArbitration -framework IOKit -framework OpenGL -framework Security;
+OTHER_LDFLAGS_macosx = -sub_umbrella WebCore -framework Carbon -framework Cocoa -framework DiskArbitration -framework IOKit -framework OpenGL;
NORMAL_WEBKIT_FRAMEWORKS_DIR = $(NORMAL_WEBKIT_FRAMEWORKS_DIR_$(PLATFORM_NAME));
NORMAL_WEBKIT_FRAMEWORKS_DIR_iphoneos = $(PRODUCTION_FRAMEWORKS_DIR);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
