[CMake] Split declaration of JSC headers into public and private
authordon.olmstead@sony.com <don.olmstead@sony.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 21 Feb 2018 22:02:03 +0000 (22:02 +0000)
committerdon.olmstead@sony.com <don.olmstead@sony.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 21 Feb 2018 22:02:03 +0000 (22:02 +0000)
https://bugs.webkit.org/show_bug.cgi?id=182980

Reviewed by Michael Catanzaro.

* CMakeLists.txt:
* PlatformGTK.cmake:
* PlatformMac.cmake:
* PlatformWPE.cmake:
* PlatformWin.cmake:

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

Source/JavaScriptCore/CMakeLists.txt
Source/JavaScriptCore/ChangeLog
Source/JavaScriptCore/PlatformGTK.cmake
Source/JavaScriptCore/PlatformMac.cmake
Source/JavaScriptCore/PlatformWPE.cmake
Source/JavaScriptCore/PlatformWin.cmake

index 94036df..71bdfbc 100644 (file)
@@ -339,28 +339,51 @@ foreach (_file ${JavaScriptCore_OBJECT_LUT_SOURCES})
     GENERATE_HASH_LUT(${CMAKE_CURRENT_SOURCE_DIR}/${_file} ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/${_name}.lut.h)
 endforeach ()
 
