Skip to check directories existence in build-webkit

https://bugs.webkit.org/show_bug.cgi?id=160691

Reviewed by Alex Christensen.

CMake checks if directories are there itself. So CMake ports
don't need to check it in the build-webkit script.

* Scripts/build-webkit:
* Scripts/webkitdirs.pm:
(determineSourceDir):
(isCMakeBuild):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@204444 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 3311eb4..0a85909 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,18 @@
+2016-08-12  Gyuyoung Kim  <gyuyoung.kim@webkit.org>
+
+        Skip to check directories existence in build-webkit
+        https://bugs.webkit.org/show_bug.cgi?id=160691
+
+        Reviewed by Alex Christensen.
+
+        CMake checks if directories are there itself. So CMake ports
+        don't need to check it in the build-webkit script.
+
+        * Scripts/build-webkit:
+        * Scripts/webkitdirs.pm:
+        (determineSourceDir):
+        (isCMakeBuild):
+
 2016-08-12  Alex Christensen  <achristensen@webkit.org>
 
         Make URLParser work with URLs missing URL parts

diff --git a/Tools/Scripts/build-webkit b/Tools/Scripts/build-webkit
index 6706707..3be2bb4 100755 (executable)
--- a/Tools/Scripts/build-webkit
+++ b/Tools/Scripts/build-webkit
@@ -146,13 +146,16 @@ my $productDir = productDir();
 my @projects = ("Source/JavaScriptCore", "Source/WebCore", "Source/WebKit");
 
 # Build WTF as a separate static library on ports which support it.
-splice @projects, 0, 0, "Source/WTF" if isAppleMacWebKit() or isAppleWinWebKit() or isWinCairo();
+splice @projects, 0, 0, "Source/WTF" if isAppleWebKit() or isWinCairo();
 
 splice @projects, 0, 0, "Source/bmalloc" if isAppleMacWebKit();
 
-for my $dir (@projects) {
-    if (! -d $dir) {
-        die "Error: No $dir directory found. Please do a fresh checkout.\n";
+# Ports using CMake will check if directories exist in the CMake configuration.
+if (!isCMakeBuild()) {
+    for my $dir (@projects) {
+        if (! -d $dir) {
+            die "Error: No $dir directory found. Please do a fresh checkout.\n";
+        }
     }
 }
 

diff --git a/Tools/Scripts/webkitdirs.pm b/Tools/Scripts/webkitdirs.pm
index 89f840c..9d63942 100755 (executable)
--- a/Tools/Scripts/webkitdirs.pm
+++ b/Tools/Scripts/webkitdirs.pm
@@ -167,8 +167,8 @@ sub determineSourceDir
     $sourceDir =~ s|/+$||; # Remove trailing '/' as we would die later
 
     # walks up path checking each directory to see if it is the main WebKit project dir, 
-    # defined by containing Sources, WebCore, and WebKit
-    until ((-d File::Spec->catdir($sourceDir, "Source") && -d File::Spec->catdir($sourceDir, "Source", "WebCore") && -d File::Spec->catdir($sourceDir, "Source", "WebKit")) || (-d File::Spec->catdir($sourceDir, "Internal") && -d File::Spec->catdir($sourceDir, "OpenSource")))
+    # defined by containing Sources, WebCore, and JavaScriptCore.
+    until ((-d File::Spec->catdir($sourceDir, "Source") && -d File::Spec->catdir($sourceDir, "Source", "WebCore") && -d File::Spec->catdir($sourceDir, "Source", "JavaScriptCore")) || (-d File::Spec->catdir($sourceDir, "Internal") && -d File::Spec->catdir($sourceDir, "OpenSource")))
     {
         if ($sourceDir !~ s|/[^/]+$||) {
             die "Could not find top level webkit directory above source directory using FindBin.\n";