[webkit-changes] [195737] trunk/Tools

Thu, 28 Jan 2016 08:19:17 -0800

Title: [195737] trunk/Tools
Revision
195737
Author
[email protected]
Date
2016-01-28 08:18:32 -0800 (Thu, 28 Jan 2016)

Log Message

[webkitdirs] Don't pass cmakeBasedPortName around.
https://bugs.webkit.org/show_bug.cgi?id=153589

Patch by Konstantin Tokarev <[email protected]> on 2016-01-28
Reviewed by Darin Adler.

It should be local function of webkitdirs.pm instead.

* Scripts/build-jsc: Don't pass cmakeBasedPortName to
buildCMakeProjectOrExit().
* Scripts/build-webkit: Don't pass cmakeBasedPortName to
buildCMakeProjectOrExit() and generateBuildSystemFromCMakeProject().
* Scripts/run-efl-tests: Don't pass cmakeBasedPortName to
generateBuildSystemFromCMakeProject().
* Scripts/webkitdirs.pm: Don't export cmakeBasedPortName.
(generateBuildSystemFromCMakeProject): Removed $port argument as we
can get it from cmakeBasedPortName().
(buildCMakeProjectOrExit): Ditto.

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (195736 => 195737)


--- trunk/Tools/ChangeLog	2016-01-28 15:16:02 UTC (rev 195736)
+++ trunk/Tools/ChangeLog	2016-01-28 16:18:32 UTC (rev 195737)
@@ -1,3 +1,23 @@
+2016-01-28  Konstantin Tokarev  <[email protected]>
+
+        [webkitdirs] Don't pass cmakeBasedPortName around.
+        https://bugs.webkit.org/show_bug.cgi?id=153589
+
+        Reviewed by Darin Adler.
+
+        It should be local function of webkitdirs.pm instead.
+
+        * Scripts/build-jsc: Don't pass cmakeBasedPortName to
+        buildCMakeProjectOrExit().
+        * Scripts/build-webkit: Don't pass cmakeBasedPortName to
+        buildCMakeProjectOrExit() and generateBuildSystemFromCMakeProject().
+        * Scripts/run-efl-tests: Don't pass cmakeBasedPortName to
+        generateBuildSystemFromCMakeProject().
+        * Scripts/webkitdirs.pm: Don't export cmakeBasedPortName.
+        (generateBuildSystemFromCMakeProject): Removed $port argument as we
+        can get it from cmakeBasedPortName().
+        (buildCMakeProjectOrExit): Ditto.
+
 2016-01-28  Gwang Yoon Hwang  <[email protected]>
 
         [GStreamer] Clean up includes and headers related with GStreamerGL

Modified: trunk/Tools/Scripts/build-jsc (195736 => 195737)


--- trunk/Tools/Scripts/build-jsc	2016-01-28 15:16:02 UTC (rev 195736)
+++ trunk/Tools/Scripts/build-jsc	2016-01-28 16:18:32 UTC (rev 195737)
@@ -112,7 +112,7 @@
     }
 
     # This call only returns if nothing wrong happened
-    buildCMakeProjectOrExit(0, cmakeBasedPortName(), undef, $buildTarget, (cmakeBasedPortArguments(), $cmakeArgs));
+    buildCMakeProjectOrExit(0, undef, $buildTarget, (cmakeBasedPortArguments(), $cmakeArgs));
     writeCongrats();
     exit exitStatus(0);
 }

Modified: trunk/Tools/Scripts/build-webkit (195736 => 195737)


--- trunk/Tools/Scripts/build-webkit	2016-01-28 15:16:02 UTC (rev 195736)
+++ trunk/Tools/Scripts/build-webkit	2016-01-28 16:18:32 UTC (rev 195737)
@@ -246,13 +246,13 @@
     my @featureArgs = cMakeArgsFromFeatures();
     removeCMakeCache(@featureArgs);
 
