Changeset 114387 in webkit

Timestamp:

Apr 17, 2012 9:26:48 AM (12 years ago)

Author:

commit-queue@webkit.org

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 <​hnandor@inf.u-szeged.hu> 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:

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/build-jsc (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2012-04-17  Nandor Huszka  <hnandor@inf.u-szeged.hu>
+
+        [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  <christophe.dumez@intel.com>
 

trunk/Tools/Scripts/build-jsc

@@ -65 +65 @@
     checkForArgumentAndRemoveFromARGV("--qt");
     my @projects = ("WTF", "JavaScriptCore");
+    # 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);