-set(JavaScriptCore_FORWARDING_HEADERS
-    API/APICast.h
+set(JavaScriptCore_PUBLIC_FRAMEWORK_HEADERS
     API/JSBase.h
+    API/JSContextRef.h
+    API/JSObjectRef.h
+    API/JSStringRef.h
+    API/JSTypedArray.h
+    API/JSValueRef.h
+    API/JavaScript.h
+    API/WebKitAvailability.h
+)
+
+set(JavaScriptCore_PRIVATE_FRAMEWORK_HEADERS
+    API/APICallbackFunction.h
+    API/APICast.h
+    API/APIUtils.h
+    API/JSAPIWrapperObject.h
+    API/JSBasePrivate.h
     API/JSCTestRunnerUtils.h
+    API/JSCallbackConstructor.h
+    API/JSCallbackFunction.h
+    API/JSCallbackObject.h
+    API/JSCallbackObjectFunctions.h
     API/JSClassRef.h
-    API/JSContextRef.h
+    API/JSContextInternal.h
+    API/JSContextPrivate.h
+    API/JSContextRefInspectorSupport.h
+    API/JSContextRefInternal.h
     API/JSContextRefPrivate.h
     API/JSHeapFinalizerPrivate.h
-    API/JSObjectRef.h
+    API/JSManagedValueInternal.h
+    API/JSMarkingConstraintPrivate.h
     API/JSObjectRefPrivate.h
+    API/JSRemoteInspector.h
     API/JSRetainPtr.h
-    API/JSStringRef.h
-    API/JSStringRefBSTR.h
-    API/JSStringRefCF.h
+    API/JSScriptRefPrivate.h
     API/JSStringRefPrivate.h
-    API/JSTypedArray.h
-    API/JSValueRef.h
+    API/JSValueInternal.h
+    API/JSVirtualMachineInternal.h
     API/JSWeakObjectMapRefInternal.h
-    API/JavaScript.h
-    API/JavaScriptCore.h
+    API/JSWeakObjectMapRefPrivate.h
+    API/JSWeakPrivate.h
+    API/JSWrapperMap.h
+    API/ObjCCallbackFunction.h
+    API/ObjcRuntimeExtras.h
     API/OpaqueJSString.h
-    API/WebKitAvailability.h
 
     assembler/ARM64Assembler.h
     assembler/ARMAssembler.h
@@ -1150,7 +1173,7 @@ WEBKIT_FRAMEWORK_DECLARE(JavaScriptCore)
 WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
 
 WEBKIT_MAKE_FORWARDING_HEADERS(JavaScriptCore
-    FILES ${JavaScriptCore_FORWARDING_HEADERS}
+    FILES ${JavaScriptCore_PUBLIC_FRAMEWORK_HEADERS} ${JavaScriptCore_PRIVATE_FRAMEWORK_HEADERS}
     DERIVED_SOURCE_DIRECTORIES ${DERIVED_SOURCES_DIR}/JavaScriptCore ${DERIVED_SOURCES_DIR}/JavaScriptCore/inspector
     FLATTENED
 )
index 29b3df9..fe63550 100644 (file)
@@ -1,3 +1,16 @@
+2018-02-21  Don Olmstead  <don.olmstead@sony.com>
+
+        [CMake] Split declaration of JSC headers into public and private
+        https://bugs.webkit.org/show_bug.cgi?id=182980
+
+        Reviewed by Michael Catanzaro.
+
+        * CMakeLists.txt:
+        * PlatformGTK.cmake:
+        * PlatformMac.cmake:
+        * PlatformWPE.cmake:
+        * PlatformWin.cmake:
+
 2018-02-20  Saam Barati  <sbarati@apple.com>
 
         DFG::VarargsForwardingPhase should eliminate getting argument length
index 6e8a883..6f0956c 100644 (file)
@@ -8,7 +8,7 @@ list(APPEND JavaScriptCore_PRIVATE_INCLUDE_DIRECTORIES
     "${JAVASCRIPTCORE_DIR}/inspector/remote/glib"
 )
 
-list(APPEND JavaScriptCore_FORWARDING_HEADERS
+list(APPEND JavaScriptCore_PRIVATE_FRAMEWORK_HEADERS
     inspector/remote/glib/RemoteInspectorServer.h
     inspector/remote/glib/RemoteInspectorUtils.h
 )
@@ -28,14 +28,7 @@ install(FILES "${CMAKE_BINARY_DIR}/Source/JavaScriptCore/javascriptcoregtk-${WEB
         DESTINATION "${LIB_INSTALL_DIR}/pkgconfig"
 )
 
-install(FILES API/JavaScript.h
-              API/JSBase.h
-              API/JSContextRef.h
-              API/JSObjectRef.h
-              API/JSStringRef.h
-              API/JSTypedArray.h
-              API/JSValueRef.h
-              API/WebKitAvailability.h
+install(FILES ${JavaScriptCore_PUBLIC_FRAMEWORK_HEADERS}
         DESTINATION "${WEBKITGTK_HEADER_INSTALL_DIR}/JavaScriptCore"
 )
 
index d4ded0c..d6814c4 100644 (file)
@@ -15,7 +15,17 @@ list(APPEND JavaScriptCore_PRIVATE_INCLUDE_DIRECTORIES
     ${JAVASCRIPTCORE_DIR}/inspector/remote/cocoa
 )
 
-list(APPEND JavaScriptCore_FORWARDING_HEADERS
+list(APPEND JavaScriptCore_PUBLIC_FRAMEWORK_HEADERS
+    API/JSContext.h
+    API/JSExport.h
+    API/JSManagedValue.h
+    API/JSStringRefCF.h
+    API/JSValue.h
+    API/JSVirtualMachine.h
+    API/JavaScriptCore.h
+)
+
+list(APPEND JavaScriptCore_PRIVATE_FRAMEWORK_HEADERS
     inspector/remote/cocoa/RemoteInspectorXPCConnection.h
 )
 
index d68b204..86cf212 100644 (file)
@@ -20,23 +20,12 @@ list(APPEND JavaScriptCore_SOURCES
     inspector/remote/glib/RemoteInspectorUtils.cpp
 )
 
-list(APPEND JavaScriptCore_FORWARDING_HEADERS
+list(APPEND JavaScriptCore_PRIVATE_FRAMEWORK_HEADERS
     inspector/remote/glib/RemoteInspectorServer.h
     inspector/remote/glib/RemoteInspectorUtils.h
 )
 
-set(WPE_INSTALLED_JAVASCRIPTCORE_HEADERS
-    API/JSBase.h
-    API/JSContextRef.h
-    API/JSObjectRef.h
-    API/JSStringRef.h
-    API/JSTypedArray.h
-    API/JSValueRef.h
-    API/JavaScript.h
-    API/WebKitAvailability.h
-)
-
-install(FILES ${WPE_INSTALLED_JAVASCRIPTCORE_HEADERS}
+install(FILES ${JavaScriptCore_PUBLIC_FRAMEWORK_HEADERS}
     DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/wpe-${WPE_API_VERSION}/WPE/JavaScriptCore"
     COMPONENT "Development"
 )
index 3366dbe..4730e56 100644 (file)
@@ -2,6 +2,11 @@ list(APPEND JavaScriptCore_SOURCES
     API/JSStringRefBSTR.cpp
 )
 
+list(APPEND JavaScriptCore_PUBLIC_FRAMEWORK_HEADERS
+    API/JSStringRefBSTR.h
+    API/JavaScriptCore.h
+)
+
 list(APPEND JavaScriptCore_PRIVATE_INCLUDE_DIRECTORIES
     ${CMAKE_BINARY_DIR}/../include/private
 )
@@ -11,6 +16,10 @@ if (USE_CF)
         API/JSStringRefCF.cpp
     )
 
+    list(APPEND JavaScriptCore_PUBLIC_FRAMEWORK_HEADERS
+        API/JSStringRefCF.h
+    )
+
     list(APPEND JavaScriptCore_LIBRARIES
         ${COREFOUNDATION_LIBRARY}
     )