[GTK] [CMake] build-webkit-options.txt is not generated during a fresh build

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

Reviewed by Sergio Villar Senin.

* Scripts/webkitdirs.pm:
(shouldRemoveCMakeCache): make sure that the build directory
exists before attempting to create a file in it.

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

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 180dcc1bca790d21c8d09cd8ada2010fb33964e7..faee98150730ecb2fd49182d7d7413bbca7a1d6c 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,14 @@
+2014-03-18  Alberto Garcia  <berto@igalia.com>
+
+        [GTK] [CMake] build-webkit-options.txt is not generated during a fresh build
+        https://bugs.webkit.org/show_bug.cgi?id=130388
+
+        Reviewed by Sergio Villar Senin.
+
+        * Scripts/webkitdirs.pm:
+        (shouldRemoveCMakeCache): make sure that the build directory
+        exists before attempting to create a file in it.
+
 2014-03-18  Robert Plociennik  <r.plociennik@samsung.com>
 
         [EFL] fontconfig-2.8.0 is not compliant with C++11 leading to a build break

diff --git a/Tools/Scripts/webkitdirs.pm b/Tools/Scripts/webkitdirs.pm
index eecc6e8bb68d7aec7d67721c8f1410b5b087e6a4..2875456c2fa413722fed4de2b36bbdae5f400cd5 100755 (executable)
--- a/Tools/Scripts/webkitdirs.pm
+++ b/Tools/Scripts/webkitdirs.pm
@@ -1933,9 +1933,11 @@ sub shouldRemoveCMakeCache(@)
     }
 
     # We check this first, because we always want to create this file for a fresh build.
-    my $optionsCache = File::Spec->catdir(baseProductDir(), configuration(), "build-webkit-options.txt");
+    my $productDir = File::Spec->catdir(baseProductDir(), configuration());
+    my $optionsCache = File::Spec->catdir($productDir, "build-webkit-options.txt");
     my $joinedBuildArgs = join(" ", @buildArgs);
     if (isCachedArgumentfileOutOfDate($optionsCache, $joinedBuildArgs)) {
+        File::Path::mkpath($productDir) unless -d $productDir;
         open(CACHED_ARGUMENTS, ">", $optionsCache);
         print CACHED_ARGUMENTS $joinedBuildArgs;
         close(CACHED_ARGUMENTS);