-    buildCMakeProjectOrExit($clean, cmakeBasedPortName(), $prefixPath, $makeArgs, (cmakeBasedPortArguments(), @featureArgs), $cmakeArgs);
+    buildCMakeProjectOrExit($clean, $prefixPath, $makeArgs, (cmakeBasedPortArguments(), @featureArgs), $cmakeArgs);
 }
 
 my $baseProductDir = baseProductDir();
 if (isAppleWinWebKit() || isWinCairo()) {
     chdirWebKit();
-    if (exitStatus(generateBuildSystemFromCMakeProject(cmakeBasedPortName()))) {
+    if (exitStatus(generateBuildSystemFromCMakeProject())) {
         die "Run \"C:/Program Files (x86)/Microsoft Visual Studio 14.0/VC/vcvarsall.bat\" before build-webkit when using ninja";
     }
     chdirWebKit();

Modified: trunk/Tools/Scripts/run-efl-tests (195736 => 195737)


--- trunk/Tools/Scripts/run-efl-tests	2016-01-28 15:16:02 UTC (rev 195736)
+++ trunk/Tools/Scripts/run-efl-tests	2016-01-28 16:18:32 UTC (rev 195737)
@@ -51,7 +51,7 @@
     # Manually add this for jhbuildWrapperPrefixIfNeeded().
     push(@ARGV, "--efl");
 
-    my $returnCode = exitStatus(generateBuildSystemFromCMakeProject("Efl", undef, cmakeBasedPortArguments()));
+    my $returnCode = exitStatus(generateBuildSystemFromCMakeProject(undef, cmakeBasedPortArguments()));
     exit($returnCode) if $returnCode;
 
     $returnCode = exitStatus(buildCMakeGeneratedProject("test"));

Modified: trunk/Tools/Scripts/webkitdirs.pm (195736 => 195737)


--- trunk/Tools/Scripts/webkitdirs.pm	2016-01-28 15:16:02 UTC (rev 195736)
+++ trunk/Tools/Scripts/webkitdirs.pm	2016-01-28 16:18:32 UTC (rev 195737)
@@ -63,7 +63,6 @@
        &chdirWebKit
        &checkFrameworks
        &cmakeBasedPortArguments
-       &cmakeBasedPortName
        &currentSVNRevision
        &debugSafari
        &executableProductDir
@@ -1929,8 +1928,9 @@
 
 sub generateBuildSystemFromCMakeProject
 {
-    my ($port, $prefixPath, @cmakeArgs, $additionalCMakeArgs) = @_;
+    my ($prefixPath, @cmakeArgs, $additionalCMakeArgs) = @_;
     my $config = configuration();
+    my $port = cmakeBasedPortName();
     my $buildPath = File::Spec->catdir(baseProductDir(), $config);
     File::Path::mkpath($buildPath) unless -d $buildPath;
     my $originalWorkingDirectory = getcwd();
@@ -2031,9 +2031,9 @@
     return 0;
 }
 
-sub buildCMakeProjectOrExit($$$$@)
+sub buildCMakeProjectOrExit($$$@)
 {
-    my ($clean, $port, $prefixPath, $makeArgs, @cmakeArgs) = @_;
+    my ($clean, $prefixPath, $makeArgs, @cmakeArgs) = @_;
     my $returnCode;
 
     exit(exitStatus(cleanCMakeGeneratedProject())) if $clean;
@@ -2046,7 +2046,7 @@
         system("perl", "$sourceDir/Tools/Scripts/update-webkitgtk-libs") == 0 or die $!;
     }
 
-    $returnCode = exitStatus(generateBuildSystemFromCMakeProject($port, $prefixPath, @cmakeArgs));
+    $returnCode = exitStatus(generateBuildSystemFromCMakeProject($prefixPath, @cmakeArgs));
     exit($returnCode) if $returnCode;
 
     $returnCode = exitStatus(buildCMakeGeneratedProject($makeArgs));

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to