Title: [114387] trunk/Tools
- Revision
- 114387
- Author
- [email protected]
- Date
- 2012-04-17 09:26:48 -0700 (Tue, 17 Apr 2012)
Log Message
[Qt] JSC build should handle --no-webkit2 option to avoid unwanted clean-builds
https://bugs.webkit.org/show_bug.cgi?id=77533
Patch by Nandor Huszka <[email protected]> on 2012-04-17
Reviewed by Simon Hausmann.
Pick up the --no-webkit2 option from BUILD_WEBKIT_ARGS and pass on
the corresponding parameter to the buildQMakeProjects function.
* Scripts/build-jsc:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (114386 => 114387)
--- trunk/Tools/ChangeLog 2012-04-17 16:13:19 UTC (rev 114386)
+++ trunk/Tools/ChangeLog 2012-04-17 16:26:48 UTC (rev 114387)
@@ -1,3 +1,15 @@
+2012-04-17 Nandor Huszka <[email protected]>
+
+ [Qt] JSC build should handle --no-webkit2 option to avoid unwanted clean-builds
+ https://bugs.webkit.org/show_bug.cgi?id=77533
+
+ Reviewed by Simon Hausmann.
+
+ Pick up the --no-webkit2 option from BUILD_WEBKIT_ARGS and pass on
+ the corresponding parameter to the buildQMakeProjects function.
+
+ * Scripts/build-jsc:
+
2012-04-17 Christophe Dumez <[email protected]>
[EFL] DRT should support LayoutTestController's dumpFrameLoadCallbacks()
Modified: trunk/Tools/Scripts/build-jsc (114386 => 114387)
--- trunk/Tools/Scripts/build-jsc 2012-04-17 16:13:19 UTC (rev 114386)
+++ trunk/Tools/Scripts/build-jsc 2012-04-17 16:26:48 UTC (rev 114387)
@@ -64,6 +64,9 @@
if (isQt()) {
checkForArgumentAndRemoveFromARGV("--qt");
my @projects = ("WTF", "_javascript_Core");
+ # Pick up the --no-webkit2 option from BUILD_WEBKIT_ARGS if it is needed
+ push @ARGV, split(/ /, $ENV{'BUILD_WEBKIT_ARGS'}) if ($ENV{'BUILD_WEBKIT_ARGS'});
+ push @ARGV, "--qmakearg=CONFIG+=no_webkit2" if checkForArgumentAndRemoveFromARGV("--no-webkit2");
my $result = buildQMakeProjects(\@projects, 0, @ARGV);
exit exitStatus($result);
} elsif (cmakeBasedPortName()) {
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
