Title: [102237] trunk
- Revision
- 102237
- Author
- [email protected]
- Date
- 2011-12-07 07:29:30 -0800 (Wed, 07 Dec 2011)
Log Message
[Qt] V8 build fixes.
Reviewed by Tor Arne Vestbø.
Source/_javascript_Core:
* yarr/yarr.pri: Don't rely on Source/_javascript_Core being in
VPATH. Prefix SOURCES correctly and make sure that runtime/ is
in the include search path when building with v8.
Source/WebCore:
* Target.pri: Don't load(_javascript_core) if we're building with v8.
Tools:
* qmake/mkspecs/features/_javascript_core.prf: Don't add
Source/Thirdparty to the include search path here.
* qmake/mkspecs/features/webcore.prf: Instead it belongs here, because it's
used when building WebCore as well as using it, because header files like
GraphicsContext3D.h include stuff from ThirdParty.
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (102236 => 102237)
--- trunk/Source/_javascript_Core/ChangeLog 2011-12-07 15:10:24 UTC (rev 102236)
+++ trunk/Source/_javascript_Core/ChangeLog 2011-12-07 15:29:30 UTC (rev 102237)
@@ -1,3 +1,13 @@
+2011-11-30 Simon Hausmann <[email protected]>
+
+ [Qt] V8 build fixes.
+
+ Reviewed by Tor Arne Vestbø.
+
+ * yarr/yarr.pri: Don't rely on Source/_javascript_Core being in
+ VPATH. Prefix SOURCES correctly and make sure that runtime/ is
+ in the include search path when building with v8.
+
2011-12-06 Filip Pizlo <[email protected]>
Zapping a block that is Marked leads to dead objects being mistaken for live ones
Modified: trunk/Source/_javascript_Core/yarr/yarr.pri (102236 => 102237)
--- trunk/Source/_javascript_Core/yarr/yarr.pri 2011-12-07 15:10:24 UTC (rev 102236)
+++ trunk/Source/_javascript_Core/yarr/yarr.pri 2011-12-07 15:29:30 UTC (rev 102237)
@@ -5,7 +5,9 @@
# -------------------------------------------------------------------
SOURCES += \
- yarr/YarrInterpreter.cpp \
- yarr/YarrPattern.cpp \
- yarr/YarrSyntaxChecker.cpp
+ $$PWD/YarrInterpreter.cpp \
+ $$PWD/YarrPattern.cpp \
+ $$PWD/YarrSyntaxChecker.cpp
+# For UString.h
+v8: INCLUDEPATH += $$PWD/../runtime
Modified: trunk/Source/WebCore/ChangeLog (102236 => 102237)
--- trunk/Source/WebCore/ChangeLog 2011-12-07 15:10:24 UTC (rev 102236)
+++ trunk/Source/WebCore/ChangeLog 2011-12-07 15:29:30 UTC (rev 102237)
@@ -1,3 +1,11 @@
+2011-11-30 Simon Hausmann <[email protected]>
+
+ [Qt] V8 build fixes.
+
+ Reviewed by Tor Arne Vestbø.
+
+ * Target.pri: Don't load(_javascript_core) if we're building with v8.
+
2011-12-07 Mary Wu <[email protected]>
Change function name InitializeLoggingChannelsIfNecessary to follow coding style guideline
Modified: trunk/Source/WebCore/Target.pri (102236 => 102237)
--- trunk/Source/WebCore/Target.pri 2011-12-07 15:10:24 UTC (rev 102236)
+++ trunk/Source/WebCore/Target.pri 2011-12-07 15:29:30 UTC (rev 102237)
@@ -9,7 +9,7 @@
DEFINES += BUILDING_WebCore
load(webcore)
-load(_javascript_core)
+!v8: load(_javascript_core)
load(wtf)
CONFIG += staticlib
Modified: trunk/Tools/ChangeLog (102236 => 102237)
--- trunk/Tools/ChangeLog 2011-12-07 15:10:24 UTC (rev 102236)
+++ trunk/Tools/ChangeLog 2011-12-07 15:29:30 UTC (rev 102237)
@@ -1,3 +1,15 @@
+2011-11-30 Simon Hausmann <[email protected]>
+
+ [Qt] V8 build fixes.
+
+ Reviewed by Tor Arne Vestbø.
+
+ * qmake/mkspecs/features/_javascript_core.prf: Don't add
+ Source/Thirdparty to the include search path here.
+ * qmake/mkspecs/features/webcore.prf: Instead it belongs here, because it's
+ used when building WebCore as well as using it, because header files like
+ GraphicsContext3D.h include stuff from ThirdParty.
+
2011-12-07 Peter Beverloo <[email protected]>
[Chromium] Fix project file generation for the Android bot after r102201
Modified: trunk/Tools/qmake/mkspecs/features/_javascript_core.prf (102236 => 102237)
--- trunk/Tools/qmake/mkspecs/features/_javascript_core.prf 2011-12-07 15:10:24 UTC (rev 102236)
+++ trunk/Tools/qmake/mkspecs/features/_javascript_core.prf 2011-12-07 15:29:30 UTC (rev 102237)
@@ -20,7 +20,6 @@
_javascript_CORE_INCLUDEPATH = \
$$_javascript_CORE_SOURCE_DIR \
$$_javascript_CORE_SOURCE_DIR/.. \
- $$_javascript_CORE_SOURCE_DIR/../ThirdParty \
$$_javascript_CORE_SOURCE_DIR/assembler \
$$_javascript_CORE_SOURCE_DIR/bytecode \
$$_javascript_CORE_SOURCE_DIR/bytecompiler \
Modified: trunk/Tools/qmake/mkspecs/features/webcore.prf (102236 => 102237)
--- trunk/Tools/qmake/mkspecs/features/webcore.prf 2011-12-07 15:10:24 UTC (rev 102236)
+++ trunk/Tools/qmake/mkspecs/features/webcore.prf 2011-12-07 15:29:30 UTC (rev 102237)
@@ -102,6 +102,7 @@
$$SOURCE_DIR/WebCore/workers \
$$SOURCE_DIR/WebCore/xml \
$$SOURCE_DIR/WebCore/xml/parser \
+ $$SOURCE_DIR/ThirdParty \
$$WEBCORE_INCLUDEPATH
WEBCORE_INCLUDEPATH = \
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
