⚠ Archived content — this site is no longer maintained.   Current WebKit documentation is at docs.webkit.org.

Changeset 273814 in webkit


Ignore:
Timestamp:
Mar 3, 2021, 8:02:09 AM (6 years ago)
Author:
don.olmstead@sony.com
Message:

[CMake] JavaScriptCore GLib headers should be copies
​https://bugs.webkit.org/show_bug.cgi?id=222625

Reviewed by Michael Catanzaro.

.:

Specify the directories for JavaScriptCore GLib headers and derived sources.

  • Source/cmake/OptionsGTK.cmake:
  • Source/cmake/OptionsWPE.cmake:

Source/JavaScriptCore:

Copy the headers rather than creating a symbolic link to structure the JavaScriptCore Glib
headers into a jsc directory. This follows the convention used in JavaScriptCore where
there are public and private headers.

The public JavaScriptCore GLib headers are copied before building JavaScriptCore. The
private JavaScriptCore were modified to include the public GLib headers through
<jsc/Header.h> rather than "Header.h" which is convention for the private C APIs in
JavaScriptCore.

APICast.h was being erroneously included in JSCClassPrivate.h because its not a
JavaScriptCore GLib header. Instead forward declarations were added to the private headers
and APICast.h was used as necessary in the .cpp files.

  • API/glib/JSCClassPrivate.h:
  • API/glib/JSCContext.cpp:
  • API/glib/JSCContextPrivate.h:
  • API/glib/JSCExceptionPrivate.h:
  • API/glib/JSCValuePrivate.h:
  • API/glib/JSCVirtualMachine.cpp:
  • API/glib/JSCVirtualMachinePrivate.h:
  • API/glib/JSCWrapperMap.cpp:
  • GLib.cmake:
  • PlatformGTK.cmake:

Source/WebKit:

Update the includes for the GLib ports.

  • PlatformGTK.cmake:
  • PlatformWPE.cmake:
  • WebProcess/InjectedBundle/API/glib/DOM/WebKitDOMNode.cpp:
  • WebProcess/InjectedBundle/API/glib/WebKitFrame.cpp:

Tools:

Update the includes for the GLib ports.

  • MiniBrowser/wpe/CMakeLists.txt:
  • TestWebKitAPI/PlatformGTK.cmake:
  • TestWebKitAPI/PlatformWPE.cmake:
  • TestWebKitAPI/Tests/JavaScriptCore/glib/TestJSC.cpp:
  • TestWebKitAPI/glib/CMakeLists.txt:
  • TestWebKitAPI/glib/PlatformGTK.cmake:
