Title: [114508] trunk
- Revision
- 114508
- Author
- [email protected]
- Date
- 2012-04-18 09:14:03 -0700 (Wed, 18 Apr 2012)
Log Message
[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 <[email protected]> on 2012-04-18
Reviewed by Rob Buis.
.:
* CMakeLists.txt:
Tools:
* Scripts/build-jsc:
Modified Paths
Diff
Modified: trunk/CMakeLists.txt (114507 => 114508)
--- trunk/CMakeLists.txt 2012-04-18 15:45:57 UTC (rev 114507)
+++ trunk/CMakeLists.txt 2012-04-18 16:14:03 UTC (rev 114508)
@@ -19,14 +19,6 @@
SET(ENABLE_TOOLS ON)
-OPTION(ONLY_BUILD_JAVASCRIPTCORE "only build _javascript_Core")
-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(_javascript_CORE_DIR "${CMAKE_SOURCE_DIR}/Source/_javascript_Core")
SET(WEBCORE_DIR "${CMAKE_SOURCE_DIR}/Source/WebCore")
Modified: trunk/ChangeLog (114507 => 114508)
--- trunk/ChangeLog 2012-04-18 15:45:57 UTC (rev 114507)
+++ trunk/ChangeLog 2012-04-18 16:14:03 UTC (rev 114508)
@@ -1,3 +1,18 @@
+2012-04-18 Thiago Marcos P. Santos <[email protected]>
+
+ [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 <[email protected]>
[BlackBerry] HTTP GET header has a "Cookie" when refreshing a page after cookies have been cleared.
Modified: trunk/Tools/ChangeLog (114507 => 114508)
--- trunk/Tools/ChangeLog 2012-04-18 15:45:57 UTC (rev 114507)
+++ trunk/Tools/ChangeLog 2012-04-18 16:14:03 UTC (rev 114508)
@@ -1,3 +1,18 @@
+2012-04-18 Thiago Marcos P. Santos <[email protected]>
+
+ [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 <[email protected]>
[GTK] r114021 triggered media flakyness
Modified: trunk/Tools/Scripts/build-jsc (114507 => 114508)
--- trunk/Tools/Scripts/build-jsc 2012-04-18 15:45:57 UTC (rev 114507)
+++ trunk/Tools/Scripts/build-jsc 2012-04-18 16:14:03 UTC (rev 114508)
@@ -70,7 +70,7 @@
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);
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
