Changeset 219728 in webkit

Timestamp:

Jul 21, 2017 9:02:22 AM (7 years ago)

Author:

commit-queue@webkit.org

Message:

[CMake] Add an option to stop build after generating project files
​https://bugs.webkit.org/show_bug.cgi?id=174664

Patch by Yousuke Kimoto <​Yousuke.Kimoto@sony.com> on 2017-07-21
Reviewed by Konstantin Tokarev.

Add "--generate-project-only" to stop build after generating project files.

• Scripts/build-webkit: Add '--generate-project-only' option and a checker to stop build.
• Scripts/webkitdirs.pm: Add a function to check '--generate-project-only' option and the same checker as the above

(buildCMakeProjectOrExit): Add a cheker to stop build stop build after generating project files.
(determineIsGenerateProjectOnly): Check if '--generate-project-only' option is specified
(isGenerateProjectOnly): ditto

Location:

trunk/Tools

Files:

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

trunk/Tools/ChangeLog

@@ +1 @@
+2017-07-21  Yousuke Kimoto  <Yousuke.Kimoto@sony.com>
+
+        [CMake] Add an option to stop build after generating project files
+        https://bugs.webkit.org/show_bug.cgi?id=174664
+
+        Reviewed by Konstantin Tokarev.
+
+        Add "--generate-project-only" to stop build after generating project files.
+
+        * Scripts/build-webkit: Add '--generate-project-only' option and a checker to stop build.
+        * Scripts/webkitdirs.pm: Add a function to check '--generate-project-only' option and the same checker as the above
+        (buildCMakeProjectOrExit): Add a cheker to stop build stop build after generating project files.
+        (determineIsGenerateProjectOnly): Check if '--generate-project-only' option is specified
+        (isGenerateProjectOnly): ditto
+
 2017-07-21  Yusuke Suzuki  <utatane.tea@gmail.com>
 

trunk/Tools/Scripts/build-webkit

@@ -90 +90 @@
   --help                            Show this help message
   --clean                           Cleanup the build directory
+  --generate-project-only           Only generate project files
   --debug                           Compile with Debug configuration
   --release                         Compile with Release configuration
@@ -262 +263 @@
         die "Run \"C:/Program Files (x86)/Microsoft Visual Studio 14.0/VC/vcvarsall.bat\" before build-webkit when using ninja";
     }
+
+    exit 0 if isGenerateProjectOnly();
+
     chdirWebKit();
     if (canUseNinja()) {
@@ -279 +283 @@
     }
 } elsif (isAppleCocoaWebKit() && !isCMakeBuild()) {
+    exit 0 if isGenerateProjectOnly();
+
     # Build, and abort if the build fails.
     for my $dir (@projects) {

trunk/Tools/Scripts/webkitdirs.pm

@@ -140 +140 @@
 my $generateDsym;
 my $isCMakeBuild;
+my $isGenerateProjectOnly;
 my $isWin64;
 my $isInspectorFrontend;
@@ -2136 +2137 @@
     $returnCode = exitStatus(generateBuildSystemFromCMakeProject($prefixPath, @cmakeArgs));
     exit($returnCode) if $returnCode;
+    exit 0 if isGenerateProjectOnly();
 
     $returnCode = exitStatus(buildCMakeGeneratedProject($makeArgs));
@@ -2163 +2165 @@
     determineIsCMakeBuild();
     return $isCMakeBuild;
+}
+
+sub determineIsGenerateProjectOnly()
+{
+    return if defined($isGenerateProjectOnly);
+    $isGenerateProjectOnly = checkForArgumentAndRemoveFromARGV("--generate-project-only");
+}
+
+sub isGenerateProjectOnly()
+{
+    determineIsGenerateProjectOnly();
+    return $isGenerateProjectOnly;
 }