API tools faq
paste
Guest User

Untitled

a guest
Aug 26th, 2018
144
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 4.69 KB | None | 0 0
raw download clone embed print report
  1. commit 2f9ef1658b4a53dac0031a51684b82dab5920cc8
  2. Author: Simon Hausmann <simon.hausmann@nokia.com>
  3. Date: Thu Dec 1 08:58:42 2011 +0100
  4.  
  5. [Qt] V8 build fixes.
  6.  
  7. Reviewed by NOBODY (OOPS!).
  8.  
  9. Source/JavaScriptCore:
  10.  
  11. * yarr/yarr.pri: Don't rely on Source/JavaScriptCore being in
  12. VPATH. Prefix SOURCES correctly and make sure that runtime/ is
  13. in the include search path when building with v8.
  14.  
  15. Source/WebCore:
  16.  
  17. * Target.pri: Don't load(javascriptcore) if we're building with v8.
  18.  
  19. Tools:
  20.  
  21. * qmake/mkspecs/features/javascriptcore.prf: Don't add
  22. Source/Thirdparty to the include search path here.
  23. * qmake/mkspecs/features/webcore.prf: Instead it belongs here, because it's
  24. used when building WebCore as well as using it, because header files like
  25. GraphicsContext3D.h include stuff from ThirdParty.
  26.  
  27. diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
  28. index 10dd765..b1e7ff7 100644
  29. --- a/Source/JavaScriptCore/ChangeLog
  30. +++ b/Source/JavaScriptCore/ChangeLog
  31. @@ -1,3 +1,13 @@
  32. +2011-11-30 Simon Hausmann <simon.hausmann@nokia.com>
  33. +
  34. + [Qt] V8 build fixes.
  35. +
  36. + Reviewed by NOBODY (OOPS!).
  37. +
  38. + * yarr/yarr.pri: Don't rely on Source/JavaScriptCore being in
  39. + VPATH. Prefix SOURCES correctly and make sure that runtime/ is
  40. + in the include search path when building with v8.
  41. +
  42. 2011-12-06 Filip Pizlo <fpizlo@apple.com>
  43.  
  44. Zapping a block that is Marked leads to dead objects being mistaken for live ones
  45. diff --git a/Source/JavaScriptCore/yarr/yarr.pri b/Source/JavaScriptCore/yarr/yarr.pri
  46. index a50338a..c263486 100644
  47. --- a/Source/JavaScriptCore/yarr/yarr.pri
  48. +++ b/Source/JavaScriptCore/yarr/yarr.pri
  49. @@ -5,7 +5,9 @@
  50. # -------------------------------------------------------------------
  51.  
  52. SOURCES += \
  53. - yarr/YarrInterpreter.cpp \
  54. - yarr/YarrPattern.cpp \
  55. - yarr/YarrSyntaxChecker.cpp
  56. + $$PWD/YarrInterpreter.cpp \
  57. + $$PWD/YarrPattern.cpp \
  58. + $$PWD/YarrSyntaxChecker.cpp
  59.  
  60. +# For UString.h
  61. +v8: INCLUDEPATH += $$PWD/../runtime
  62. diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
  63. index 1f7c1bc..f273e5f 100644
  64. --- a/Source/WebCore/ChangeLog
  65. +++ b/Source/WebCore/ChangeLog
  66. @@ -1,3 +1,11 @@
  67. +2011-11-30 Simon Hausmann <simon.hausmann@nokia.com>
  68. +
  69. + [Qt] V8 build fixes.
  70. +
  71. + Reviewed by NOBODY (OOPS!).
  72. +
  73. + * Target.pri: Don't load(javascriptcore) if we're building with v8.
  74. +
  75. 2011-12-07 Mary Wu <mary.wu@torchmobile.com.cn>
  76.  
  77. Change function name InitializeLoggingChannelsIfNecessary to follow coding style guideline
  78. diff --git a/Source/WebCore/Target.pri b/Source/WebCore/Target.pri
  79. index 7e42d24..dbcc238 100644
  80. --- a/Source/WebCore/Target.pri
  81. +++ b/Source/WebCore/Target.pri
  82. @@ -9,7 +9,7 @@ TEMPLATE = lib
  83. DEFINES += BUILDING_WebCore
  84.  
  85. load(webcore)
  86. -load(javascriptcore)
  87. +!v8: load(javascriptcore)
  88. load(wtf)
  89.  
  90. CONFIG += staticlib
  91. diff --git a/Tools/ChangeLog b/Tools/ChangeLog
  92. index b7d924b..b73f5a7 100644
  93. --- a/Tools/ChangeLog
  94. +++ b/Tools/ChangeLog
  95. @@ -1,3 +1,15 @@
  96. +2011-11-30 Simon Hausmann <simon.hausmann@nokia.com>
  97. +
  98. + [Qt] V8 build fixes.
  99. +
  100. + Reviewed by NOBODY (OOPS!).
  101. +
  102. + * qmake/mkspecs/features/javascriptcore.prf: Don't add
  103. + Source/Thirdparty to the include search path here.
  104. + * qmake/mkspecs/features/webcore.prf: Instead it belongs here, because it's
  105. + used when building WebCore as well as using it, because header files like
  106. + GraphicsContext3D.h include stuff from ThirdParty.
  107. +
  108. 2011-12-07 Peter Beverloo <peter@chromium.org>
  109.  
  110. [Chromium] Fix project file generation for the Android bot after r102201
  111. diff --git a/Tools/qmake/mkspecs/features/javascriptcore.prf b/Tools/qmake/mkspecs/features/javascriptcore.prf
  112. index c37a459..25011c6 100644
  113. --- a/Tools/qmake/mkspecs/features/javascriptcore.prf
  114. +++ b/Tools/qmake/mkspecs/features/javascriptcore.prf
  115. @@ -20,7 +20,6 @@ JAVASCRIPTCORE_GENERATED_SOURCES_DIR = $${ROOT_BUILD_DIR}/Source/JavaScriptCore/
  116. JAVASCRIPTCORE_INCLUDEPATH = \
  117. $$JAVASCRIPTCORE_SOURCE_DIR \
  118. $$JAVASCRIPTCORE_SOURCE_DIR/.. \
  119. - $$JAVASCRIPTCORE_SOURCE_DIR/../ThirdParty \
  120. $$JAVASCRIPTCORE_SOURCE_DIR/assembler \
  121. $$JAVASCRIPTCORE_SOURCE_DIR/bytecode \
  122. $$JAVASCRIPTCORE_SOURCE_DIR/bytecompiler \
  123. diff --git a/Tools/qmake/mkspecs/features/webcore.prf b/Tools/qmake/mkspecs/features/webcore.prf
  124. index 5e85225c..ff81d7d 100644
  125. --- a/Tools/qmake/mkspecs/features/webcore.prf
  126. +++ b/Tools/qmake/mkspecs/features/webcore.prf
  127. @@ -102,6 +102,7 @@ WEBCORE_INCLUDEPATH = \
  128. $$SOURCE_DIR/WebCore/workers \
  129. $$SOURCE_DIR/WebCore/xml \
  130. $$SOURCE_DIR/WebCore/xml/parser \
  131. + $$SOURCE_DIR/ThirdParty \
  132. $$WEBCORE_INCLUDEPATH
  133.  
  134. WEBCORE_INCLUDEPATH = \
Add Comment
Please, Sign In to add comment
Public Pastes
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!