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

Changeset 181601 in webkit


Ignore:
Timestamp:
Mar 16, 2015, 5:29:55 PM (11 years ago)
Author:
achristensen@apple.com
Message:

Progress towards CMake on Mac
​https://bugs.webkit.org/show_bug.cgi?id=142747

Reviewed by Chris Dumez.

Source/JavaScriptCore:

  • CMakeLists.txt:

Include AugmentableInspectorController.h in CMake build.

Source/WebCore:

  • CMakeLists.txt:
  • PlatformMac.cmake:

Added more directories, interfaces, and forwarding headers.
Temporarily disabled the generating of ObjC bindings in CMake builds.

  • platform/mac/PasteboardMac.mm:

Removed unused include.

Source/WebKit2:

  • PlatformMac.cmake:

Started adding Mac-specific directories and headers.

Location:
trunk/Source
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/JavaScriptCore/CMakeLists.txt

    r181458 r181601  
    1616    "${JAVASCRIPTCORE_DIR}/inspector"
    1717    "${JAVASCRIPTCORE_DIR}/inspector/agents"
     18    "${JAVASCRIPTCORE_DIR}/inspector/augmentable"
    1819    "${JAVASCRIPTCORE_DIR}/inspector/remote"
    1920    "${JAVASCRIPTCORE_DIR}/interpreter"
    … …  
    903904    inspector
    904905    inspector/agents
     906    inspector/augmentable
    905907    inspector/remote
    906908    interpreter
    … …  
    965967    assembler/MacroAssemblerCodeRef.h
    966968
     969    inspector/augmentable/AugmentableInspectorController.h
     970
    967971    inspector/remote/RemoteInspector.h
    968972    inspector/remote/RemoteInspectorConstants.h

  • trunk/Source/JavaScriptCore/ChangeLog

    r181570 r181601  
     12015-03-16  Alex Christensen  <achristensen@webkit.org>
     2
     3        Progress towards CMake on Mac
     4        https://bugs.webkit.org/show_bug.cgi?id=142747
     5
     6        Reviewed by Chris Dumez.
     7
     8        * CMakeLists.txt:
     9        Include AugmentableInspectorController.h in CMake build.
     10
    1112015-03-16  Csaba Osztrogonác  <ossy@webkit.org>
    212

  • trunk/Source/WebCore/CMakeLists.txt

    r181571 r181601  
    8181    "${WEBCORE_DIR}/platform/mediastream"
    8282    "${WEBCORE_DIR}/platform/mock"
     83    "${WEBCORE_DIR}/platform/mock/mediasource"
    8384    "${WEBCORE_DIR}/platform/network"
    8485    "${WEBCORE_DIR}/platform/sql"
    … …  
    575576    html/canvas/WebGLVertexArrayObject.idl
    576577    html/canvas/WebGLVertexArrayObjectOES.idl
     578
     579    html/track/AudioTrack.idl
     580    html/track/AudioTrackList.idl
     581    html/track/DataCue.idl
     582    html/track/TextTrack.idl
     583    html/track/TextTrackCue.idl
     584    html/track/TextTrackCueList.idl
     585    html/track/TextTrackList.idl
     586    html/track/TrackEvent.idl
     587    html/track/VTTCue.idl
     588    html/track/VTTRegion.idl
     589    html/track/VTTRegionList.idl
     590    html/track/VideoTrack.idl
     591    html/track/VideoTrackList.idl
    577592
    578593    inspector/CommandLineAPIHost.idl
    … …  
    31433158    testing/MallocStatistics.idl
    31443159    testing/MemoryInfo.idl
     3160    testing/MockContentFilterSettings.idl
    31453161    testing/TypeConversions.idl
    31463162)

  • trunk/Source/WebCore/ChangeLog

    r181600 r181601  
     12015-03-16  Alex Christensen  <achristensen@webkit.org>
     2
     3        Progress towards CMake on Mac
     4        https://bugs.webkit.org/show_bug.cgi?id=142747
     5
     6        Reviewed by Chris Dumez.
     7
     8        * CMakeLists.txt:
     9        * PlatformMac.cmake:
     10        Added more directories, interfaces, and forwarding headers.
     11        Temporarily disabled the generating of ObjC bindings in CMake builds.
     12        * platform/mac/PasteboardMac.mm:
     13        Removed unused include.
     14
    1152015-03-16  Joanmarie Diggs  <jdiggs@igalia.com>
    216

  • trunk/Source/WebCore/PlatformMac.cmake

    r181496 r181601  
    33    "${WEBCORE_DIR}/bindings/objc"
    44    "${WEBCORE_DIR}/bridge/objc"
     5    "${WEBCORE_DIR}/editing/mac"
    56    "${WEBCORE_DIR}/loader/archive/cf"
    67    "${WEBCORE_DIR}/loader/cf"
    … …  
    145146    platform/mac/WebCoreObjCExtras.mm
    146147    platform/mac/WebCoreSystemInterface.mm
    147     platform/mac/WebCoreView.m
    148148    platform/mac/WebNSAttributedStringExtras.mm
    149149    platform/mac/WebVideoFullscreenController.mm
    … …  
    210210
    211211set(WebCore_FORWARDING_HEADERS_FILES
     212    bindings/js/SerializedScriptValue.h
     213    bindings/objc/WebKitAvailability.h
     214
     215    bridge/IdentifierRep.h
     216    bridge/npruntime_internal.h
     217
     218    contentextensions/CompiledContentExtension.h
     219
     220    editing/FindOptions.h
     221
    212222    html/HTMLMediaElement.h
    213     bindings/objc/WebKitAvailability.h
     223
     224    loader/FrameLoaderTypes.h
     225    loader/LoaderStrategy.h
     226    loader/ResourceLoaderOptions.h
     227
     228    Modules/indexeddb/IDBKeyData.h
     229    Modules/indexeddb/IDBKeyPath.h
     230    Modules/webdatabase/DatabaseDetails.h
     231
     232    page/ContextMenuContext.h
     233    page/SecurityOrigin.h
     234    page/SessionID.h
     235    page/TextIndicator.h
     236    page/UserScript.h
     237    page/UserStyleSheet.h
     238
     239    platform/PlatformExportMacros.h
    214240    platform/DisplaySleepDisabler.h
     241
     242    platform/audio/AudioHardwareListener.h
     243
     244    platform/cocoa/MachSendRight.h
     245
     246    platform/graphics/Color.h
     247    platform/graphics/FloatPoint.h
     248    platform/graphics/FloatRect.h
     249    platform/graphics/FloatSize.h
     250    platform/graphics/GraphicsContext.h
     251    platform/graphics/GraphicsLayer.h
     252    platform/graphics/IntPoint.h
     253    platform/graphics/IntRect.h
     254    platform/graphics/IntSize.h
     255    platform/graphics/NativeImagePtr.h
     256
     257    platform/graphics/cocoa/IOSurface.h
     258
     259    platform/graphics/transforms/AffineTransform.h
     260
    215261    platform/mac/SoftLinking.h
     262    platform/mac/WebCoreSystemInterface.h
     263
     264    platform/network/BlobDataFileReference.h
     265    platform/network/BlobRegistryImpl.h
     266    platform/network/HTTPHeaderMap.h
     267    platform/network/NetworkStorageSession.h
     268    platform/network/ResourceHandle.h
     269
     270    platform/network/cf/CertificateInfo.h
    216271    platform/network/cf/ResourceResponse.h
     272
    217273    platform/spi/cg/CoreGraphicsSPI.h
     274
     275    plugins/PluginData.h
     276    plugins/npruntime.h
    218277)
    219278
    220279WEBKIT_CREATE_FORWARDING_HEADERS(WebCore DIRECTORIES ${WebCore_FORWARDING_HEADERS_DIRECTORIES} FILES ${WebCore_FORWARDING_HEADERS_FILES})
    221280
    222 set(FEATURE_DEFINES_OBJECTIVE_C "LANGUAGE_OBJECTIVE_C=1 ${FEATURE_DEFINES_WITH_SPACE_SEPARATOR}")
    223 set(ADDITIONAL_BINDINGS_DEPENDENCIES
    224     ${WINDOW_CONSTRUCTORS_FILE}
    225     ${WORKERGLOBALSCOPE_CONSTRUCTORS_FILE}
    226     ${DEDICATEDWORKERGLOBALSCOPE_CONSTRUCTORS_FILE}
    227 )
    228 GENERATE_BINDINGS(WebCore_SOURCES
    229     "${WebCore_NON_SVG_IDL_FILES}"
    230     "${WEBCORE_DIR}"
    231     "${IDL_INCLUDES}"
    232     "${FEATURE_DEFINES_OBJECTIVE_C}"
    233     ${DERIVED_SOURCES_WEBCORE_DIR} DOM ObjC mm
    234     ${IDL_ATTRIBUTES_FILE}
    235     ${SUPPLEMENTAL_DEPENDENCY_FILE}
    236     ${ADDITIONAL_BINDINGS_DEPENDENCIES})
     281# FIXME: Get Objective C bindings working.
     282#set(FEATURE_DEFINES_OBJECTIVE_C "LANGUAGE_OBJECTIVE_C=1 ${FEATURE_DEFINES_WITH_SPACE_SEPARATOR}")
     283#set(ADDITIONAL_BINDINGS_DEPENDENCIES
     284#    ${WINDOW_CONSTRUCTORS_FILE}
     285#    ${WORKERGLOBALSCOPE_CONSTRUCTORS_FILE}
     286#    ${DEDICATEDWORKERGLOBALSCOPE_CONSTRUCTORS_FILE}
     287#)
     288#GENERATE_BINDINGS(WebCore_SOURCES
     289#    "${WebCore_NON_SVG_IDL_FILES}"
     290#    "${WEBCORE_DIR}"
     291#    "${IDL_INCLUDES}"
     292#    "${FEATURE_DEFINES_OBJECTIVE_C}"
     293#    ${DERIVED_SOURCES_WEBCORE_DIR} DOM ObjC mm
     294#    ${IDL_ATTRIBUTES_FILE}
     295#    ${SUPPLEMENTAL_DEPENDENCY_FILE}
     296#    ${ADDITIONAL_BINDINGS_DEPENDENCIES})

  • trunk/Source/WebCore/platform/mac/PasteboardMac.mm

    r176780 r181601  
    2828
    2929#import "CachedImage.h"
    30 #import "DOMRangeInternal.h"
    3130#import "Document.h"
    3231#import "DocumentFragment.h"

  • trunk/Source/WebKit2/ChangeLog

    r181599 r181601  
     12015-03-16  Alex Christensen  <achristensen@webkit.org>
     2
     3        Progress towards CMake on Mac
     4        https://bugs.webkit.org/show_bug.cgi?id=142747
     5
     6        Reviewed by Chris Dumez.
     7
     8        * PlatformMac.cmake:
     9        Started adding Mac-specific directories and headers.
     10
    1112015-03-16  Alexey Proskuryakov  <ap@apple.com>
    212

  • trunk/Source/WebKit2/PlatformMac.cmake

    r181496 r181601  
    11#FIXME: Add Mac-specific sources here.
     2
     3file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBKIT2_DIR})
     4
     5list(APPEND WebKit2_INCLUDE_DIRECTORIES
     6    "${WEBCORE_DIR}/platform/mac"
     7    "${WEBCORE_DIR}/platform/network/cf"
     8    "${WEBCORE_DIR}/platform/graphics/opentype"
     9    "${WEBKIT2_DIR}/UIProcess/mac"
     10    "${WEBKIT2_DIR}/Platform/mac"
     11    "${WEBKIT2_DIR}/Platform/IPC/mac"
     12    "${WEBKIT2_DIR}/Shared/API/Cocoa"
     13    "${WEBKIT2_DIR}/Shared/cf"
     14    "${WEBKIT2_DIR}/Shared/mac"
     15    "${WEBKIT2_DIR}/Shared/Plugins/mac"
     16    "${DERIVED_SOURCES_DIR}/ForwardingHeaders"
     17)
    218
    319set(WEBKIT2_EXTRA_DEPENDENCIES
Note: See TracChangeset for help on using the changeset viewer.