diff options
| author | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-07 19:04:04 +0000 |
|---|---|---|
| committer | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-07 19:04:04 +0000 |
| commit | 47dfc86e6c2263911c837195f4b33b5a08ee538f (patch) | |
| tree | 104b040f443ad0a285be49da79d0cba087a58fac /webkit/webkit.xcodeproj | |
| parent | cf5e1beaa20d2cd67296a45c779378f44363dc7f (diff) | |
| download | chromium_src-47dfc86e6c2263911c837195f4b33b5a08ee538f.zip chromium_src-47dfc86e6c2263911c837195f4b33b5a08ee538f.tar.gz chromium_src-47dfc86e6c2263911c837195f4b33b5a08ee538f.tar.bz2 | |
Eliminate unintentional dependency on JSC's KJS::Heap in the V8 build by
building PausedTimeouts.cpp from a location not likely to have header
conflicts. The Visual Studio build does this too.
Review URL: http://codereview.chromium.org/6549
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@2955 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/webkit.xcodeproj')
| -rw-r--r-- | webkit/webkit.xcodeproj/project.pbxproj | 10 | ||||
| -rwxr-xr-x | webkit/webkit.xcodeproj/webcore_prebuild.sh | 12 |
2 files changed, 17 insertions, 5 deletions
diff --git a/webkit/webkit.xcodeproj/project.pbxproj b/webkit/webkit.xcodeproj/project.pbxproj index 1bbedf1..cde029e 100644 --- a/webkit/webkit.xcodeproj/project.pbxproj +++ b/webkit/webkit.xcodeproj/project.pbxproj @@ -3836,8 +3836,8 @@ E40054A60E9BC4C20055B38E /* RefCountedLeakCounter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RefCountedLeakCounter.cpp; sourceTree = "<group>"; }; E40054B00E9BCC5C0055B38E /* CollatorICU.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CollatorICU.cpp; sourceTree = "<group>"; }; E40054B30E9BCC720055B38E /* Collator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Collator.h; sourceTree = "<group>"; }; - E43CE1390E68621500D8C5B9 /* PausedTimeouts.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PausedTimeouts.h; path = ../third_party/WebKit/WebCore/bindings/js/PausedTimeouts.h; sourceTree = SOURCE_ROOT; }; - E43CE13A0E68621500D8C5B9 /* PausedTimeouts.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PausedTimeouts.cpp; path = ../third_party/WebKit/WebCore/bindings/js/PausedTimeouts.cpp; sourceTree = SOURCE_ROOT; }; + E43CE1390E68621500D8C5B9 /* PausedTimeouts.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PausedTimeouts.h; path = WebCore/bindings/js/PausedTimeouts.h; sourceTree = "<group>"; }; + E43CE13A0E68621500D8C5B9 /* PausedTimeouts.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PausedTimeouts.cpp; path = WebCore/bindings/js/PausedTimeouts.cpp; sourceTree = "<group>"; }; E45062DF0E40B5420025A81A /* SkiaUtils.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SkiaUtils.cpp; sourceTree = "<group>"; }; E45062E00E40B5420025A81A /* SkiaUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SkiaUtils.h; sourceTree = "<group>"; }; E45626950E268E87005E4685 /* libwebcore.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libwebcore.a; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -3959,12 +3959,12 @@ 7B00912A0DAFEF2000F72082 /* bindings */ = { isa = PBXGroup; children = ( - E43CE1390E68621500D8C5B9 /* PausedTimeouts.h */, E43CE13A0E68621500D8C5B9 /* PausedTimeouts.cpp */, + E43CE1390E68621500D8C5B9 /* PausedTimeouts.h */, ); name = bindings; - path = DerivedSources/v8/bindings; - sourceTree = BUILT_PRODUCTS_DIR; + path = generated/bindings/v8; + sourceTree = CONFIGURATION_TEMP_DIR; }; 7B0095D00DAFF0DC00F72082 /* v8 */ = { isa = PBXGroup; diff --git a/webkit/webkit.xcodeproj/webcore_prebuild.sh b/webkit/webkit.xcodeproj/webcore_prebuild.sh index 861d759..9be174d4 100755 --- a/webkit/webkit.xcodeproj/webcore_prebuild.sh +++ b/webkit/webkit.xcodeproj/webcore_prebuild.sh @@ -27,6 +27,18 @@ fi rmdir "${GENERATED_DIR}/include/v8/new" +# WebCore/bindings/js/PausedTimeouts.cpp depends on PausedTimeouts.h, which +# depends on ScheduledAction.h, all in the same directory. PausedTimeouts is +# not JSC-specific and should be built here, but ScheduledAction.h is +# JSC-specific. Our own V8-compatible ScheduledAction.h is in webkit/port/dom +# and would normally not be the one chosen by the preprocessor, which finds +# the JSC one first instead. Copy PausedTimeouts.cpp out to another location +# so that the proper ScheduledAction.h can be included. +mkdir -p "${GENERATED_DIR}/bindings/v8/WebCore/bindings/js" +cp -p "../third_party/WebKit/WebCore/bindings/js/PausedTimeouts.cpp" \ + "../third_party/WebKit/WebCore/bindings/js/PausedTimeouts.h" \ + "${GENERATED_DIR}/bindings/v8/WebCore/bindings/js" + # TODO(mmentovai): Am I still needed? ln -sfh "${SRCROOT}/../third_party/WebKit/WebCore" WebCore |