Modified: trunk/Source/WebCore/ChangeLog (88570 => 88571)
--- trunk/Source/WebCore/ChangeLog 2011-06-10 21:53:49 UTC (rev 88570)
+++ trunk/Source/WebCore/ChangeLog 2011-06-10 22:20:24 UTC (rev 88571)
@@ -1,3 +1,18 @@
+2011-06-10 Mark Rowe <mr...@apple.com>
+
+ Reviewed by Dimitri Glazkov.
+
+ <rdar://problem/9562114> Fix DumpRenderTree build for production configuration.
+
+ Rename the built WebCoreTestSupport dylib to libWebCoreTestSupport.dylib so
+ that it can be found via the library search path rather than requiring an
+ absolute path be passed to the linker.
+
+ Install the library and its associated header file in a more appropriate location
+ for the production configuration.
+
+ * Configurations/WebCoreTestSupport.xcconfig:
+
2011-06-10 Simon Fraser <simon.fra...@apple.com>
Reviewed by Dave Hyatt.
Modified: trunk/Source/WebCore/Configurations/WebCoreTestSupport.xcconfig (88570 => 88571)
--- trunk/Source/WebCore/Configurations/WebCoreTestSupport.xcconfig 2011-06-10 21:53:49 UTC (rev 88570)
+++ trunk/Source/WebCore/Configurations/WebCoreTestSupport.xcconfig 2011-06-10 22:20:24 UTC (rev 88571)
@@ -23,8 +23,17 @@
#include "WebCore.xcconfig"
-PRIVATE_HEADERS_FOLDER_PATH = WebCoreTestSupport;
+PRIVATE_HEADERS_FOLDER_PATH = $(PRIVATE_HEADERS_FOLDER_PATH_$(CONFIGURATION));
+PRIVATE_HEADERS_FOLDER_PATH_Debug = WebCoreTestSupport;
+PRIVATE_HEADERS_FOLDER_PATH_Release = $(PRIVATE_HEADERS_FOLDER_PATH_Debug);
+PRIVATE_HEADERS_FOLDER_PATH_Production = /usr/local/include/WebCoreTestSupport;
+
+INSTALL_PATH = $(INSTALL_PATH_$(CONFIGURATION));
+INSTALL_PATH_Debug = @executable_path;
+INSTALL_PATH_Release = $(INSTALL_PATH_Debug);
+INSTALL_PATH_Production = /usr/local/lib;
+
PRODUCT_NAME = WebCoreTestSupport;
+EXECUTABLE_PREFIX = lib;
+EXPORTED_SYMBOLS_FILE = ;
OTHER_LDFLAGS = ;
-EXPORTED_SYMBOLS_FILE = ;
-INSTALL_PATH = @executable_path;
Modified: trunk/Tools/ChangeLog (88570 => 88571)
--- trunk/Tools/ChangeLog 2011-06-10 21:53:49 UTC (rev 88570)
+++ trunk/Tools/ChangeLog 2011-06-10 22:20:24 UTC (rev 88571)
@@ -1,3 +1,15 @@
+2011-06-10 Mark Rowe <mr...@apple.com>
+
+ Reviewed by Dimitri Glazkov.
+
+ <rdar://problem/9562114> Fix DumpRenderTree build for production configuration.
+
+ Ensure that DumpRenderTree can find libWebCoreTestSupport.dylib and the associated
+ header file.
+
+ * DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj:
+ * DumpRenderTree/mac/Configurations/Base.xcconfig:
+
2011-06-09 Csaba Osztrogonác <o...@webkit.org>
Unreviewed rolling out r88471, because it broke plugin tests on Qt.
Modified: trunk/Tools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj (88570 => 88571)
--- trunk/Tools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj 2011-06-10 21:53:49 UTC (rev 88570)
+++ trunk/Tools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj 2011-06-10 22:20:24 UTC (rev 88571)
@@ -56,7 +56,6 @@
3713EDE3115BE19300705720 /* ColorBits.ttf in Copy Font Files */ = {isa = PBXBuildFile; fileRef = 3713EDE0115BE16F00705720 /* ColorBits.ttf */; };
3A5626CB131CA02A002BE6D9 /* StorageTrackerDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3A5626C1131C8B17002BE6D9 /* StorageTrackerDelegate.mm */; };
3A5626CC131CA036002BE6D9 /* StorageTrackerDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 3A5626C0131C8B17002BE6D9 /* StorageTrackerDelegate.h */; };
- 41230BAD138C47AE00BCCFCA /* WebCoreTestSupport.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 41230BAA138C477A00BCCFCA /* WebCoreTestSupport.dylib */; };
417DAA1D137B3E24007C57FB /* WebCoreTestSupport.h in Headers */ = {isa = PBXBuildFile; fileRef = 417DAA1C137B3E24007C57FB /* WebCoreTestSupport.h */; };
440590711268453800CFD48D /* WebArchiveDumpSupportMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 440590701268453800CFD48D /* WebArchiveDumpSupportMac.mm */; };
4437730E125CBC3600AAE02C /* WebArchiveDumpSupport.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 44A997830FCDE86400580F10 /* WebArchiveDumpSupport.cpp */; };
@@ -75,6 +74,7 @@
5DB9AC9E0F722C3600684641 /* WebKitWeightWatcher700.ttf in Copy Font Files */ = {isa = PBXBuildFile; fileRef = 375F09770DAC3CB600C8B4E5 /* WebKitWeightWatcher700.ttf */; };
5DB9AC9F0F722C3600684641 /* WebKitWeightWatcher800.ttf in Copy Font Files */ = {isa = PBXBuildFile; fileRef = 375F09780DAC3CB600C8B4E5 /* WebKitWeightWatcher800.ttf */; };
5DB9ACA00F722C3600684641 /* WebKitWeightWatcher900.ttf in Copy Font Files */ = {isa = PBXBuildFile; fileRef = 375F09790DAC3CB600C8B4E5 /* WebKitWeightWatcher900.ttf */; };
+ 5DE8AE4413A2C15900D6A37D /* libWebCoreTestSupport.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 5DE8AE4313A2C15800D6A37D /* libWebCoreTestSupport.dylib */; };
8465E2C70FFA8DF2003B8342 /* PixelDumpSupport.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8465E2C60FFA8DF2003B8342 /* PixelDumpSupport.cpp */; };
933BF5AB0F93FA5C000F0441 /* PlainTextController.h in Headers */ = {isa = PBXBuildFile; fileRef = 933BF5A90F93FA5C000F0441 /* PlainTextController.h */; };
933BF5AC0F93FA5C000F0441 /* PlainTextController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 933BF5AA0F93FA5C000F0441 /* PlainTextController.mm */; };
@@ -247,8 +247,6 @@
375F09790DAC3CB600C8B4E5 /* WebKitWeightWatcher900.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = WebKitWeightWatcher900.ttf; path = fonts/WebKitWeightWatcher900.ttf; sourceTree = "<group>"; };
3A5626C0131C8B17002BE6D9 /* StorageTrackerDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StorageTrackerDelegate.h; sourceTree = "<group>"; };
3A5626C1131C8B17002BE6D9 /* StorageTrackerDelegate.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = StorageTrackerDelegate.mm; sourceTree = "<group>"; };
- 41230BAA138C477A00BCCFCA /* WebCoreTestSupport.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; path = WebCoreTestSupport.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
- 41230DF5138C759E00BCCFCA /* WebCoreTestSupport.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = WebCoreTestSupport.dylib; path = /Volumes/Work/WebKit/WebKitBuild/Debug/WebCoreTestSupport.dylib; sourceTree = "<absolute>"; };
417DAA1C137B3E24007C57FB /* WebCoreTestSupport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebCoreTestSupport.h; path = WebCoreTestSupport/WebCoreTestSupport.h; sourceTree = BUILT_PRODUCTS_DIR; };
440590701268453800CFD48D /* WebArchiveDumpSupportMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = WebArchiveDumpSupportMac.mm; path = mac/WebArchiveDumpSupportMac.mm; sourceTree = "<group>"; };
44A997820FCDE86400580F10 /* WebArchiveDumpSupport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebArchiveDumpSupport.h; path = cf/WebArchiveDumpSupport.h; sourceTree = "<group>"; };
@@ -257,6 +255,7 @@
5185F69F10714A57007AA393 /* HistoryDelegate.mm */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 4; name = HistoryDelegate.mm; path = mac/HistoryDelegate.mm; sourceTree = "<group>"; };
53CBB830134E42F3001CE6A4 /* CyclicRedundancyCheck.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CyclicRedundancyCheck.cpp; sourceTree = "<group>"; };
53CBB831134E42F3001CE6A4 /* CyclicRedundancyCheck.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CyclicRedundancyCheck.h; sourceTree = "<group>"; };
+ 5DE8AE4313A2C15800D6A37D /* libWebCoreTestSupport.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; path = libWebCoreTestSupport.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
8465E2C60FFA8DF2003B8342 /* PixelDumpSupport.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = PixelDumpSupport.cpp; sourceTree = "<group>"; };
9335435F03D75502008635CE /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = WebKit.framework; sourceTree = BUILT_PRODUCTS_DIR; };
933BF5A90F93FA5C000F0441 /* PlainTextController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PlainTextController.h; path = mac/PlainTextController.h; sourceTree = "<group>"; };
@@ -359,12 +358,12 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
+ 5DE8AE4413A2C15900D6A37D /* libWebCoreTestSupport.dylib in Frameworks */,
AE8259F308D22463000507AB /* Carbon.framework in Frameworks */,
A84F608A08B136DA00E9745F /* Cocoa.framework in Frameworks */,
A817090408B164D300CCB9FB /* _javascript_Core.framework in Frameworks */,
23BCB8900EA57623003C6289 /* OpenGL.framework in Frameworks */,
9340995108540CAE007F3BC8 /* WebKit.framework in Frameworks */,
- 41230BAD138C47AE00BCCFCA /* WebCoreTestSupport.dylib in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -413,7 +412,6 @@
A803FF6409CAACC1009B2A37 /* Frameworks */,
9340995508540CAF007F3BC8 /* Products */,
BCB281ED0CFA711D007E533E /* Configurations */,
- 41230DF5138C759E00BCCFCA /* WebCoreTestSupport.dylib */,
);
name = DumpRenderTree;
sourceTree = "<group>";
@@ -526,7 +524,6 @@
isa = PBXGroup;
children = (
417DAA1C137B3E24007C57FB /* WebCoreTestSupport.h */,
- 41230BAA138C477A00BCCFCA /* WebCoreTestSupport.dylib */,
);
name = WebCoreTestSupport;
sourceTree = "<group>";
@@ -563,6 +560,7 @@
A803FF6409CAACC1009B2A37 /* Frameworks */ = {
isa = PBXGroup;
children = (
+ 5DE8AE4313A2C15800D6A37D /* libWebCoreTestSupport.dylib */,
BCB284B20CFA82CB007E533E /* ApplicationServices.framework */,
AE8257EF08D22389000507AB /* Carbon.framework */,
A84F608908B136DA00E9745F /* Cocoa.framework */,
Modified: trunk/Tools/DumpRenderTree/mac/Configurations/Base.xcconfig (88570 => 88571)
--- trunk/Tools/DumpRenderTree/mac/Configurations/Base.xcconfig 2011-06-10 21:53:49 UTC (rev 88570)
+++ trunk/Tools/DumpRenderTree/mac/Configurations/Base.xcconfig 2011-06-10 22:20:24 UTC (rev 88571)
@@ -23,7 +23,7 @@
#include "CompilerVersion.xcconfig"
-HEADER_SEARCH_PATHS = ForwardingHeaders mac/InternalHeaders;
+HEADER_SEARCH_PATHS = ForwardingHeaders mac/InternalHeaders $(NEXT_ROOT)/usr/local/include/WebCoreTestSupport;
FRAMEWORK_SEARCH_PATHS = $(SYSTEM_LIBRARY_DIR)/Frameworks/Quartz.framework/Frameworks $(SYSTEM_LIBRARY_DIR)/Frameworks/ApplicationServices.framework/Frameworks $(SYSTEM_LIBRARY_DIR)/Frameworks/CoreServices.framework/Frameworks;
GCC_PREPROCESSOR_DEFINITIONS = ENABLE_DASHBOARD_SUPPORT WEBKIT_VERSION_MIN_REQUIRED=WEBKIT_VERSION_LATEST;
DEBUG_INFORMATION_FORMAT = dwarf
