Title: [221957] trunk/Source/_javascript_Core
- Revision
- 221957
- Author
- [email protected]
- Date
- 2017-09-12 21:39:48 -0700 (Tue, 12 Sep 2017)
Log Message
Rename _javascript_Core CMake unifiable sources list
https://bugs.webkit.org/show_bug.cgi?id=176823
Reviewed by Joseph Pecoraro.
This patch also changes the error message when the unified source
bundler fails to be more accurate.
* CMakeLists.txt:
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/CMakeLists.txt (221956 => 221957)
--- trunk/Source/_javascript_Core/CMakeLists.txt 2017-09-13 02:30:39 UTC (rev 221956)
+++ trunk/Source/_javascript_Core/CMakeLists.txt 2017-09-13 04:39:48 UTC (rev 221957)
@@ -46,7 +46,7 @@
"${ICU_INCLUDE_DIRS}"
)
-set(_javascript_Core_OG_SOURCES
+set(_javascript_Core_UNIFIABLE_SOURCES
API/JSBase.cpp
API/JSCTestRunnerUtils.cpp
API/JSCallbackConstructor.cpp
@@ -1016,7 +1016,7 @@
yarr/YarrSyntaxChecker.cpp
)
-foreach (_sourceFile IN LISTS _javascript_Core_OG_SOURCES)
+foreach (_sourceFile IN LISTS _javascript_Core_UNIFIABLE_SOURCES)
if (NOT (${_sourceFile} MATCHES "[.]c$"))
set_source_files_properties(${_sourceFile} PROPERTIES HEADER_FILE_ONLY ON)
list(APPEND _javascript_Core_HEADERS ${_sourceFile})
@@ -1024,17 +1024,17 @@
endforeach ()
execute_process(COMMAND ${RUBY_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/../WTF/generate-unified-source-bundles.rb
- "--derived-sources-path" ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR} ${_javascript_Core_OG_SOURCES}
+ "--derived-sources-path" ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR} ${_javascript_Core_UNIFIABLE_SOURCES}
RESULT_VARIABLE generateUnifiedSourcesResult
OUTPUT_VARIABLE generateUnifiedSourcesOutput
)
if (${generateUnifiedSourcesResult})
- message(FATAL_ERROR "unified-source-bundler.rb exited with non-zero status not appending results")
-else ()
- list(APPEND _javascript_Core_SOURCES ${generateUnifiedSourcesOutput})
+ message(FATAL_ERROR "unified-source-bundler.rb exited with non-zero status, exiting")
endif ()
+list(APPEND _javascript_Core_SOURCES ${generateUnifiedSourcesOutput})
+
# These are special files that we can't or don't want to unified source compile
list(APPEND _javascript_Core_SOURCES
runtime/ProxyObject.cpp
Modified: trunk/Source/_javascript_Core/ChangeLog (221956 => 221957)
--- trunk/Source/_javascript_Core/ChangeLog 2017-09-13 02:30:39 UTC (rev 221956)
+++ trunk/Source/_javascript_Core/ChangeLog 2017-09-13 04:39:48 UTC (rev 221957)
@@ -1,5 +1,17 @@
2017-09-12 Keith Miller <[email protected]>
+ Rename _javascript_Core CMake unifiable sources list
+ https://bugs.webkit.org/show_bug.cgi?id=176823
+
+ Reviewed by Joseph Pecoraro.
+
+ This patch also changes the error message when the unified source
+ bundler fails to be more accurate.
+
+ * CMakeLists.txt:
+
+2017-09-12 Keith Miller <[email protected]>
+
Do unified source builds for JSC
https://bugs.webkit.org/show_bug.cgi?id=176076
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
