Rename JavaScriptCore CMake unifiable sources list
authorkeith_miller@apple.com <keith_miller@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 13 Sep 2017 04:39:48 +0000 (04:39 +0000)
committerkeith_miller@apple.com <keith_miller@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 13 Sep 2017 04:39:48 +0000 (04:39 +0000)
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:

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

Source/JavaScriptCore/CMakeLists.txt
Source/JavaScriptCore/ChangeLog

index debcac8..69bb36e 100644 (file)
@@ -46,7 +46,7 @@ set(JavaScriptCore_SYSTEM_INCLUDE_DIRECTORIES
     "${ICU_INCLUDE_DIRS}"
 )
 
-set(JavaScriptCore_OG_SOURCES
+set(JavaScriptCore_UNIFIABLE_SOURCES
     API/JSBase.cpp
     API/JSCTestRunnerUtils.cpp
     API/JSCallbackConstructor.cpp
@@ -1016,7 +1016,7 @@ set(JavaScriptCore_OG_SOURCES
     yarr/YarrSyntaxChecker.cpp
 )
 
-foreach (_sourceFile IN LISTS JavaScriptCore_OG_SOURCES)
+foreach (_sourceFile IN LISTS JavaScriptCore_UNIFIABLE_SOURCES)
     if (NOT (${_sourceFile} MATCHES "[.]c$"))
         set_source_files_properties(${_sourceFile} PROPERTIES HEADER_FILE_ONLY ON)
         list(APPEND JavaScriptCore_HEADERS ${_sourceFile})
@@ -1024,17 +1024,17 @@ foreach (_sourceFile IN LISTS JavaScriptCore_OG_SOURCES)
 endforeach ()
 
 execute_process(COMMAND ${RUBY_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/../WTF/generate-unified-source-bundles.rb
-  "--derived-sources-path" ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR} ${JavaScriptCore_OG_SOURCES}
+  "--derived-sources-path" ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR} ${JavaScriptCore_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 JavaScriptCore_SOURCES ${generateUnifiedSourcesOutput})
+    message(FATAL_ERROR "unified-source-bundler.rb exited with non-zero status, exiting")
 endif ()
 
+list(APPEND JavaScriptCore_SOURCES ${generateUnifiedSourcesOutput})
+
 # These are special files that we can't or don't want to unified source compile
 list(APPEND JavaScriptCore_SOURCES
     runtime/ProxyObject.cpp
index b88d682..a7d404f 100644 (file)
@@ -1,5 +1,17 @@
 2017-09-12  Keith Miller  <keith_miller@apple.com>
 
+        Rename JavaScriptCore 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  <keith_miller@apple.com>
+
         Do unified source builds for JSC
         https://bugs.webkit.org/show_bug.cgi?id=176076