[Settings] Generate Settings.h/cpp

• Component: New Bugs
• Status: RESOLVED FIXED

[Sam Weinig]

[Settings] Generate Settings.h/cpp

[Sam Weinig]

Created attachment 323948 [details]
Patch

[Sam Weinig]

Created attachment 323960 [details]
Patch

[Sam Weinig]

My initial guess for what's going wrong with the GTK and WPE builds is that the forwarding header for WebCore/Settings.h is not being regenerated for its new location as a derived source. Not sure how to address this yet.

[Sam Weinig]

Created attachment 324016 [details]
Patch

[Sam Weinig]

Created attachment 324018 [details]
Patch

[Konstantin Tokarev]

Comment on attachment 324018 [details]
Patch

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

> Source/WebKit/PlatformGTK.cmake:26
> +file(REMOVE "${FORWARDING_HEADERS_DIR}/WebCore/Settings.h")

Please remove this now

> Source/WebKit/PlatformWPE.cmake:18
> +file(REMOVE "${FORWARDING_HEADERS_DIR}/WebCore/Settings.h")

and this

[Sam Weinig]

(In reply to Konstantin Tokarev from comment #6)
> Comment on attachment 324018 [details]
> Patch
> 
> View in context:
> https://bugs.webkit.org/attachment.cgi?id=324018&action=review
> 
> > Source/WebKit/PlatformGTK.cmake:26
> > +file(REMOVE "${FORWARDING_HEADERS_DIR}/WebCore/Settings.h")
> 
> Please remove this now
> 
> > Source/WebKit/PlatformWPE.cmake:18
> > +file(REMOVE "${FORWARDING_HEADERS_DIR}/WebCore/Settings.h")
> 
> and this

Pretty sure they will be necessary to build without a clean build. What do you propose I replace them with?

[Dean Jackson]

Comment on attachment 324018 [details]
Patch

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

> Source/WebCore/Scripts/GenerateSettings/GenerateSettingsHeaderFile.py:31
> +
> +
> +def generateSettingsHeaderFile(outputDirectory, settings):

Nit: Too/two many blank lines.

> Source/WebCore/Scripts/GenerateSettings/GenerateSettingsHeaderFile.py:43
> +    outputFile.write("#pragma once\n\n")
> +
> +    outputFile.write("#include \"SettingsBase.h\"\n")
> +    outputFile.write("#include \"SettingsMacros.h\"\n")
> +    outputFile.write("#include <wtf/RefCounted.h>\n\n")
> +
> +    outputFile.write("namespace WebCore {\n\n")
> +

All this stuff might work better as a """ string, to avoid multiple write lines. But no biggy.

[WebKit Commit Bot]

Comment on attachment 324018 [details]
Patch

Rejecting attachment 324018 [details] from commit-queue.

Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.webkit.org', '--bot-id=webkit-cq-02', 'validate-changelog', '--check-oops', '--non-interactive', 324018, '--port=mac']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit

/Volumes/Data/EWS/WebKit/Source/WebKit/ChangeLog neither lists a valid reviewer nor contains the string "Unreviewed" or "Rubber stamp" (case insensitive).

Full output: http://webkit-queues.webkit.org/results/4888683

[Sam Weinig]

Committed r223574: <https://trac.webkit.org/changeset/223574>

[Radar WebKit Bug Importer]

<rdar://problem/35037049>