Location:
trunk
Files:
26 edited

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r273699 r273814  
     12021-03-03  Don Olmstead  <don.olmstead@sony.com>
     2
     3        [CMake] JavaScriptCore GLib headers should be copies
     4        https://bugs.webkit.org/show_bug.cgi?id=222625
     5
     6        Reviewed by Michael Catanzaro.
     7
     8        Specify the directories for JavaScriptCore GLib headers and derived sources.
     9
     10        * Source/cmake/OptionsGTK.cmake:
     11        * Source/cmake/OptionsWPE.cmake:
     12
    1132021-03-01  Per Arne  <pvollan@apple.com>
    214

  • trunk/Source/JavaScriptCore/API/glib/JSCClassPrivate.h

    r245514 r273814  
    2020#pragma once
    2121
    22 #include "APICast.h"
    23 #include "JSCClass.h"
    24 #include "JSCContext.h"
    25 #include "JSCValue.h"
     22#include <jsc/JSCClass.h>
     23#include <jsc/JSCContext.h>
     24#include <jsc/JSCValue.h>
    2625#include <wtf/glib/GRefPtr.h>
     26
     27namespace JSC {
     28class JSObject;
     29}
     30
     31typedef struct OpaqueJSClass* JSClassRef;
     32typedef struct OpaqueJSContext* JSGlobalContextRef;
    2733
    2834GRefPtr<JSCClass> jscClassCreate(JSCContext*, const char*, JSCClass*, JSCClassVTable*, GDestroyNotify);

  • trunk/Source/JavaScriptCore/API/glib/JSCContext.cpp

    r264304 r273814  
    2121#include "JSCContext.h"
    2222
     23#include "APICast.h"
    2324#include "JSCClassPrivate.h"
    2425#include "JSCContextPrivate.h"

  • trunk/Source/JavaScriptCore/API/glib/JSCContextPrivate.h

    r261014 r273814  
    2020#pragma once
    2121
    22 #include "APICast.h"
    23 #include "JSCContext.h"
    24 #include "JSCValue.h"
    25 #include "JSContextRef.h"
     22#include <jsc/JSCContext.h>
     23#include <jsc/JSCValue.h>
    2624#include <wtf/glib/GRefPtr.h>
     25
     26namespace JSC {
     27class JSObject;
     28}
     29
     30typedef struct OpaqueJSClass* JSClassRef;
     31typedef struct OpaqueJSContext* JSGlobalContextRef;
     32typedef const struct OpaqueJSValue* JSValueRef;
     33typedef struct OpaqueJSValue* JSObjectRef;
    2734
    2835JS_EXPORT_PRIVATE GRefPtr<JSCContext> jscContextGetOrCreate(JSGlobalContextRef);

  • trunk/Source/JavaScriptCore/API/glib/JSCExceptionPrivate.h

    r229798 r273814  
    2020#pragma once
    2121
    22 #include "JSCContext.h"
    23 #include "JSCException.h"
     22#include <jsc/JSCContext.h>
     23#include <jsc/JSCException.h>
    2424#include <wtf/glib/GRefPtr.h>
    2525

  • trunk/Source/JavaScriptCore/API/glib/JSCValuePrivate.h

    r261014 r273814  
    2020#pragma once
    2121
    22 #include "JSCValue.h"
     22#include <jsc/JSCValue.h>
    2323
    2424JS_EXPORT_PRIVATE JSValueRef jscValueGetJSValue(JSCValue*);

  • trunk/Source/JavaScriptCore/API/glib/JSCVirtualMachine.cpp

    r265276 r273814  
    2323#include "JSCContextPrivate.h"
    2424#include "JSCVirtualMachinePrivate.h"
     25#include "JSContextRef.h"
    2526#include <wtf/HashMap.h>
    2627#include <wtf/NeverDestroyed.h>

  • trunk/Source/JavaScriptCore/API/glib/JSCVirtualMachinePrivate.h

    r229798 r273814  
    2020#pragma once
    2121
    22 #include "JSCContext.h"
    23 #include "JSCVirtualMachine.h"
     22#include <jsc/JSCContext.h>
     23#include <jsc/JSCVirtualMachine.h>
    2424#include <wtf/glib/GRefPtr.h>
     25
     26typedef const struct OpaqueJSContextGroup* JSContextGroupRef;
    2527
    2628GRefPtr<JSCVirtualMachine> jscVirtualMachineGetOrCreate(JSContextGroupRef);

  • trunk/Source/JavaScriptCore/API/glib/JSCWrapperMap.cpp

    r251425 r273814  
    3030#include "JSCValuePrivate.h"
    3131#include "JSCallbackObject.h"
     32#include "JSContextRef.h"
    3233
    3334namespace JSC {

  • trunk/Source/JavaScriptCore/ChangeLog

    r273813 r273814  
     12021-03-03  Don Olmstead  <don.olmstead@sony.com>
     2
     3        [CMake] JavaScriptCore GLib headers should be copies
     4        https://bugs.webkit.org/show_bug.cgi?id=222625
     5
     6        Reviewed by Michael Catanzaro.
     7
     8        Copy the headers rather than creating a symbolic link to structure the JavaScriptCore Glib
     9        headers into a jsc directory. This follows the convention used in JavaScriptCore where
     10        there are public and private headers.
     11
     12        The public JavaScriptCore GLib headers are copied before building JavaScriptCore. The
     13        private JavaScriptCore were modified to include the public GLib headers through
     14        <jsc/Header.h> rather than "Header.h" which is convention for the private C APIs in
     15        JavaScriptCore.
     16
     17        APICast.h was being erroneously included in JSCClassPrivate.h because its not a
     18        JavaScriptCore GLib header. Instead forward declarations were added to the private headers
     19        and APICast.h was used as necessary in the .cpp files.
     20
     21        * API/glib/JSCClassPrivate.h:
     22        * API/glib/JSCContext.cpp:
     23        * API/glib/JSCContextPrivate.h:
     24        * API/glib/JSCExceptionPrivate.h:
     25        * API/glib/JSCValuePrivate.h:
     26        * API/glib/JSCVirtualMachine.cpp:
     27        * API/glib/JSCVirtualMachinePrivate.h:
     28        * API/glib/JSCWrapperMap.cpp:
     29        * GLib.cmake:
     30        * PlatformGTK.cmake:
     31
    1322021-03-03  Dmitry Bezhetskov  <dbezhetskov@igalia.com>
    233

  • trunk/Source/JavaScriptCore/GLib.cmake

    r240431 r273814  
    1 file(MAKE_DIRECTORY ${FORWARDING_HEADERS_DIR}/JavaScriptCore/glib)
    2 file(MAKE_DIRECTORY ${DERIVED_SOURCES_JAVASCRIPCORE_GLIB_API_DIR})
    3 
    41list(APPEND JavaScriptCore_SOURCES
    52    API/glib/JSAPIWrapperGlobalObject.cpp
    … …  
    1714)
    1815
     16list(APPEND JavaScriptCore_INCLUDE_DIRECTORIES
     17    "${JavaScriptCoreGLib_FRAMEWORK_HEADERS_DIR}"
     18)
     19
    1920list(APPEND JavaScriptCore_PRIVATE_INCLUDE_DIRECTORIES
    20     "${FORWARDING_HEADERS_DIR}/JavaScriptCore/glib"
    21     "${DERIVED_SOURCES_JAVASCRIPCORE_GLIB_API_DIR}"
     21    "${JavaScriptCoreGLib_DERIVED_SOURCES_DIR}"
    2222    "${JAVASCRIPTCORE_DIR}/API/glib"
    2323)
    2424
     25configure_file(API/glib/JSCVersion.h.in ${JavaScriptCoreGLib_DERIVED_SOURCES_DIR}/JSCVersion.h)
     26
     27set(JavaScriptCoreGLib_FRAMEWORK_HEADERS
     28    ${JavaScriptCoreGLib_DERIVED_SOURCES_DIR}/JSCVersion.h
     29
     30    API/glib/JSCAutocleanups.h
     31    API/glib/JSCClass.h
     32    API/glib/JSCContext.h
     33    API/glib/JSCDefines.h
     34    API/glib/JSCException.h
     35    API/glib/JSCOptions.h
     36    API/glib/JSCValue.h
     37    API/glib/JSCVirtualMachine.h
     38    API/glib/JSCWeakValue.h
     39    API/glib/jsc.h
     40)
     41
     42WEBKIT_COPY_FILES(JavaScriptCoreGLib_CopyHeaders
     43    DESTINATION ${JavaScriptCoreGLib_FRAMEWORK_HEADERS_DIR}/jsc
     44    FILES ${JavaScriptCoreGLib_FRAMEWORK_HEADERS}
     45    FLATTENED
     46)
     47list(APPEND JavaScriptCore_DEPENDENCIES JavaScriptCoreGLib_CopyHeaders)
     48
     49set(JavaScriptCoreGLib_PRIVATE_FRAMEWORK_HEADERS
     50    API/glib/JSCContextPrivate.h
     51    API/glib/JSCValuePrivate.h
     52)
     53WEBKIT_COPY_FILES(JavaScriptCoreGLib_CopyPrivateHeaders
     54    DESTINATION ${JavaScriptCoreGLib_PRIVATE_FRAMEWORK_HEADERS_DIR}/jsc
     55    FILES ${JavaScriptCoreGLib_PRIVATE_FRAMEWORK_HEADERS}
     56    FLATTENED
     57)
     58
     59list(APPEND JavaScriptCore_INTERFACE_INCLUDE_DIRECTORIES
     60    ${JavaScriptCoreGLib_FRAMEWORK_HEADERS_DIR}
     61    ${JavaScriptCoreGLib_PRIVATE_FRAMEWORK_HEADERS_DIR}
     62)
     63list(APPEND JavaScriptCore_INTERFACE_DEPENDENCIES
     64    JavaScriptCoreGLib_CopyHeaders
     65    JavaScriptCoreGLib_CopyPrivateHeaders
     66)
     67
    2568set(JavaScriptCore_INSTALLED_HEADERS
    26     ${DERIVED_SOURCES_JAVASCRIPCORE_GLIB_API_DIR}/JSCVersion.h
     69    ${JavaScriptCoreGLib_DERIVED_SOURCES_DIR}/JSCVersion.h
    2770    ${JAVASCRIPTCORE_DIR}/API/glib/JSCAutocleanups.h
    2871    ${JAVASCRIPTCORE_DIR}/API/glib/JSCClass.h
    … …  
    3679    ${JAVASCRIPTCORE_DIR}/API/glib/jsc.h
    3780)
    38 
    39 configure_file(API/glib/JSCVersion.h.in ${DERIVED_SOURCES_JAVASCRIPCORE_GLIB_API_DIR}/JSCVersion.h)
    40 
    41 # These symbolic link allows includes like #include <jsc/jsc.h> which simulates installed headers.
    42 add_custom_command(
    43     OUTPUT ${FORWARDING_HEADERS_DIR}/JavaScriptCore/glib/jsc
    44     DEPENDS ${JAVASCRIPTCORE_DIR}/API/glib
    45     COMMAND ln -n -s -f ${JAVASCRIPTCORE_DIR}/API/glib ${FORWARDING_HEADERS_DIR}/JavaScriptCore/glib/jsc
    46     VERBATIM
    47 )
    48 add_custom_target(JSC-fake-api-headers
    49     DEPENDS ${FORWARDING_HEADERS_DIR}/JavaScriptCore/glib/jsc
    50 )
    51 set(JavaScriptCore_EXTRA_DEPENDENCIES
    52     JSC-fake-api-headers
    53 )

  • trunk/Source/JavaScriptCore/PlatformGTK.cmake

    r271608 r273814  
    33
    44set(JavaScriptCore_OUTPUT_NAME javascriptcoregtk-${WEBKITGTK_API_VERSION})
    5 
    6 list(APPEND JavaScriptCore_PRIVATE_INCLUDE_DIRECTORIES
    7     "${DERIVED_SOURCES_JAVASCRIPCOREGTK_DIR}"
    8 )
    95
    106configure_file(javascriptcoregtk.pc.in ${JavaScriptCore_PKGCONFIG_FILE} @ONLY)
    … …  
    8884            -I${CMAKE_SOURCE_DIR}/Source
    8985            -I${JAVASCRIPTCORE_DIR}
    90             -I${DERIVED_SOURCES_JAVASCRIPCOREGTK_DIR}
    91             -I${FORWARDING_HEADERS_DIR}/JavaScriptCore/glib
     86            -I${JavaScriptCoreGLib_FRAMEWORK_HEADERS_DIR}
     87            -I${JavaScriptCoreGLib_PRIVATE_FRAMEWORK_HEADERS_DIR}
    9288            ${JavaScriptCore_INSTALLED_HEADERS}
    9389            ${JAVASCRIPTCORE_DIR}/API/glib/*.cpp
    … …  
    112108    "cflags=-I${CMAKE_SOURCE_DIR}/Source\n"
    113109    "       -I${JAVASCRIPTCORE_DIR}/API/glib\n"
    114     "       -I${DERIVED_SOURCES_JAVASCRIPCOREGTK_DIR}\n"
    115     "       -I${FORWARDING_HEADERS_DIR}/JavaScriptCore/glib\n"
     110    "       -I${JavaScriptCoreGLib_FRAMEWORK_HEADERS_DIR}\n"
     111    "       -I${JavaScriptCoreGLib_PRIVATE_FRAMEWORK_HEADERS_DIR}\n"
    116112    "doc_dir=${JAVASCRIPTCORE_DIR}/API/glib/docs\n"
    117113    "source_dirs=${JAVASCRIPTCORE_DIR}/API/glib\n"

  • trunk/Source/WebKit/ChangeLog

    r273784 r273814  
     12021-03-03  Don Olmstead  <don.olmstead@sony.com>
     2
     3        [CMake] JavaScriptCore GLib headers should be copies
     4        https://bugs.webkit.org/show_bug.cgi?id=222625
     5
     6        Reviewed by Michael Catanzaro.
     7
     8        Update the includes for the GLib ports.
     9
     10        * PlatformGTK.cmake:
     11        * PlatformWPE.cmake:
     12        * WebProcess/InjectedBundle/API/glib/DOM/WebKitDOMNode.cpp:
     13        * WebProcess/InjectedBundle/API/glib/WebKitFrame.cpp:
     14
    1152021-03-02  Myles C. Maxfield  <mmaxfield@apple.com>
    216

  • trunk/Source/WebKit/PlatformGTK.cmake

    r272574 r273814  
    407407
    408408list(APPEND WebKit_INCLUDE_DIRECTORIES
    409     "${DERIVED_SOURCES_JAVASCRIPCOREGTK_DIR}"
    410     "${FORWARDING_HEADERS_DIR}/JavaScriptCore/"
    411     "${FORWARDING_HEADERS_DIR}/JavaScriptCore/glib"
    412409    "${WEBKIT_DIR}/NetworkProcess/glib"
    413410    "${WEBKIT_DIR}/NetworkProcess/gtk"
    … …  
    705702            -I${DERIVED_SOURCES_DIR}
    706703            -I${DERIVED_SOURCES_WEBKIT2GTK_DIR}
    707             -I${DERIVED_SOURCES_JAVASCRIPCOREGTK_DIR}
     704            -I${JavaScriptCoreGLib_FRAMEWORK_HEADERS_DIR}
     705            -I${JavaScriptCoreGLib_PRIVATE_FRAMEWORK_HEADERS_DIR}
    708706            -I${FORWARDING_HEADERS_DIR}
    709             -I${FORWARDING_HEADERS_DIR}/JavaScriptCore/glib
    710707            -I${FORWARDING_HEADERS_WEBKIT2GTK_DIR}
    711708            -I${FORWARDING_HEADERS_WEBKIT2GTK_VERSIONED_DIR}
    … …  
    753750            -I${DERIVED_SOURCES_DIR}
    754751            -I${DERIVED_SOURCES_WEBKIT2GTK_DIR}
    755             -I${DERIVED_SOURCES_JAVASCRIPCOREGTK_DIR}
     752            -I${JavaScriptCoreGLib_FRAMEWORK_HEADERS_DIR}
     753            -I${JavaScriptCoreGLib_PRIVATE_FRAMEWORK_HEADERS_DIR}
    756754            -I${FORWARDING_HEADERS_DIR}
    757             -I${FORWARDING_HEADERS_DIR}/JavaScriptCore/glib
    758755            -I${FORWARDING_HEADERS_WEBKIT2GTK_DIR}
    759756            -I${FORWARDING_HEADERS_WEBKIT2GTK_VERSIONED_DIR}

  • trunk/Source/WebKit/PlatformWPE.cmake

    r272643 r273814  
    1111file(MAKE_DIRECTORY ${FORWARDING_HEADERS_WPE_EXTENSION_DIR})
    1212file(MAKE_DIRECTORY ${FORWARDING_HEADERS_WPE_DOM_DIR})
    13 file(MAKE_DIRECTORY ${FORWARDING_HEADERS_WPE_JSC_DIR})
    1413
    1514configure_file(UIProcess/API/wpe/WebKitVersion.h.in ${DERIVED_SOURCES_WPE_API_DIR}/WebKitVersion.h)
    … …  
    5756)
    5857
    59 add_custom_command(
    60     OUTPUT ${FORWARDING_HEADERS_WPE_JSC_DIR}/jsc
    61     DEPENDS ${JAVASCRIPTCORE_DIR}/API/glib/
    62     COMMAND ln -n -s -f ${JAVASCRIPTCORE_DIR}/API/glib ${FORWARDING_HEADERS_WPE_JSC_DIR}/jsc
    63     VERBATIM
    64 )
    65 
    6658add_custom_target(webkitwpe-fake-api-headers
    6759    DEPENDS ${FORWARDING_HEADERS_WPE_DIR}/wpe
    6860            ${FORWARDING_HEADERS_WPE_EXTENSION_DIR}/wpe
    6961            ${FORWARDING_HEADERS_WPE_DOM_DIR}/wpe
    70             ${FORWARDING_HEADERS_WPE_JSC_DIR}/jsc
    7162)
    7263
    … …  
    256247
    257248list(APPEND WebKit_INCLUDE_DIRECTORIES
    258     "${DERIVED_SOURCES_JAVASCRIPCOREWPE_DIR}"
    259     "${FORWARDING_HEADERS_DIR}"
    260     "${FORWARDING_HEADERS_DIR}/JavaScriptCore/"
    261     "${FORWARDING_HEADERS_DIR}/JavaScriptCore/glib"
    262249    "${FORWARDING_HEADERS_WPE_DIR}"
    263250    "${FORWARDING_HEADERS_WPE_EXTENSION_DIR}"
    264251    "${FORWARDING_HEADERS_WPE_DOM_DIR}"
    265     "${DERIVED_SOURCES_DIR}"
    266252    "${DERIVED_SOURCES_WPE_API_DIR}"
    267253    "${WEBKIT_DIR}/NetworkProcess/glib"
    … …  
    299285    "${WEBKIT_DIR}/WebProcess/WebPage/libwpe"
    300286    "${WEBKIT_DIR}/WebProcess/WebPage/wpe"
    301     "${WTF_DIR}/wtf/gtk/"
    302     "${WTF_DIR}/wtf/gobject"
    303     "${WTF_DIR}"
    304287)
    305288
    … …  
    446429        ${CMAKE_BINARY_DIR}
    447430        ${GLIB_INCLUDE_DIRS}
    448         ${Qt5_INCLUDE_DIRS}
    449         ${Qt5Gui_PRIVATE_INCLUDE_DIRS}
     431        ${JavaScriptCoreGLib_FRAMEWORK_HEADERS_DIR}
    450432        ${LIBEPOXY_INCLUDE_DIRS}
    451433        ${LIBSOUP_INCLUDE_DIRS}
     434        ${Qt5Gui_PRIVATE_INCLUDE_DIRS}
     435        ${Qt5_INCLUDE_DIRS}
     436        ${WPEBACKEND_FDO_INCLUDE_DIRS}
    452437        ${WPE_INCLUDE_DIRS}
    453         ${WPEBACKEND_FDO_INCLUDE_DIRS}
    454438    )
    455439

  • trunk/Source/WebKit/WebProcess/InjectedBundle/API/glib/DOM/WebKitDOMNode.cpp

    r249175 r273814  
    2424#include "WebKitDOMNodePrivate.h"
    2525#include "WebKitDOMPrivate.h"
     26#include <JavaScriptCore/APICast.h>
    2627#include <WebCore/JSNode.h>
    2728#include <jsc/JSCContextPrivate.h>

  • trunk/Source/WebKit/WebProcess/InjectedBundle/API/glib/WebKitFrame.cpp

    r251425 r273814  
    2424#include "WebKitFramePrivate.h"
    2525#include "WebKitScriptWorldPrivate.h"
     26#include <JavaScriptCore/APICast.h>
    2627#include <JavaScriptCore/JSGlobalObjectInlines.h>
    2728#include <JavaScriptCore/JSLock.h>

  • trunk/Source/cmake/OptionsGTK.cmake

    r273552 r273814  
    422422set(DERIVED_SOURCES_WEBKIT2GTK_DIR ${DERIVED_SOURCES_DIR}/webkit2gtk)
    423423set(DERIVED_SOURCES_WEBKIT2GTK_API_DIR ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/webkit2)
    424 set(DERIVED_SOURCES_JAVASCRIPCOREGTK_DIR ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/javascriptcoregtk)
    425 set(DERIVED_SOURCES_JAVASCRIPCORE_GLIB_API_DIR ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/javascriptcoregtk/jsc)
    426424set(FORWARDING_HEADERS_WEBKIT2GTK_DIR ${FORWARDING_HEADERS_DIR}/webkit2gtk)
    427425set(FORWARDING_HEADERS_WEBKIT2GTK_VERSIONED_DIR ${FORWARDING_HEADERS_DIR}/webkit2gtk-${WEBKITGTK_API_VERSION})
    428426set(FORWARDING_HEADERS_WEBKIT2GTK_EXTENSION_DIR ${FORWARDING_HEADERS_DIR}/webkit2gtk-webextension)
     427
     428set(JavaScriptCoreGLib_FRAMEWORK_HEADERS_DIR ${CMAKE_BINARY_DIR}/JavaScriptCoreGLib/Headers)
     429set(JavaScriptCoreGLib_PRIVATE_FRAMEWORK_HEADERS_DIR ${CMAKE_BINARY_DIR}/JavaScriptCoreGLib/PrivateHeaders)
     430set(JavaScriptCoreGLib_DERIVED_SOURCES_DIR ${CMAKE_BINARY_DIR}/JavaScriptCoreGLib/DerivedSources)
    429431
    430432set(JavaScriptCore_PKGCONFIG_FILE ${CMAKE_BINARY_DIR}/Source/JavaScriptCore/javascriptcoregtk-${WEBKITGTK_API_VERSION}.pc)

  • trunk/Source/cmake/OptionsWPE.cmake

    r273549 r273814  
    262262set(FORWARDING_HEADERS_WPE_EXTENSION_DIR ${FORWARDING_HEADERS_DIR}/wpe-webextension)
    263263set(FORWARDING_HEADERS_WPE_DOM_DIR ${FORWARDING_HEADERS_DIR}/wpe-dom)
    264 set(FORWARDING_HEADERS_WPE_JSC_DIR ${FORWARDING_HEADERS_DIR}/wpe-jsc)
    265 set(DERIVED_SOURCES_JAVASCRIPCOREWPE_DIR ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/javascriptcorewpe)
    266 set(DERIVED_SOURCES_JAVASCRIPCORE_GLIB_API_DIR ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/javascriptcorewpe/jsc)
    267264set(DERIVED_SOURCES_WPE_API_DIR ${DERIVED_SOURCES_WEBKIT_DIR}/wpe)
    268265
    … …  
    270267set(WPEWebExtension_PKGCONFIG_FILE ${CMAKE_BINARY_DIR}/wpe-web-extension-${WPE_API_VERSION}.pc)
    271268
     269set(JavaScriptCoreGLib_FRAMEWORK_HEADERS_DIR ${CMAKE_BINARY_DIR}/JavaScriptCoreGLib/Headers)
     270set(JavaScriptCoreGLib_PRIVATE_FRAMEWORK_HEADERS_DIR ${CMAKE_BINARY_DIR}/JavaScriptCoreGLib/PrivateHeaders)
     271set(JavaScriptCoreGLib_DERIVED_SOURCES_DIR ${CMAKE_BINARY_DIR}/JavaScriptCoreGLib/DerivedSources)
     272
    272273include(BubblewrapSandboxChecks)
    273274include(GStreamerChecks)

  • trunk/Tools/ChangeLog

    r273784 r273814  
     12021-03-03  Don Olmstead  <don.olmstead@sony.com>
     2
     3        [CMake] JavaScriptCore GLib headers should be copies
     4        https://bugs.webkit.org/show_bug.cgi?id=222625
     5
     6        Reviewed by Michael Catanzaro.
     7
     8        Update the includes for the GLib ports.
     9
     10        * MiniBrowser/wpe/CMakeLists.txt:
     11        * TestWebKitAPI/PlatformGTK.cmake:
     12        * TestWebKitAPI/PlatformWPE.cmake:
     13        * TestWebKitAPI/Tests/JavaScriptCore/glib/TestJSC.cpp:
     14        * TestWebKitAPI/glib/CMakeLists.txt:
     15        * TestWebKitAPI/glib/PlatformGTK.cmake:
     16
    1172021-03-02  Myles C. Maxfield  <mmaxfield@apple.com>
    218

  • trunk/Tools/MiniBrowser/wpe/CMakeLists.txt

    r265492 r273814  
    55set(MiniBrowser_PRIVATE_INCLUDE_DIRECTORIES
    66    ${CMAKE_BINARY_DIR}
    7     ${TOOLS_DIR}/wpe/backends/
     7    ${CMAKE_BINARY_DIR}/DerivedSources/WPEToolingBackends
    88    ${DERIVED_SOURCES_WPE_API_DIR}
    99    ${FORWARDING_HEADERS_WPE_DIR}
    10     ${CMAKE_BINARY_DIR}/DerivedSources/WPEToolingBackends
     10    ${JavaScriptCoreGLib_FRAMEWORK_HEADERS_DIR}
     11    ${TOOLS_DIR}/wpe/backends/
    1112)
    1213

  • trunk/Tools/TestWebKitAPI/PlatformGTK.cmake

    r273236 r273814  
    109109    ${TESTWEBKITAPI_DIR}
    110110    ${THIRDPARTY_DIR}/gtest/include
    111     ${FORWARDING_HEADERS_DIR}
    112     ${FORWARDING_HEADERS_DIR}/JavaScriptCore
    113     ${FORWARDING_HEADERS_DIR}/JavaScriptCore/glib
    114     ${DERIVED_SOURCES_JAVASCRIPCOREGTK_DIR}
    115111)
    116112

  • trunk/Tools/TestWebKitAPI/PlatformWPE.cmake

    r273551 r273814  
    108108    ${TESTWEBKITAPI_DIR}
    109109    ${THIRDPARTY_DIR}/gtest/include
    110     ${FORWARDING_HEADERS_DIR}
    111     ${FORWARDING_HEADERS_DIR}/JavaScriptCore
    112     ${FORWARDING_HEADERS_DIR}/JavaScriptCore/glib
    113     ${DERIVED_SOURCES_JAVASCRIPCOREWPE_DIR}
    114110)
    115111

  • trunk/Tools/TestWebKitAPI/Tests/JavaScriptCore/glib/TestJSC.cpp

    r272139 r273814  
    2525#undef JSC_COMPILATION
    2626
     27#include <JavaScriptCore/JSContextRef.h>
    2728#include <jsc/jsc.h>
    2829#include <wtf/HashSet.h>
    … …  
    3132#include <wtf/glib/GRefPtr.h>
    3233#include <wtf/glib/GUniquePtr.h>
     34#include <wtf/text/CString.h>
    3335
    3436class LeakChecker {

  • trunk/Tools/TestWebKitAPI/glib/CMakeLists.txt

    r271346 r273814  
    99    ${CMAKE_BINARY_DIR}
    1010    ${FORWARDING_HEADERS_DIR}
     11    ${JavaScriptCoreGLib_FRAMEWORK_HEADERS_DIR}
    1112    ${TOOLS_DIR}/TestWebKitAPI/Tests/WebKitGLib
    1213    ${TOOLS_DIR}/TestWebKitAPI/glib/WebKitGLib

  • trunk/Tools/TestWebKitAPI/glib/PlatformGTK.cmake

    r260752 r273814  
    77
    88list(APPEND WebKitGLibAPITests_INCLUDE_DIRECTORIES
    9     ${DERIVED_SOURCES_JAVASCRIPCOREGTK_DIR}
    109    ${DERIVED_SOURCES_WEBKIT2GTK_DIR}
    1110    ${FORWARDING_HEADERS_WEBKIT2GTK_DIR}
Note: See TracChangeset for help on using the changeset viewer.