Commit a2d33a01 authored by commit-queue@webkit.org's avatar commit-queue@webkit.org
Browse files

[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: http://svn.webkit.org/repository/webkit/trunk@114508 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 49ee4cd4
......@@ -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")
......
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.
......
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
......@@ -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);
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment