Title: [102125] trunk
- Revision
- 102125
- Author
- [email protected]
- Date
- 2011-12-06 05:43:24 -0800 (Tue, 06 Dec 2011)
Log Message
[Qt] build-jsc script doesn't work
https://bugs.webkit.org/show_bug.cgi?id=73910
Patch by Simon Hausmann <[email protected]> on 2011-12-06
Reviewed by Tor Arne Vestbø.
.:
* WebKit.pro: Move WTF SUBDIR stuff out of here and
straight into _javascript_Core/_javascript_Core.pro.
Unconditionally "recurse" into _javascript_Core now,
as we'll do the v8 scoping there to only build WTF.
Source/_javascript_Core:
* _javascript_Core.pro: Build WTF before _javascript_Core and JSC
(moved from top-level WebKit.pro). Also add v8 scopes to only build
WTF during v8 builds.
Modified Paths
Diff
Modified: trunk/ChangeLog (102124 => 102125)
--- trunk/ChangeLog 2011-12-06 13:43:19 UTC (rev 102124)
+++ trunk/ChangeLog 2011-12-06 13:43:24 UTC (rev 102125)
@@ -1,3 +1,15 @@
+2011-12-06 Simon Hausmann <[email protected]>
+
+ [Qt] build-jsc script doesn't work
+ https://bugs.webkit.org/show_bug.cgi?id=73910
+
+ Reviewed by Tor Arne Vestbø.
+
+ * WebKit.pro: Move WTF SUBDIR stuff out of here and
+ straight into _javascript_Core/_javascript_Core.pro.
+ Unconditionally "recurse" into _javascript_Core now,
+ as we'll do the v8 scoping there to only build WTF.
+
2011-12-05 Alexander Færøy <[email protected]>
[Qt] Add Source/qtwebkitversion.h to .gitignore
Modified: trunk/Source/_javascript_Core/ChangeLog (102124 => 102125)
--- trunk/Source/_javascript_Core/ChangeLog 2011-12-06 13:43:19 UTC (rev 102124)
+++ trunk/Source/_javascript_Core/ChangeLog 2011-12-06 13:43:24 UTC (rev 102125)
@@ -1,3 +1,14 @@
+2011-12-06 Simon Hausmann <[email protected]>
+
+ [Qt] build-jsc script doesn't work
+ https://bugs.webkit.org/show_bug.cgi?id=73910
+
+ Reviewed by Tor Arne Vestbø.
+
+ * _javascript_Core.pro: Build WTF before _javascript_Core and JSC
+ (moved from top-level WebKit.pro). Also add v8 scopes to only build
+ WTF during v8 builds.
+
2011-12-05 Anders Carlsson <[email protected]>
Add HashMap::keys() and HashMap::values() for easy iteration of hash map keys and values in C++11.
Modified: trunk/Source/_javascript_Core/_javascript_Core.pro (102124 => 102125)
--- trunk/Source/_javascript_Core/_javascript_Core.pro 2011-12-06 13:43:19 UTC (rev 102124)
+++ trunk/Source/_javascript_Core/_javascript_Core.pro 2011-12-06 13:43:24 UTC (rev 102125)
@@ -7,13 +7,19 @@
TEMPLATE = subdirs
CONFIG += ordered
-derived_sources.file = DerivedSources.pri
-target.file = Target.pri
+WTF.file = wtf/wtf.pro
+WTF.makefile = Makefile.WTF
+SUBDIRS += WTF
-SUBDIRS = derived_sources target
+!v8 {
+ derived_sources.file = DerivedSources.pri
+ target.file = Target.pri
-addStrictSubdirOrderBetween(derived_sources, target)
+ SUBDIRS += derived_sources target
-jsc.file = jsc.pro
-jsc.makefile = Makefile.jsc
-SUBDIRS += jsc
+ addStrictSubdirOrderBetween(derived_sources, target)
+
+ jsc.file = jsc.pro
+ jsc.makefile = Makefile.jsc
+ SUBDIRS += jsc
+}
Modified: trunk/WebKit.pro (102124 => 102125)
--- trunk/WebKit.pro 2011-12-06 13:43:19 UTC (rev 102124)
+++ trunk/WebKit.pro 2011-12-06 13:43:24 UTC (rev 102125)
@@ -14,17 +14,11 @@
# Otherwise we won't pick up the feature prf files needed for the build
}
-WTF.file = Source/_javascript_Core/wtf/wtf.pro
-WTF.makefile = Makefile.WTF
-SUBDIRS += WTF
+# Always go into _javascript_Core to at least build WTF.
+_javascript_Core.file = Source/_javascript_Core/_javascript_Core.pro
+_javascript_Core.makefile = Makefile._javascript_Core
+SUBDIRS += _javascript_Core
-!v8 {
- _javascript_Core.file = Source/_javascript_Core/_javascript_Core.pro
- _javascript_Core.makefile = Makefile._javascript_Core
-
- SUBDIRS += _javascript_Core
-}
-
WebCore.file = Source/WebCore/WebCore.pro
WebCore.makefile = Makefile.WebCore
SUBDIRS += WebCore
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
