[webkit-changes] [103418] trunk/Tools

[dbates]

Title: [103418] trunk/Tools

Revision

103418

Author

dba...@webkit.org

Date

2011-12-21 11:09:43 -0800 (Wed, 21 Dec 2011)

Log 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 _javascript_Core.

* Scripts/build-webkit:
* Scripts/webkitdirs.pm:
(cmakeBasedPortArguments): Added.

Modified Paths

• trunk/Tools/ChangeLog
• trunk/Tools/Scripts/build-webkit
• trunk/Tools/Scripts/webkitdirs.pm

Diff

Modified: trunk/Tools/ChangeLog (103417 => 103418)

--- trunk/Tools/ChangeLog	2011-12-21 19:05:26 UTC (rev 103417)
+++ trunk/Tools/ChangeLog	2011-12-21 19:09:43 UTC (rev 103418)
@@ -1,3 +1,19 @@
+2011-12-21  Daniel Bates  <dba...@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 _javascript_Core.
+
+        * Scripts/build-webkit:
+        * Scripts/webkitdirs.pm:
+        (cmakeBasedPortArguments): Added.
+
 2011-12-21  Kentaro Hara  <hara...@chromium.org>
 
         In prepare-ChangeLog, replace constant global variables with "use constant"

Modified: trunk/Tools/Scripts/build-webkit (103417 => 103418)

--- trunk/Tools/Scripts/build-webkit	2011-12-21 19:05:26 UTC (rev 103417)
+++ trunk/Tools/Scripts/build-webkit	2011-12-21 19:09:43 UTC (rev 103418)
@@ -628,11 +628,11 @@
 if (isEfl()) {
     # 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);
 }
 
 if (isBlackBerry()) {

Modified: trunk/Tools/Scripts/webkitdirs.pm (103417 => 103418)

--- trunk/Tools/Scripts/webkitdirs.pm	2011-12-21 19:05:26 UTC (rev 103417)
+++ trunk/Tools/Scripts/webkitdirs.pm	2011-12-21 19:09:43 UTC (rev 103418)
@@ -53,6 +53,7 @@
        &blackberryTargetArchitecture
        &chdirWebKit
        &checkFrameworks
+       &cmakeBasedPortArguments
        &currentSVNRevision
        &debugSafari
        &passedConfiguration
@@ -1838,6 +1839,12 @@
     exit($returnCode) if $returnCode;
 }
 
+sub cmakeBasedPortArguments()
+{
+    return ('-DCMAKE_WINCE_SDK="STANDARDSDK_500 (ARMV4I)"') if isWinCE();
+    return ();
+}
+
 sub promptUser
 {
     my ($prompt, $default) = @_;

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes