Title: [102542] trunk/Source/WebCore
- Revision
- 102542
- Author
- benja...@webkit.org
- Date
- 2011-12-11 14:20:48 -0800 (Sun, 11 Dec 2011)
Log Message
Add KillRingNone.cpp to Mac build system
https://bugs.webkit.org/show_bug.cgi?id=74168
Patch by Benjamin Poulain <bpoul...@apple.com> on 2011-12-11
Reviewed by David Kilzer.
Add KillRingNone.cpp so it can be used on iOS, but
blacklist the file from the build in order to avoid
conflicts with KillRingMac.
* Configurations/WebCore.xcconfig:
* WebCore.xcodeproj/project.pbxproj:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (102541 => 102542)
--- trunk/Source/WebCore/ChangeLog 2011-12-11 20:44:19 UTC (rev 102541)
+++ trunk/Source/WebCore/ChangeLog 2011-12-11 22:20:48 UTC (rev 102542)
@@ -1,3 +1,17 @@
+2011-12-11 Benjamin Poulain <bpoul...@apple.com>
+
+ Add KillRingNone.cpp to Mac build system
+ https://bugs.webkit.org/show_bug.cgi?id=74168
+
+ Reviewed by David Kilzer.
+
+ Add KillRingNone.cpp so it can be used on iOS, but
+ blacklist the file from the build in order to avoid
+ conflicts with KillRingMac.
+
+ * Configurations/WebCore.xcconfig:
+ * WebCore.xcodeproj/project.pbxproj:
+
2011-12-11 Peter Rybin <peter.ry...@gmail.com>
Web Inspector: [protocol] alter some type names generated from Inspector.json
Modified: trunk/Source/WebCore/Configurations/WebCore.xcconfig (102541 => 102542)
--- trunk/Source/WebCore/Configurations/WebCore.xcconfig 2011-12-11 20:44:19 UTC (rev 102541)
+++ trunk/Source/WebCore/Configurations/WebCore.xcconfig 2011-12-11 22:20:48 UTC (rev 102542)
@@ -81,9 +81,9 @@
EXCLUDED_SOURCE_FILE_NAMES_SVG_DOM_OBJC_BINDINGS_ENABLE_SVG_DOM_OBJC_BINDINGS = ;
EXCLUDED_SOURCE_FILE_NAMES = $(EXCLUDED_SOURCE_FILE_NAMES_$(REAL_PLATFORM_NAME)) $(EXCLUDED_SOURCE_FILE_NAMES_SVG_DOM_OBJC_BINDINGS);
-EXCLUDED_SOURCE_FILE_NAMES_iphoneos = *.tiff *Cursor.png Cursor.cpp CursorMac.mm HTMLConverter.mm MemoryPressureHandlerMac.mm SSLKeyGeneratorMac.cpp SearchPopupMenuMac.mm WebVideoFullscreenController.mm WebVideoFullscreenHUDWindowController.mm WebWindowAnimation.mm localizedStrings.js;
+EXCLUDED_SOURCE_FILE_NAMES_iphoneos = *.tiff *Cursor.png Cursor.cpp CursorMac.mm HTMLConverter.mm KillRingMac.mm MemoryPressureHandlerMac.mm SSLKeyGeneratorMac.cpp SearchPopupMenuMac.mm WebVideoFullscreenController.mm WebVideoFullscreenHUDWindowController.mm WebWindowAnimation.mm localizedStrings.js;
EXCLUDED_SOURCE_FILE_NAMES_iphonesimulator = $(EXCLUDED_SOURCE_FILE_NAMES_iphoneos);
-EXCLUDED_SOURCE_FILE_NAMES_macosx = *IOS.h *IOS.cpp *IOS.mm
+EXCLUDED_SOURCE_FILE_NAMES_macosx = *IOS.h *IOS.cpp *IOS.mm KillRingNone.cpp
SQLITE3_LIBRARY = $(SQLITE3_LIBRARY_$(REAL_PLATFORM_NAME));
SQLITE3_LIBRARY_iphoneos = sqlite3;
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (102541 => 102542)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2011-12-11 20:44:19 UTC (rev 102541)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2011-12-11 22:20:48 UTC (rev 102542)
@@ -1037,6 +1037,7 @@
41F584C7104652CB009CAA64 /* JSMessagePortCustom.h in Headers */ = {isa = PBXBuildFile; fileRef = 41F584C6104652CB009CAA64 /* JSMessagePortCustom.h */; };
41FA303E1316C29C00C0BFC5 /* RenderMediaControls.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 41FA303C1316C29C00C0BFC5 /* RenderMediaControls.cpp */; };
41FA303F1316C29C00C0BFC5 /* RenderMediaControls.h in Headers */ = {isa = PBXBuildFile; fileRef = 41FA303D1316C29C00C0BFC5 /* RenderMediaControls.h */; };
+ 4306E4E614955543007F17AC /* KillRingNone.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4306E4E514955543007F17AC /* KillRingNone.cpp */; };
43142E7A13B1E97700F1C871 /* SVGAnimatedRect.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43142E7913B1E97700F1C871 /* SVGAnimatedRect.cpp */; };
431A2F9C13B6F2B0007791E4 /* SVGAnimatedNumberOptionalNumber.h in Headers */ = {isa = PBXBuildFile; fileRef = 431A2F9A13B6F2B0007791E4 /* SVGAnimatedNumberOptionalNumber.h */; };
431A2F9D13B6F2B0007791E4 /* SVGAnimatedNumberOptionalNumber.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 431A2F9B13B6F2B0007791E4 /* SVGAnimatedNumberOptionalNumber.cpp */; };
@@ -8195,6 +8196,7 @@
41F584C6104652CB009CAA64 /* JSMessagePortCustom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSMessagePortCustom.h; sourceTree = "<group>"; };
41FA303C1316C29C00C0BFC5 /* RenderMediaControls.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RenderMediaControls.cpp; sourceTree = "<group>"; };
41FA303D1316C29C00C0BFC5 /* RenderMediaControls.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RenderMediaControls.h; sourceTree = "<group>"; };
+ 4306E4E514955543007F17AC /* KillRingNone.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = KillRingNone.cpp; sourceTree = "<group>"; };
43142E7913B1E97700F1C871 /* SVGAnimatedRect.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SVGAnimatedRect.cpp; sourceTree = "<group>"; };
431A2F9A13B6F2B0007791E4 /* SVGAnimatedNumberOptionalNumber.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGAnimatedNumberOptionalNumber.h; sourceTree = "<group>"; };
431A2F9B13B6F2B0007791E4 /* SVGAnimatedNumberOptionalNumber.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SVGAnimatedNumberOptionalNumber.cpp; sourceTree = "<group>"; };
@@ -20156,6 +20158,7 @@
A8748BDF12CBF2DC001FBA41 /* HashTools.h */,
BC3BC29B0E91AB0F00835588 /* HostWindow.h */,
521D46F711AEC9B100514613 /* KillRing.h */,
+ 4306E4E514955543007F17AC /* KillRingNone.cpp */,
6593923509AE4346002C531F /* KURL.cpp */,
6593923609AE4346002C531F /* KURL.h */,
BCBD21AA0E417AD400A070F2 /* KURLHash.h */,
@@ -27679,6 +27682,7 @@
D7613AC414753E5600DB8606 /* JSWebKitNamedFlow.cpp in Sources */,
8A195933147EA16E00D1EA61 /* DOMWebKitNamedFlow.mm in Sources */,
26C17A3F1491D2D400D12BA2 /* FileSystemIOS.mm in Sources */,
+ 4306E4E614955543007F17AC /* KillRingNone.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
