[CMake] Use jsc target instead of ONLY_BUILD_JAVASCRIPTCORE

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

CMake caches ONLY_BUILD_JAVASCRIPTCORE=1 and will reuse the setting for
subsequent builds, stopping WebCore from being built ever again.

Instead of trying to emulate a build target using command line options,
just build the existing jsc target directly.

Patch by Thiago Marcos P. Santos <thiago.santos@intel.com> on 2012-04-18
Reviewed by Rob Buis.

.:

* CMakeLists.txt:

Tools:

* Scripts/build-jsc:

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c67bb69a02d9dc95268638816db4c6c22912e1a4..90ff03ab78add92e685a43c5e6238652e13e3ada 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -19,14 +19,6 @@ ENDIF ()
 
 SET(ENABLE_TOOLS ON)
 
-OPTION(ONLY_BUILD_JAVASCRIPTCORE "only build JavaScriptCore")
-IF (ONLY_BUILD_JAVASCRIPTCORE)
-    SET(ENABLE_WEBCORE OFF)
-    SET(ENABLE_WEBKIT OFF)
-    SET(ENABLE_WEBKIT2 OFF)
-    SET(ENABLE_TOOLS OFF)
-ENDIF ()
-
 SET(WTF_DIR "${CMAKE_SOURCE_DIR}/Source/WTF")
 SET(JAVASCRIPTCORE_DIR "${CMAKE_SOURCE_DIR}/Source/JavaScriptCore")
 SET(WEBCORE_DIR "${CMAKE_SOURCE_DIR}/Source/WebCore")

diff --git a/ChangeLog b/ChangeLog
index d938986095eeb1745c9824b9fdcaef2b4552384f..ad7644471651f24c548fa28c0a5de0df8374f8f3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2012-04-18  Thiago Marcos P. Santos  <thiago.santos@intel.com>
+
+        [CMake] Use jsc target instead of ONLY_BUILD_JAVASCRIPTCORE
+        https://bugs.webkit.org/show_bug.cgi?id=84229
+
+        CMake caches ONLY_BUILD_JAVASCRIPTCORE=1 and will reuse the setting for
+        subsequent builds, stopping WebCore from being built ever again.
+
+        Instead of trying to emulate a build target using command line options,
+        just build the existing jsc target directly.
+
+        Reviewed by Rob Buis.
+
+        * CMakeLists.txt:
+
 2012-04-18  Jason Liu  <jason.liu@torchmobile.com.cn>
 
         [BlackBerry] HTTP GET header has a "Cookie" when refreshing a page after cookies have been cleared.

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index e0950e00a7b751afaa063ea546df386825783178..53076d35efc054384b586f997f3465d26381f98a 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,18 @@
+2012-04-18  Thiago Marcos P. Santos  <thiago.santos@intel.com>
+
+        [CMake] Use jsc target instead of ONLY_BUILD_JAVASCRIPTCORE
+        https://bugs.webkit.org/show_bug.cgi?id=84229
+
+        CMake caches ONLY_BUILD_JAVASCRIPTCORE=1 and will reuse the setting for
+        subsequent builds, stopping WebCore from being built ever again.
+
+        Instead of trying to emulate a build target using command line options,
+        just build the existing jsc target directly.
+
+        Reviewed by Rob Buis.
+
+        * Scripts/build-jsc:
+
 2012-04-18  Simon Pena  <spena@igalia.com>
 
         [GTK] r114021 triggered media flakyness

diff --git a/Tools/Scripts/build-jsc b/Tools/Scripts/build-jsc
index 1447bbafa00ef07dc520248948d12ff04dc82c17..418f22b61cffa4d6e97673b1ba508922f73b4457 100755 (executable)
--- a/Tools/Scripts/build-jsc
+++ b/Tools/Scripts/build-jsc
@@ -70,7 +70,7 @@ if (isQt()) {
     my $result = buildQMakeProjects(\@projects, 0, @ARGV);
     exit exitStatus($result);
 } elsif (cmakeBasedPortName()) {
-    buildCMakeProjectOrExit(0, cmakeBasedPortName(), undef, undef, ("-DONLY_BUILD_JAVASCRIPTCORE=1", cmakeBasedPortArguments())); # This call only returns if nothing wrong happened
+    buildCMakeProjectOrExit(0, cmakeBasedPortName(), undef, "jsc", cmakeBasedPortArguments()); # This call only returns if nothing wrong happened
     exit exitStatus(0);
 }