API tools faq
paste
Guest User

Untitled

a guest
Jul 23rd, 2018
263
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 11.97 KB | None | 0 0
raw download clone embed print report
  1. diff --git a/ChangeLog b/ChangeLog
  2. index abfef18..b2f9865 100644
  3. --- a/ChangeLog
  4. +++ b/ChangeLog
  5. @@ -1,5 +1,16 @@
  6. 2011-03-01 Andras Becsi <abecsi@webkit.org>
  7.  
  8. + Reviewed by NOBODY (OOPS!).
  9. +
  10. + [Qt] Clean up the project files and move common options to WebKit.pri.
  11. +
  12. + Mac related changes suggested by Prasanth Ullattil <prasanth.ullattil@nokia.com>
  13. +
  14. + * Source/WebKit.pri: Common options should be here.
  15. + Also move Mac options to this file to fix the Mac build.
  16. +
  17. +2011-03-01 Andras Becsi <abecsi@webkit.org>
  18. +
  19. Unreviewed build fix.
  20.  
  21. [Qt] Fix minimal build.
  22. diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
  23. index 5f9b7bc..958c1cf 100644
  24. --- a/Source/JavaScriptCore/ChangeLog
  25. +++ b/Source/JavaScriptCore/ChangeLog
  26. @@ -1,3 +1,13 @@
  27. +2011-03-01 Andras Becsi <abecsi@webkit.org>
  28. +
  29. + Reviewed by NOBODY (OOPS!).
  30. +
  31. + [Qt] Clean up the project files and move common options to WebKit.pri.
  32. +
  33. + * JavaScriptCore.pri: Move options also needed in WebCore into WebKit.pri.
  34. + * JavaScriptCore.pro: Deduplicate options.
  35. + * jsc.pro: Ditto.
  36. +
  37. 2011-03-01 Adam Barth <abarth@webkit.org>
  38.  
  39. Reviewed by Eric Seidel.
  40. diff --git a/Source/JavaScriptCore/JavaScriptCore.pri b/Source/JavaScriptCore/JavaScriptCore.pri
  41. index f28aff1..391c74f 100644
  42. --- a/Source/JavaScriptCore/JavaScriptCore.pri
  43. +++ b/Source/JavaScriptCore/JavaScriptCore.pri
  44. @@ -18,8 +18,6 @@ CONFIG(standalone_package) {
  45. isEmpty(JSC_GENERATED_SOURCES_DIR):JSC_GENERATED_SOURCES_DIR = generated
  46. }
  47.  
  48. -CONFIG(standalone_package): DEFINES *= NDEBUG
  49. -
  50. JAVASCRIPTCORE_INCLUDEPATH = \
  51. $$PWD \
  52. $$PWD/.. \
  53. diff --git a/Source/JavaScriptCore/JavaScriptCore.pro b/Source/JavaScriptCore/JavaScriptCore.pro
  54. index 8835a6c..e41f04d 100644
  55. --- a/Source/JavaScriptCore/JavaScriptCore.pro
  56. +++ b/Source/JavaScriptCore/JavaScriptCore.pro
  57. @@ -16,20 +16,6 @@ CONFIG += depend_includepath
  58.  
  59. contains(QT_CONFIG, embedded):CONFIG += embedded
  60.  
  61. -CONFIG(QTDIR_build) {
  62. - # Make sure we compile both debug and release on mac when inside Qt.
  63. - # This line was extracted from qbase.pri instead of including the whole file
  64. - win32|mac:!macx-xcode:CONFIG += debug_and_release
  65. -} else {
  66. - !CONFIG(release, debug|release) {
  67. - OBJECTS_DIR = obj/debug
  68. - } else { # Release
  69. - OBJECTS_DIR = obj/release
  70. - }
  71. - # Make sure that build_all follows the build_all config in WebCore
  72. - mac:contains(QT_CONFIG, qt_framework):!CONFIG(webkit_no_framework):!build_pass:CONFIG += build_all
  73. -}
  74. -
  75. # WebCore adds these config only when in a standalone build.
  76. # qbase.pri takes care of that when in a QTDIR_build
  77. # Here we add the config for both cases since we don't include qbase.pri
  78. @@ -42,14 +28,6 @@ CONFIG(QTDIR_build) {
  79. CONFIG += no_debug_info
  80. }
  81.  
  82. -# Pick up 3rdparty libraries from INCLUDE/LIB just like with MSVC
  83. -win32-g++* {
  84. - TMPPATH = $$quote($$(INCLUDE))
  85. - QMAKE_INCDIR_POST += $$split(TMPPATH,";")
  86. - TMPPATH = $$quote($$(LIB))
  87. - QMAKE_LIBDIR_POST += $$split(TMPPATH,";")
  88. -}
  89. -
  90. *-g++*:QMAKE_CXXFLAGS_RELEASE -= -O2
  91. *-g++*:QMAKE_CXXFLAGS_RELEASE += -O3
  92.  
  93. diff --git a/Source/JavaScriptCore/jsc.pro b/Source/JavaScriptCore/jsc.pro
  94. index 7275219..a550c48 100644
  95. --- a/Source/JavaScriptCore/jsc.pro
  96. +++ b/Source/JavaScriptCore/jsc.pro
  97. @@ -15,11 +15,6 @@ unix:!mac:!symbian:CONFIG += link_pkgconfig
  98.  
  99. QMAKE_RPATHDIR += $$OUTPUT_DIR/lib
  100.  
  101. -!CONFIG(release, debug|release) {
  102. - OBJECTS_DIR = obj/debug
  103. -} else { # Release
  104. - OBJECTS_DIR = obj/release
  105. -}
  106. OBJECTS_DIR_WTR = $$OBJECTS_DIR$${QMAKE_DIR_SEP}
  107. include($$PWD/JavaScriptCore.pri)
  108. prependJavaScriptCoreLib(.)
  109. diff --git a/Source/JavaScriptCore/qt/ChangeLog b/Source/JavaScriptCore/qt/ChangeLog
  110. index 7a20ffb..2ed4d46 100644
  111. --- a/Source/JavaScriptCore/qt/ChangeLog
  112. +++ b/Source/JavaScriptCore/qt/ChangeLog
  113. @@ -1,3 +1,11 @@
  114. +2011-03-01 Andras Becsi <abecsi@webkit.org>
  115. +
  116. + Reviewed by NOBODY (OOPS!).
  117. +
  118. + [Qt] Clean up the project files and move common options to WebKit.pri.
  119. +
  120. + * api/QtScript.pro: Deduplicate options.
  121. +
  122. 2011-02-24 Andras Becsi <abecsi@webkit.org>
  123.  
  124. Reviewed by Laszlo Gombos.
  125. diff --git a/Source/JavaScriptCore/qt/api/QtScript.pro b/Source/JavaScriptCore/qt/api/QtScript.pro
  126. index 77a55b7..22e8b0c 100644
  127. --- a/Source/JavaScriptCore/qt/api/QtScript.pro
  128. +++ b/Source/JavaScriptCore/qt/api/QtScript.pro
  129. @@ -7,11 +7,6 @@ INCLUDEPATH += $$PWD
  130. CONFIG += building-libs
  131.  
  132. isEmpty(JSC_GENERATED_SOURCES_DIR):JSC_GENERATED_SOURCES_DIR = ../../generated
  133. -!CONFIG(release, debug|release) {
  134. - OBJECTS_DIR = obj/debug
  135. -} else { # Release
  136. - OBJECTS_DIR = obj/release
  137. -}
  138.  
  139. isEmpty(OUTPUT_DIR): OUTPUT_DIR = ../../..
  140. include($$PWD/../../../WebKit.pri)
  141. diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
  142. index 89b5fde..33035e2 100644
  143. --- a/Source/WebCore/ChangeLog
  144. +++ b/Source/WebCore/ChangeLog
  145. @@ -1,3 +1,14 @@
  146. +2011-03-01 Andras Becsi <abecsi@webkit.org>
  147. +
  148. + Reviewed by NOBODY (OOPS!).
  149. +
  150. + [Qt] Clean up the project files and move common options to WebKit.pri.
  151. +
  152. + No new tests needed.
  153. +
  154. + * WebCore.pri: Move common options to WebKit.pri.
  155. + * WebCore.pro: Ditto.
  156. +
  157. 2011-03-01 Steve Block <steveblock@google.com>
  158.  
  159. Reviewed by Pavel Feldman.
  160. diff --git a/Source/WebCore/WebCore.pri b/Source/WebCore/WebCore.pri
  161. index 6b856b5..8f3f43d 100644
  162. --- a/Source/WebCore/WebCore.pri
  163. +++ b/Source/WebCore/WebCore.pri
  164. @@ -26,12 +26,6 @@ CONFIG(standalone_package) {
  165. } else {
  166. isEmpty(WC_GENERATED_SOURCES_DIR):WC_GENERATED_SOURCES_DIR = ../WebCore/generated
  167. isEmpty(JSC_GENERATED_SOURCES_DIR):JSC_GENERATED_SOURCES_DIR = ../JavaScriptCore/generated
  168. -
  169. - !CONFIG(release, debug|release) {
  170. - OBJECTS_DIR = obj/debug
  171. - } else { # Release
  172. - OBJECTS_DIR = obj/release
  173. - }
  174. }
  175.  
  176. V8_DIR = "$$[QT_INSTALL_PREFIX]/src/3rdparty/v8"
  177. @@ -315,14 +309,6 @@ win32-* {
  178. LIBS += -lgdi32
  179. LIBS += -lole32
  180. LIBS += -luser32
  181. -
  182. - # Pick up 3rdparty libraries from INCLUDE/LIB just like with MSVC
  183. - win32-g++* {
  184. - TMPPATH = $$quote($$(INCLUDE))
  185. - QMAKE_INCDIR_POST += $$split(TMPPATH,";")
  186. - TMPPATH = $$quote($$(LIB))
  187. - QMAKE_LIBDIR_POST += $$split(TMPPATH,";")
  188. - }
  189. }
  190.  
  191. # Remove whole program optimizations due to miscompilations
  192. diff --git a/Source/WebCore/WebCore.pro b/Source/WebCore/WebCore.pro
  193. index 65df85e..458d6a2 100644
  194. --- a/Source/WebCore/WebCore.pro
  195. +++ b/Source/WebCore/WebCore.pro
  196. @@ -3,8 +3,8 @@ CONFIG += building-libs
  197. CONFIG += depend_includepath
  198.  
  199. isEmpty(OUTPUT_DIR): OUTPUT_DIR = ..
  200. -include($$PWD/WebCore.pri)
  201. include($$PWD/../WebKit.pri)
  202. +include($$PWD/WebCore.pri)
  203. include($$PWD/../JavaScriptCore/JavaScriptCore.pri)
  204.  
  205. TEMPLATE = lib
  206. diff --git a/Source/WebKit.pri b/Source/WebKit.pri
  207. index e87a33b..51d13f0 100644
  208. --- a/Source/WebKit.pri
  209. +++ b/Source/WebKit.pri
  210. @@ -3,8 +3,24 @@
  211. # Detect that we are building as a standalone package by the presence of
  212. # either the generated files directory or as part of the Qt package through
  213. # QTDIR_build
  214. -CONFIG(QTDIR_build): CONFIG += standalone_package
  215. -else:exists($$PWD/WebCore/generated): CONFIG += standalone_package
  216. +CONFIG(QTDIR_build) {
  217. + CONFIG += standalone_package
  218. + # Make sure we compile both debug and release on mac when inside Qt.
  219. + # This line was extracted from qbase.pri instead of including the whole file
  220. + win32|mac:!macx-xcode:CONFIG += debug_and_release
  221. +} else {
  222. + !CONFIG(release, debug|release) {
  223. + OBJECTS_DIR = obj/debug
  224. + } else { # Release
  225. + OBJECTS_DIR = obj/release
  226. + DEFINES *= NDEBUG
  227. + }
  228. + exists($$PWD/WebCore/generated):CONFIG += standalone_package
  229. + # Make sure that build_all follows the build_all config in WebCore
  230. + mac:contains(QT_CONFIG, qt_framework):!CONFIG(webkit_no_framework):!build_pass:CONFIG += build_all
  231. +}
  232. +
  233. +CONFIG(standalone_package): DEFINES *= NDEBUG
  234.  
  235. CONFIG += depend_includepath
  236. DEPENDPATH += $$OUT_PWD
  237. @@ -62,6 +78,14 @@ webkit2 {
  238. INCLUDEPATH += $$PWD/WebKit2/
  239. }
  240.  
  241. +# Pick up 3rdparty libraries from INCLUDE/LIB just like with MSVC
  242. +win32-g++* {
  243. + TMPPATH = $$quote($$(INCLUDE))
  244. + QMAKE_INCDIR_POST += $$split(TMPPATH,";")
  245. + TMPPATH = $$quote($$(LIB))
  246. + QMAKE_LIBDIR_POST += $$split(TMPPATH,";")
  247. +}
  248. +
  249. CONFIG -= warn_on
  250. *-g++*:QMAKE_CXXFLAGS += -Wall -Wextra -Wreturn-type -fno-strict-aliasing -Wcast-align -Wchar-subscripts -Wformat-security -Wreturn-type -Wno-unused-parameter -Wno-sign-compare -Wno-switch -Wno-switch-enum -Wundef -Wmissing-noreturn -Winit-self
  251.  
  252. @@ -114,8 +138,8 @@ symbian|maemo5|maemo6 {
  253. contains(QT_CONFIG, modular):!contains(QT_CONFIG, uitools)|disable_uitools: DEFINES *= QT_NO_UITOOLS
  254.  
  255. !contains(QT_CONFIG, modular) {
  256. - $$QT.phonon.includes = $QMAKE_INCDIR_QT/phonon
  257. - $$QT.phonon.libs = $$QMAKE_LIBDIR_QT
  258. + QT.phonon.includes = $$QMAKE_INCDIR_QT/phonon
  259. + QT.phonon.libs = $$QMAKE_LIBDIR_QT
  260. }
  261.  
  262. # Disable a few warnings on Windows. The warnings are also
  263. diff --git a/Source/WebKit/qt/ChangeLog b/Source/WebKit/qt/ChangeLog
  264. index ea31fd7..2b63ac1 100644
  265. --- a/Source/WebKit/qt/ChangeLog
  266. +++ b/Source/WebKit/qt/ChangeLog
  267. @@ -1,3 +1,11 @@
  268. +2011-03-01 Andras Becsi <abecsi@webkit.org>
  269. +
  270. + Reviewed by NOBODY (OOPS!).
  271. +
  272. + [Qt] Clean up the project files and move common options to WebKit.pri.
  273. +
  274. + * QtWebKit.pro: Move common options to WebKit.pri.
  275. +
  276. 2011-03-01 Aparna Nandyal <aparna.nand@wipro.com>
  277.  
  278. Reviewed by Simon Hausmann.
  279. diff --git a/Source/WebKit/qt/QtWebKit.pro b/Source/WebKit/qt/QtWebKit.pro
  280. index 99c19f7..4b7bb05 100644
  281. --- a/Source/WebKit/qt/QtWebKit.pro
  282. +++ b/Source/WebKit/qt/QtWebKit.pro
  283. @@ -23,12 +23,6 @@ CONFIG(standalone_package) {
  284. isEmpty(WEBKIT2_GENERATED_SOURCES_DIR):JSC_GENERATED_SOURCES_DIR = ../../JavaScriptCore/generated
  285. isEmpty(WC_GENERATED_SOURCES_DIR):WC_GENERATED_SOURCES_DIR = ../../WebCore/generated
  286. isEmpty(WC_GENERATED_SOURCES_DIR):WEBKIT2_GENERATED_SOURCES_DIR = ../../WebKit2/generated
  287. -
  288. - !CONFIG(release, debug|release) {
  289. - OBJECTS_DIR = obj/debug
  290. - } else { # Release
  291. - OBJECTS_DIR = obj/release
  292. - }
  293. }
  294.  
  295. include($$PWD/Api/headers.pri)
  296. diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
  297. index 52bb6c8..dc7d74e 100644
  298. --- a/Source/WebKit2/ChangeLog
  299. +++ b/Source/WebKit2/ChangeLog
  300. @@ -1,3 +1,11 @@
  301. +2011-03-01 Andras Becsi <abecsi@webkit.org>
  302. +
  303. + Reviewed by NOBODY (OOPS!).
  304. +
  305. + [Qt] Clean up the project files and move common options to WebKit.pri.
  306. +
  307. + * WebKit2.pro: Deduplicate options.
  308. +
  309. 2011-03-01 Juha Savolainen <juha.savolainen@weego.fi>
  310.  
  311. Reviewed by Andreas Kling.
  312. diff --git a/Source/WebKit2/WebKit2.pro b/Source/WebKit2/WebKit2.pro
  313. index 1df1fe7..e8d59e6 100644
  314. --- a/Source/WebKit2/WebKit2.pro
  315. +++ b/Source/WebKit2/WebKit2.pro
  316. @@ -15,13 +15,6 @@ CONFIG += staticlib
  317. TARGET = $$WEBKIT2_TARGET
  318. DESTDIR = $$WEBKIT2_DESTDIR
  319.  
  320. -!CONFIG(release, debug|release) {
  321. - OBJECTS_DIR = obj/debug
  322. -} else { # Release
  323. - OBJECTS_DIR = obj/release
  324. - DEFINES += NDEBUG
  325. -}
  326. -
  327. # Build both debug and release configurations
  328. mac: CONFIG += build_all
  329.  
  330. diff --git a/Tools/ChangeLog b/Tools/ChangeLog
  331. index 911269c..d43891e 100644
  332. --- a/Tools/ChangeLog
  333. +++ b/Tools/ChangeLog
  334. @@ -1,3 +1,12 @@
  335. +2011-03-01 Andras Becsi <abecsi@webkit.org>
  336. +
  337. + Reviewed by NOBODY (OOPS!).
  338. +
  339. + [Qt] Clean up the project files and move common options to WebKit.pri.
  340. +
  341. + * WebKitTestRunner/qt/WebKitTestRunner.pro: Deduplicate.
  342. +
  343. +
  344. 2011-03-01 Adam Roben <aroben@apple.com>
  345.  
  346. Skip another multiprocessing test on Windows
  347. diff --git a/Tools/WebKitTestRunner/qt/WebKitTestRunner.pro b/Tools/WebKitTestRunner/qt/WebKitTestRunner.pro
  348. index 1172eea..d6579a4 100644
  349. --- a/Tools/WebKitTestRunner/qt/WebKitTestRunner.pro
  350. +++ b/Tools/WebKitTestRunner/qt/WebKitTestRunner.pro
  351. @@ -8,12 +8,6 @@ GENERATED_SOURCES_DIR = ../generated
  352.  
  353. include(../../../Source/WebKit.pri)
  354.  
  355. -!CONFIG(release, debug|release) {
  356. - OBJECTS_DIR = obj/debug
  357. -} else { # Release
  358. - OBJECTS_DIR = obj/release
  359. -}
  360. -
  361. DEFINES += USE_SYSTEM_MALLOC=1
  362.  
  363. 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!