Title: [99281] trunk
- Revision
- 99281
- Author
- [email protected]
- Date
- 2011-11-04 08:20:50 -0700 (Fri, 04 Nov 2011)
Log Message
[Qt] Don't build all of webkit when running build-jsc
In case the whole webkit project was built, but we then subsequently
want to build only JSC, we need to run make in the proper subdirectory.
This also means the incremental target needs to be added to all
makefiles.
Reviewed by Simon Hausmann.
Modified Paths
Diff
Modified: trunk/ChangeLog (99280 => 99281)
--- trunk/ChangeLog 2011-11-04 15:20:32 UTC (rev 99280)
+++ trunk/ChangeLog 2011-11-04 15:20:50 UTC (rev 99281)
@@ -1,5 +1,19 @@
2011-11-04 Tor Arne Vestbø <[email protected]>
+ [Qt] Don't build all of webkit when running build-jsc
+
+ In case the whole webkit project was built, but we then subsequently
+ want to build only JSC, we need to run make in the proper subdirectory.
+
+ This also means the incremental target needs to be added to all
+ makefiles.
+
+ Reviewed by Simon Hausmann.
+
+ * WebKit.pro:
+
+2011-11-04 Tor Arne Vestbø <[email protected]>
+
[Qt] Refactor and clean up the qmake build system
The qmake build system has accumulated a bit of cruft and redundancy
Modified: trunk/Tools/ChangeLog (99280 => 99281)
--- trunk/Tools/ChangeLog 2011-11-04 15:20:32 UTC (rev 99280)
+++ trunk/Tools/ChangeLog 2011-11-04 15:20:50 UTC (rev 99281)
@@ -1,3 +1,19 @@
+2011-11-04 Tor Arne Vestbø <[email protected]>
+
+ [Qt] Don't build all of webkit when running build-jsc
+
+ In case the whole webkit project was built, but we then subsequently
+ want to build only JSC, we need to run make in the proper subdirectory.
+
+ This also means the incremental target needs to be added to all
+ makefiles.
+
+ Reviewed by Simmon Hausmann.
+
+ * Scripts/webkitdirs.pm:
+ (buildQMakeProject):
+ * qmake/mkspecs/features/default_post.prf:
+
2011-11-04 Simon Hausmann <[email protected]>
Fix run-_javascript_core-tests for Qt when it's executed by the bot.
Modified: trunk/Tools/Scripts/webkitdirs.pm (99280 => 99281)
--- trunk/Tools/Scripts/webkitdirs.pm 2011-11-04 15:20:32 UTC (rev 99280)
+++ trunk/Tools/Scripts/webkitdirs.pm 2011-11-04 15:20:50 UTC (rev 99281)
@@ -1809,6 +1809,10 @@
if ($result ne 0) {
die "Failed to setup build environment using $qmakebin!\n";
}
+ } elsif ($project) {
+ $dir = File::Spec->catfile($dir, "Source", $project);
+ chdir $dir or die "Failed to cd into " . $dir . "\n";
+ $make = "$make -f Makefile.$project";
}
my $command = "$make $makeargs";
Modified: trunk/Tools/qmake/mkspecs/features/default_post.prf (99280 => 99281)
--- trunk/Tools/qmake/mkspecs/features/default_post.prf 2011-11-04 15:20:32 UTC (rev 99280)
+++ trunk/Tools/qmake/mkspecs/features/default_post.prf 2011-11-04 15:20:50 UTC (rev 99281)
@@ -175,6 +175,11 @@
QMAKE_EXTRA_TARGETS += recursive_qmake
}
+incremental.target = incremental
+!CONFIG(GNUmake): incremental.commands += $(MAKE) -f $(MAKEFILE) qmake &&
+incremental.commands += $(MAKE) -f $(MAKEFILE)
+QMAKE_EXTRA_TARGETS += incremental
+
# Don't set OBJECTS_DIR for subdirs, as that will unconditionally
# create the directory, even if we're not using it.
contains(TEMPLATE, subdirs) {
Modified: trunk/WebKit.pro (99280 => 99281)
--- trunk/WebKit.pro 2011-11-04 15:20:32 UTC (rev 99280)
+++ trunk/WebKit.pro 2011-11-04 15:20:50 UTC (rev 99281)
@@ -44,8 +44,3 @@
Tools/qmake/mkspecs/features/mac/*.prf \
Tools/qmake/mkspecs/features/unix/*.prf \
Tools/qmake/mkspecs/features/win32/*.prf
-
-incremental.target = incremental
-!CONFIG(GNUmake): incremental.commands += $(MAKE) qmake &&
-incremental.commands += $(MAKE)
-QMAKE_EXTRA_TARGETS += incremental
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
