Changeset 189973 in webkit

Timestamp:

Sep 18, 2015, 11:00:32 AM (10 years ago)

Author:

achristensen@apple.com

Message:

Prevent build-webkit from building four times on Windows
​https://bugs.webkit.org/show_bug.cgi?id=149336

Reviewed by Brent Fulgham.

• Scripts/build-webkit:

Move the Windows code out of the for loop iterating over each subdirectory to be build.
They're built all at once.

• Scripts/webkitdirs.pm:

(buildVisualStudioProject):
(cmakeGeneratedBuildfile):
Don't generate the Visual Studio solution if it already exists.
It will run CMake again if necessary.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/build-webkit (modified) (2 diffs)
• Scripts/webkitdirs.pm (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2015-09-18  Alex Christensen  <achristensen@webkit.org>
+
+        Prevent build-webkit from building four times on Windows 
+        https://bugs.webkit.org/show_bug.cgi?id=149336
+
+        Reviewed by Brent Fulgham.
+
+        * Scripts/build-webkit:
+        Move the Windows code out of the for loop iterating over each subdirectory to be build.
+        They're built all at once.
+        * Scripts/webkitdirs.pm:
+        (buildVisualStudioProject):
+        (cmakeGeneratedBuildfile):
+        Don't generate the Visual Studio solution if it already exists.
+        It will run CMake again if necessary.
+
 2015-09-17  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Tools/Scripts/build-webkit

@@ -242 +242 @@
 }
 
-# Build, and abort if the build fails.
-for my $dir (@projects) {
-    chdir $dir or die;
-    $result = 0;
-
-    my $project = basename($dir);
-    my $baseProductDir = baseProductDir();
-    if (isAppleMacWebKit()) {
-        my @local_options = @options;
-        push @local_options, XcodeCoverageSupportOptions() if $coverageSupport;
-        push @local_options, XcodeStaticAnalyzerOption() if $shouldRunStaticAnalyzer;
-        my $projectPath = $project =~ /gtest/ ? "xcode/gtest" : $project;
-        $result = buildXCodeProject($projectPath, $clean, @local_options, @ARGV);
-    } elsif (isAppleWinWebKit() || isWinCairo()) {
-        chdirWebKit();
-        if (exitStatus(generateBuildSystemFromCMakeProject(isWinCairo() ? "WinCairo" : "AppleWin"))) {
-            die "Run \"C:/Program Files (x86)/Microsoft Visual Studio 12.0/VC/vcvarsall.bat\" before build-webkit when using ninja";
-        }
-        if (canUseNinja()) {
-            chdir "WebKitBuild/" . configuration();
-            $result = system("ninja");
-        } else {
-            $result = buildVisualStudioProject("WebKitBuild/" . configuration() . "/WebKit.sln", $clean);
-        }
-    }
-    # Various build* calls above may change the CWD.
+my $baseProductDir = baseProductDir();
+if (isAppleWinWebKit() || isWinCairo()) {
     chdirWebKit();
-
+    if (exitStatus(generateBuildSystemFromCMakeProject(isWinCairo() ? "WinCairo" : "AppleWin"))) {
+        die "Run \"C:/Program Files (x86)/Microsoft Visual Studio 12.0/VC/vcvarsall.bat\" before build-webkit when using ninja";
+    }
+    chdirWebKit();
+    if (canUseNinja()) {
+        chdir "WebKitBuild/" . configuration();
+        $result = system("ninja");
+    } else {
+        $result = buildVisualStudioProject("WebKitBuild/" . configuration() . "/WebKit.sln", $clean);
+    }
     if (exitStatus($result)) {
         my $scriptDir = relativeScriptsDir();
@@ -278 +263 @@
         }
         exit exitStatus($result);
+    }
+} elsif (isAppleMacWebKit()) {
+    # Build, and abort if the build fails.
+    for my $dir (@projects) {
+        chdir $dir or die;
+        $result = 0;
+
+        my $project = basename($dir);
+        
+        my @local_options = @options;
+        push @local_options, XcodeCoverageSupportOptions() if $coverageSupport;
+        push @local_options, XcodeStaticAnalyzerOption() if $shouldRunStaticAnalyzer;
+        my $projectPath = $project =~ /gtest/ ? "xcode/gtest" : $project;
+        $result = buildXCodeProject($projectPath, $clean, @local_options, @ARGV);
+
+        # Various build* calls above may change the CWD.
+        chdirWebKit();
+
+        if (exitStatus($result)) {
+            exit exitStatus($result);
+        }
     }
 }

trunk/Tools/Scripts/webkitdirs.pm

@@ -1679 +1679 @@
 
     my @command = ($vcBuildPath, "/verbosity:minimal", $project, $action, $config, $platform, "/fl", $errorLogging, "/fl1", $warningLogging);
-
     print join(" ", @command), "\n";
     return system @command;
@@ -1813 +1812 @@
     if ($willUseNinja) {
         return File::Spec->catfile(baseProductDir(), configuration(), "build.ninja")
+    } elsif (isWindows() || isCygwin()) {
+        return File::Spec->catfile(baseProductDir(), configuration(), "WebKit.sln")
     } else {
         return File::Spec->catfile(baseProductDir(), configuration(), "Makefile")