Changeset 103418 in webkit

Timestamp:

Dec 21, 2011 11:09:43 AM (12 years ago)

Author:

dbates@webkit.org

Message:

Extract WinCE CMake arguments from build-webkit into separate function
​https://bugs.webkit.org/show_bug.cgi?id=74983

Reviewed by Rob Buis.

Towards adding support for using Tools/Scripts/build-jsc for the WinCE port, extract the
WinCE-specific CMake argument from Tools/Scripts/build-webkit into webkitdirs::cmakeBasedPortArguments().
This will allow us to get the WinCE-specific CMake argument in Tools/Scripts/build-jsc so
that we can pass it to the CMake build system when building JavaScriptCore.

• Scripts/build-webkit:
• Scripts/webkitdirs.pm:

(cmakeBasedPortArguments): Added.

Location:

trunk/Tools

Files:

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

trunk/Tools/ChangeLog

@@ +1 @@
+2011-12-21  Daniel Bates  <dbates@webkit.org>
+
+        Extract WinCE CMake arguments from build-webkit into separate function
+        https://bugs.webkit.org/show_bug.cgi?id=74983
+
+        Reviewed by Rob Buis.
+
+        Towards adding support for using Tools/Scripts/build-jsc for the WinCE port, extract the
+        WinCE-specific CMake argument from Tools/Scripts/build-webkit into webkitdirs::cmakeBasedPortArguments().
+        This will allow us to get the WinCE-specific CMake argument in Tools/Scripts/build-jsc so
+        that we can pass it to the CMake build system when building JavaScriptCore.
+
+        * Scripts/build-webkit:
+        * Scripts/webkitdirs.pm:
+        (cmakeBasedPortArguments): Added.
+
 2011-12-21  Kentaro Hara  <haraken@chromium.org>
 

trunk/Tools/Scripts/build-webkit

@@ -629 +629 @@
     # By default we build using all of the available CPUs.
     $makeArgs .= ($makeArgs ? " " : "") . "-j" . numberOfCPUs() if $makeArgs !~ /-j\s*\d+/;
-    buildCMakeProjectOrExit($clean, "Efl", $prefixPath, $makeArgs, cMakeArgsFromFeatures(), $cmakeArgs);
+    buildCMakeProjectOrExit($clean, "Efl", $prefixPath, $makeArgs, (cmakeBasedPortArguments(), cMakeArgsFromFeatures()), $cmakeArgs);
 }
 
 if (isWinCE()) {
-    buildCMakeProjectOrExit($clean, "WinCE", $prefixPath, $makeArgs, ("-DCMAKE_WINCE_SDK=\"STANDARDSDK_500 (ARMV4I)\"", cMakeArgsFromFeatures()), $cmakeArgs);
+    buildCMakeProjectOrExit($clean, "WinCE", $prefixPath, $makeArgs, (cmakeBasedPortArguments(), cMakeArgsFromFeatures()), $cmakeArgs);
 }
 

trunk/Tools/Scripts/webkitdirs.pm

@@ -54 +54 @@
        &chdirWebKit
        &checkFrameworks
+       &cmakeBasedPortArguments
        &currentSVNRevision
        &debugSafari
@@ -1839 +1840 @@
 }
 
+sub cmakeBasedPortArguments()
+{
+    return ('-DCMAKE_WINCE_SDK="STANDARDSDK_500 (ARMV4I)"') if isWinCE();
+    return ();
+}
+
 sub promptUser
 {