Diff
Modified: trunk/Tools/ChangeLog (204277 => 204278)
--- trunk/Tools/ChangeLog 2016-08-09 07:25:25 UTC (rev 204277)
+++ trunk/Tools/ChangeLog 2016-08-09 09:11:06 UTC (rev 204278)
@@ -1,3 +1,13 @@
+2016-08-09 Csaba Osztrogonác <o...@webkit.org>
+
+ Allow more --cmakeargs option in build-jsc and build-webkit
+ https://bugs.webkit.org/show_bug.cgi?id=160340
+
+ Reviewed by Michael Catanzaro.
+
+ * Scripts/build-jsc:
+ * Scripts/build-webkit:
+
2016-08-09 Gyuyoung Kim <gyuyoung....@webkit.org>
Do not check if WebKitLibraries folder exists on EFL and GTK
Modified: trunk/Tools/Scripts/build-jsc (204277 => 204278)
--- trunk/Tools/Scripts/build-jsc 2016-08-09 07:25:25 UTC (rev 204277)
+++ trunk/Tools/Scripts/build-jsc 2016-08-09 09:11:06 UTC (rev 204278)
@@ -46,7 +46,7 @@
my $forceCLoop = 0;
my $cli = 0;
my $makeArgs = "";
-my $cmakeArgs = "";
+my @cmakeArgs;
my $copyLibraries = 1;
my $startTime = time();
@@ -64,7 +64,7 @@
--cloop Use C Loop interpreter (default: $forceCLoop)
--cli Build the new jsc command line interface (default: $cli)
--makeargs=<arguments> Optional Makefile flags
- --cmakeargs=<arguments> Optional CMake flags (e.g. --cmakeargs="-DFOO=bar -DCMAKE_PREFIX_PATH=/usr/local")
+ --cmakeargs=<arguments> One or more optional CMake flags (e.g. --cmakeargs="-DFOO=bar -DCMAKE_PREFIX_PATH=/usr/local")
EOF
GetOptions(
@@ -76,7 +76,7 @@
'cli!' => \$cli,
'copy-libraries!' => \$copyLibraries,
'makeargs=s' => \$makeArgs,
- 'cmakeargs=s' => \$cmakeArgs
+ 'cmakeargs=s' => \@cmakeArgs
);
if ($showHelp) {
@@ -101,8 +101,8 @@
}
if (isCMakeBuild()) {
- $cmakeArgs .= $forceCLoop ? " -DENABLE_JIT=OFF" : " -DENABLE_JIT=ON";
- $cmakeArgs .= $ftlJIT ? " -DENABLE_FTL_JIT=ON" : " -DENABLE_FTL_JIT=OFF";
+ push @cmakeArgs, $forceCLoop ? " -DENABLE_JIT=OFF" : " -DENABLE_JIT=ON";
+ push @cmakeArgs, $ftlJIT ? " -DENABLE_FTL_JIT=ON" : " -DENABLE_FTL_JIT=OFF";
my $buildTarget = "";
unless (isAnyWindows()) {
@@ -114,7 +114,7 @@
}
# This call only returns if nothing wrong happened
- buildCMakeProjectOrExit(0, undef, $buildTarget, (cmakeBasedPortArguments(), $cmakeArgs));
+ buildCMakeProjectOrExit(0, undef, $buildTarget, (cmakeBasedPortArguments(), @cmakeArgs));
writeCongrats();
exit exitStatus(0);
}
Modified: trunk/Tools/Scripts/build-webkit (204277 => 204278)
--- trunk/Tools/Scripts/build-webkit 2016-08-09 07:25:25 UTC (rev 204277)
+++ trunk/Tools/Scripts/build-webkit 2016-08-09 09:11:06 UTC (rev 204278)
@@ -57,7 +57,7 @@
my $installLibs;
my $prefixPath;
my $makeArgs = "";
-my $cmakeArgs = "";
+my @cmakeArgs;
my $_onlyWebKitProject_ = 0;
my $coverageSupport = 0;
my $shouldRunStaticAnalyzer = 0;
@@ -101,7 +101,7 @@
--prefix=<path> Set installation prefix to the given path (Gtk/Efl only)
--makeargs=<arguments> Optional Makefile flags
- --cmakeargs=<arguments> Optional CMake flags (e.g. --cmakeargs="-DFOO=bar -DCMAKE_PREFIX_PATH=/usr/local")
+ --cmakeargs=<arguments> One or more optional CMake flags (e.g. --cmakeargs="-DFOO=bar -DCMAKE_PREFIX_PATH=/usr/local")
--minimal No optional features, unless explicitly enabled
@@ -116,7 +116,7 @@
'install-libs=s' => \$installLibs,
'prefix=s' => \$prefixPath,
'makeargs=s' => \$makeArgs,
- 'cmakeargs=s' => \$cmakeArgs,
+ 'cmakeargs=s' => \@cmakeArgs,
'minimal' => \$minimal,
'only-webkit' => \$onlyWebKitProject,
'coverage' => \$coverageSupport,
@@ -238,7 +238,7 @@
my @featureArgs = cMakeArgsFromFeatures();
removeCMakeCache(@featureArgs);
- buildCMakeProjectOrExit($clean, $prefixPath, $makeArgs, (cmakeBasedPortArguments(), @featureArgs), $cmakeArgs);
+ buildCMakeProjectOrExit($clean, $prefixPath, $makeArgs, (cmakeBasedPortArguments(), @featureArgs), @cmakeArgs);
}
my $baseProductDir = baseProductDir();
