Bug 136003 – more CMake progress on mac

• Status: RESOLVED
• Resolution: FIXED
• Component: WebKit Misc.

[Alex Christensen]

I've made some progress.  I'm not sure about some of the things in this patch.

[Alex Christensen]

Created attachment 236690 [details]
Patch

[WebKit Commit Bot]

Attachment 236690 [details] did not pass style-queue:


ERROR: Source/JavaScriptCore/CMakeLists.txt:883:  No trailing spaces  [whitespace/trailing] [5]
ERROR: Source/WebKit/PlatformMac.cmake:129:  No trailing spaces  [whitespace/trailing] [5]
ERROR: Source/WebKit/PlatformMac.cmake:249:  No trailing spaces  [whitespace/trailing] [5]
ERROR: Source/WebKit/PlatformMac.cmake:275:  No trailing spaces  [whitespace/trailing] [5]
ERROR: Source/WebKit/PlatformMac.cmake:196:  There should be exactly one empty line instead of 0 between "mac/DOM/WebDOMOperations.h" and "mac/History/WebHistory.h".  [list/emptyline] [5]
ERROR: Source/WebKit/PlatformMac.cmake:198:  There should be exactly one empty line instead of 0 between "mac/History/WebHistoryItem.h" and "mac/Misc/WebNSURLExtras.h".  [list/emptyline] [5]
ERROR: Source/WebKit/PlatformMac.cmake:199:  There should be exactly one empty line instead of 0 between "mac/Misc/WebNSURLExtras.h" and "mac/Panels/WebPanelAuthenticationHandler.h".  [list/emptyline] [5]
ERROR: Source/WebKit/PlatformMac.cmake:200:  There should be exactly one empty line instead of 0 between "mac/Panels/WebPanelAuthenticationHandler.h" and "mac/Plugins/WebBasePluginPackage.h".  [list/emptyline] [5]
ERROR: Source/WebKit/PlatformMac.cmake:201:  There should be exactly one empty line instead of 0 between "mac/Plugins/WebBasePluginPackage.h" and "mac/WebCoreSupport/WebKeyGenerator.h".  [list/emptyline] [5]
ERROR: Source/WebKit/PlatformMac.cmake:202:  There should be exactly one empty line instead of 0 between "mac/WebCoreSupport/WebKeyGenerator.h" and "mac/WebInspector/WebInspector.h".  [list/emptyline] [5]
ERROR: Source/WebKit/PlatformMac.cmake:203:  There should be exactly one empty line instead of 0 between "mac/WebInspector/WebInspector.h" and "mac/WebView/WebView.h".  [list/emptyline] [5]
ERROR: Source/WebCore/PlatformMac.cmake:207:  There should be exactly one empty line instead of 0 between "page" and "page/animation".  [list/emptyline] [5]
ERROR: Source/WebCore/PlatformMac.cmake:209:  Alphabetical sorting problem. "platform" should be before "page/mac".  [list/order] [5]
ERROR: Source/WebCore/PlatformMac.cmake:210:  There should be exactly one empty line instead of 0 between "platform" and "platform/audio/AudioSession.h".  [list/emptyline] [5]
ERROR: Source/WebCore/PlatformMac.cmake:211:  Alphabetical sorting problem. "platform/graphics" should be before "platform/audio/AudioSession.h".  [list/order] [5]
ERROR: Source/WebCore/PlatformMac.cmake:212:  There should be exactly one empty line instead of 0 between "platform/graphics" and "platform/graphics/ca".  [list/emptyline] [5]
ERROR: Source/WebCore/PlatformMac.cmake:214:  Alphabetical sorting problem. "platform/mock" should be before "platform/graphics/mac".  [list/order] [5]
ERROR: Source/WebCore/PlatformMac.cmake:215:  Alphabetical sorting problem. "platform/mac" should be before "platform/mock".  [list/order] [5]
ERROR: Source/WebCore/PlatformMac.cmake:217:  There should be exactly one empty line instead of 0 between "platform/network" and "platform/network/cf".  [list/emptyline] [5]
ERROR: Source/WebCore/PlatformMac.cmake:219:  Alphabetical sorting problem. "platform/text" should be before "platform/network/mac".  [list/order] [5]
ERROR: Source/WebCore/PlatformMac.cmake:220:  Alphabetical sorting problem. "plugins" should be before "platform/text".  [list/order] [5]
ERROR: Source/WebCore/PlatformMac.cmake:222:  Alphabetical sorting problem. "rendering" should be before "storage".  [list/order] [5]
ERROR: Source/WebCore/PlatformMac.cmake:228:  There should be exactly one empty line instead of 0 between "accessibility/AXObjectCache.h" and "history/HistoryItem.h".  [list/emptyline] [5]
ERROR: Source/WebCore/PlatformMac.cmake:229:  There should be exactly one empty line instead of 0 between "history/HistoryItem.h" and "html/HTMLMediaElement.h".  [list/emptyline] [5]
ERROR: Source/WebCore/PlatformMac.cmake:230:  Alphabetical sorting problem. "bindings/objc/WebKitAvailability.h" should be before "html/HTMLMediaElement.h".  [list/order] [5]
ERROR: Source/WebCore/PlatformMac.cmake:231:  Alphabetical sorting problem. "bindings/js/GCController.h" should be before "bindings/objc/WebKitAvailability.h".  [list/order] [5]
ERROR: Source/WebCore/PlatformMac.cmake:232:  There should be exactly one empty line instead of 0 between "bindings/js/GCController.h" and "bridge/npruntime_impl.h".  [list/emptyline] [5]
ERROR: Source/WebCore/PlatformMac.cmake:233:  There should be exactly one empty line instead of 0 between "bridge/npruntime_impl.h" and "crypto/SerializedCryptoKeyWrap.h".  [list/emptyline] [5]
ERROR: Source/WebCore/PlatformMac.cmake:234:  There should be exactly one empty line instead of 0 between "crypto/SerializedCryptoKeyWrap.h" and "css/StyleProperties.h".  [list/emptyline] [5]
ERROR: Source/WebCore/PlatformMac.cmake:236:  There should be exactly one empty line instead of 0 between "dom/Position.h" and "editing/EditAction.h".  [list/emptyline] [5]
ERROR: Source/WebCore/PlatformMac.cmake:237:  There should be exactly one empty line instead of 0 between "editing/EditAction.h" and "editing/cocoa/HTMLConverter.h".  [list/emptyline] [5]
ERROR: Source/WebCore/PlatformMac.cmake:238:  There should be exactly one empty line instead of 0 between "editing/cocoa/HTMLConverter.h" and "editing/mac/TextAlternativeWithRange.h".  [list/emptyline] [5]
ERROR: Source/WebCore/PlatformMac.cmake:239:  There should be exactly one empty line instead of 0 between "editing/mac/TextAlternativeWithRange.h" and "html/forms/FileIconLoader.h".  [list/emptyline] [5]
ERROR: Source/WebCore/PlatformMac.cmake:240:  There should be exactly one empty line instead of 0 between "html/forms/FileIconLoader.h" and "html/parser/HTMLParserIdioms.h".  [list/emptyline] [5]
ERROR: Source/WebCore/PlatformMac.cmake:242:  There should be exactly one empty line instead of 0 between "inspector/InspectorClient.h" and "loader/FrameLoaderTypes.h".  [list/emptyline] [5]
ERROR: Source/WebCore/PlatformMac.cmake:244:  There should be exactly one empty line instead of 0 between "loader/appcache/ApplicationCacheStorage.h" and "loader/cache/MemoryCache.h".  [list/emptyline] [5]
ERROR: Source/WebCore/PlatformMac.cmake:245:  Alphabetical sorting problem. "loader/archive/ArchiveResource.h" should be before "loader/cache/MemoryCache.h".  [list/order] [5]
ERROR: Source/WebCore/PlatformMac.cmake:246:  There should be exactly one empty line instead of 0 between "loader/archive/ArchiveResource.h" and "loader/archive/cf/LegacyWebArchive.h".  [list/emptyline] [5]
ERROR: Source/WebCore/PlatformMac.cmake:247:  There should be exactly one empty line instead of 0 between "loader/archive/cf/LegacyWebArchive.h" and "loader/icon/IconDatabaseClient.h".  [list/emptyline] [5]
ERROR: Source/WebCore/PlatformMac.cmake:248:  There should be exactly one empty line instead of 0 between "loader/icon/IconDatabaseClient.h" and "loader/mac/LoaderNSURLExtras.h".  [list/emptyline] [5]
ERROR: Source/WebCore/PlatformMac.cmake:249:  Alphabetical sorting problem. "Modules/geolocation/GeolocationClient.h" should be before "loader/mac/LoaderNSURLExtras.h".  [list/order] [5]
ERROR: Source/WebCore/PlatformMac.cmake:250:  There should be exactly one empty line instead of 0 between "Modules/geolocation/GeolocationClient.h" and "Modules/notifications/NotificationClient.h".  [list/emptyline] [5]
ERROR: Source/WebCore/PlatformMac.cmake:254:  There should be exactly one empty line instead of 0 between "page/animation/AnimationController.h" and "page/mac/WebCoreFrameView.h".  [list/emptyline] [5]
ERROR: Source/WebCore/PlatformMac.cmake:255:  There should be exactly one empty line instead of 0 between "page/mac/WebCoreFrameView.h" and "platform/DisplaySleepDisabler.h".  [list/emptyline] [5]
ERROR: Source/WebCore/PlatformMac.cmake:258:  There should be exactly one empty line instead of 0 between "platform/graphics/FloatRect.h" and "platform/graphics/ca/LayerFlushScheduler.h".  [list/emptyline] [5]
ERROR: Source/WebCore/PlatformMac.cmake:259:  There should be exactly one empty line instead of 0 between "platform/graphics/ca/LayerFlushScheduler.h" and "platform/graphics/mac/MediaPlayerProxy.h".  [list/emptyline] [5]
ERROR: Source/WebCore/PlatformMac.cmake:260:  There should be exactly one empty line instead of 0 between "platform/graphics/mac/MediaPlayerProxy.h" and "platform/mac/SoftLinking.h".  [list/emptyline] [5]
ERROR: Source/WebCore/PlatformMac.cmake:261:  There should be exactly one empty line instead of 0 between "platform/mac/SoftLinking.h" and "platform/mock/DeviceOrientationClientMock.h".  [list/emptyline] [5]
ERROR: Source/WebCore/PlatformMac.cmake:262:  There should be exactly one empty line instead of 0 between "platform/mock/DeviceOrientationClientMock.h" and "platform/network/cf/ResourceResponse.h".  [list/emptyline] [5]
ERROR: Source/WebCore/PlatformMac.cmake:263:  Alphabetical sorting problem. "platform/network/Credential.h" should be before "platform/network/cf/ResourceResponse.h".  [list/order] [5]
ERROR: Source/WebCore/PlatformMac.cmake:264:  There should be exactly one empty line instead of 0 between "platform/network/Credential.h" and "platform/network/mac/AuthenticationMac.h".  [list/emptyline] [5]
ERROR: Source/WebCore/PlatformMac.cmake:265:  There should be exactly one empty line instead of 0 between "platform/network/mac/AuthenticationMac.h" and "platform/text/TextCheckerClient.h".  [list/emptyline] [5]
ERROR: Source/WebCore/PlatformMac.cmake:266:  There should be exactly one empty line instead of 0 between "platform/text/TextCheckerClient.h" and "plugins/PluginData.h".  [list/emptyline] [5]
ERROR: Source/WebCore/PlatformMac.cmake:267:  There should be exactly one empty line instead of 0 between "plugins/PluginData.h" and "storage/StorageStrategy.h".  [list/emptyline] [5]
ERROR: Source/WebCore/PlatformMac.cmake:268:  Alphabetical sorting problem. "rendering/RenderImage.h" should be before "storage/StorageStrategy.h".  [list/order] [5]
ERROR: Source/WebCore/PlatformMac.cmake:269:  There should be exactly one empty line instead of 0 between "rendering/RenderImage.h" and "workers/SharedWorkerStrategy.h".  [list/emptyline] [5]
Total errors found: 56 in 22 files


If any of these errors are false positives, please file a bug against check-webkit-style.

[Csaba Osztrogonác]

Comment on attachment 236690 [details]
Patch

It doesn't build, r- not to appear in the review queue.

[Alex Christensen]

Created attachment 249119 [details]
Patch

[Alex Christensen]

Created attachment 249120 [details]
Patch

[Chris Dumez]

Comment on attachment 249120 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=249120&action=review

r=me.

> Source/WebCore/PlatformMac.cmake:-133
> -    platform/mac/SharedTimerMac.mm

This has been replaced by platform/cf/SharedTimerCF.mm iirc.

> Source/WebCore/PlatformMac.cmake:332
> +    dom/EventListener.idl

Why isn't this part of WebCore_NON_SVG_IDL_FILES ? This is definitely not SVG.

[Alex Christensen]

Committed to http://trac.webkit.org/changeset/181808

(In reply to comment #6)
> > Source/WebCore/PlatformMac.cmake:-133
> > -    platform/mac/SharedTimerMac.mm
> 
> This has been replaced by platform/cf/SharedTimerCF.mm iirc.
I'll add that file later once I get to an executable like MiniBrowser that complains about missing symbols.  Right now I just have a bunch of static libraries (which eventually need to become frameworks).
> 
> > Source/WebCore/PlatformMac.cmake:332
> > +    dom/EventListener.idl
> 
> Why isn't this part of WebCore_NON_SVG_IDL_FILES ? This is definitely not
> SVG.
DerivedSources.make filters EventListener out of the JS bindings because it is needed for ObjC but not JS.  Rather than remove it from JS and GObject bindings, I added it specially for ObjC.