Bug 118367 – Nix upstreaming - Adding build files and supporting scripts

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

[Marcelo Lira]

All the cmake files needed to build Nix's WebCore, plus helper scripts.

[Marcelo Lira]

Created attachment 206019 [details]
Patch

[Gyuyoung Kim]

Comment on attachment 206019 [details]
Patch

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

It looks you need to take care of placing files by alphabetic order first.

> Source/WebCore/PlatformNix.cmake:2
> +    "${WEBCORE_DIR}/platform/nix"

Please place files according to alphabetic order.

> Source/WebCore/PlatformNix.cmake:20
> +    page/nix/EventHandlerNix.cpp

It would be good if you do grouping as below,

page/nix/EventHandlerNix.cpp
page/TouchAdjustment.cpp

platform/Cursor.cpp
platform/ContextMenuNone.cpp

> Source/cmake/OptionsCommon.cmake:6
> +

Unneeded line.

> Tools/Scripts/build-webkit:153
> +  --nix                             Build the Nix port

Wrong alphabetic order.

> Tools/Scripts/run-javascriptcore-tests:60
> +    # Tests failing when running in BRT timezone

I'm not sure if you can skip these tests without considering other ports.

> Tools/Scripts/webkitdirs.pm:993
> +    # The presence of QTDIR only means Qt if --gtk or --efl or --blackberry or --wincairo or --nix are not on the command-line

Wrong line ?

> Tools/Scripts/webkitdirs.pm:1154
> +}

Missing a new line.

[Marcelo Lira]

Created attachment 206146 [details]
Patch

[Benjamin Poulain]

Comment on attachment 206146 [details]
Patch

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

> Source/WebCore/ChangeLog:8
> +        No new tests (OOPS!).

Remove this line.

> Tools/Scripts/build-webkit:92
> +# Update defaults for the Nix port

Period.

> Tools/Scripts/run-javascriptcore-tests:60
> +    # Tests failing when running in BRT timezone

period.

> Tools/Scripts/run-javascriptcore-tests:63
> +    "ecma/Date/15.9.5.28-1.js",
> +    "ecma/Date/15.9.5.29-1.js",
> +    "ecma/Date/15.9.5.35-1.js",

What The Fuck?

> Tools/Scripts/webkitdirs.pm:993
> +    # The presence of QTDIR only means Qt if --gtk or --efl or --blackberry or --wincairo or --nix are not on the command-line

Period.

[Lauro Moura Maranhao Neto]

Created attachment 206691 [details]
Patch

Updated patch after last comments. The JSC test was a local commit related to timezone problems and will be fixed in another bug.

[Lauro Moura Maranhao Neto]

Created attachment 215523 [details]
Patch

Updated patch after some files were removed and making check-webkit-style happier.

[Thiago de Barros Lacerda]

Created attachment 217833 [details]
Patch

[WebKit Commit Bot]

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

Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'CMakeLists.txt', u'ChangeLog', u'Source/CMakeLists.txt', u'Source/Platform/CMakeLists.txt', u'Source/Platform/ChangeLog', u'Source/Platform/PlatformNix.cmake', u'Source/WTF/ChangeLog', u'Source/WTF/wtf/FeatureDefines.h', u'Source/WTF/wtf/Platform.h', u'Source/WTF/wtf/PlatformNix.cmake', u'Source/WebCore/CMakeLists.txt', u'Source/WebCore/ChangeLog', u'Source/WebCore/PlatformNix.cmake', u'Source/cmake/FindEGL.cmake', u'Source/cmake/FindOpenGLES2.cmake', u'Source/cmake/OptionsCommon.cmake', u'Source/cmake/OptionsNix.cmake', u'Tools/ChangeLog', u'Tools/Scripts/build-webkit', u'Tools/Scripts/run-nix-tests', u'Tools/Scripts/run-webkit-tests', u'Tools/Scripts/update-webkit-libs-jhbuild', u'Tools/Scripts/update-webkitnix-libs', u'Tools/Scripts/webkitdirs.pm', u'Tools/Scripts/webkitpy/common/config/ports.py', u'Tools/Scripts/webkitpy/port/factory.py', u'Tools/Scripts/webkitpy/port/nix.py', u'Tools/Scripts/webkitpy/port/nix_unittest.py', u'Tools/jhbuild/jhbuild-wrapper', u'Tools/nix/common.py', u'Tools/nix/jhbuild.modules', u'Tools/nix/jhbuildrc']" exit_code: 1
Source/WebCore/PlatformNix.cmake:316:  Alphabetical sorting problem. "# Uncomment it after https://bugs.webkit.org/show_bug.cgi?id=118598 is fixed and merged to Nix." should be before "platform/network/soup/SynchronousLoaderClientSoup.cpp".  [list/order] [5]
Source/WebCore/PlatformNix.cmake:317:  There should be exactly one empty line instead of 0 between "# Uncomment it after https://bugs.webkit.org/show_bug.cgi?id=118598 is fixed and merged to Nix." and "# platform/soup/SharedBufferSoup.cpp".  [list/emptyline] [5]
Source/Platform/PlatformNix.cmake:3:  Alphabetical sorting problem. "${CMAKE_BINARY_DIR} # For cmakeconfig.h" should be before "nix".  [list/order] [5]
Source/Platform/PlatformNix.cmake:4:  There should be exactly one empty line instead of 0 between "${CMAKE_BINARY_DIR} # For cmakeconfig.h" and "${WEBCORE_DIR}/platform/graphics/ # For IntRect.h".  [list/emptyline] [5]
Source/Platform/PlatformNix.cmake:5:  Alphabetical sorting problem. "${WTF_DIR} # For config.h" should be before "${WEBCORE_DIR}/platform/graphics/ # For IntRect.h".  [list/order] [5]
Source/WTF/wtf/PlatformNix.cmake:11:  Alphabetical sorting problem. "${GLIB_LIBRARIES}" should be before "pthread".  [list/order] [5]
Source/WTF/wtf/PlatformNix.cmake:12:  Alphabetical sorting problem. "${GLIB_GIO_LIBRARIES}" should be before "${GLIB_LIBRARIES}".  [list/order] [5]
Total errors found: 7 in 32 files


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

[Thiago de Barros Lacerda]

Created attachment 217858 [details]
Fixing wrong dates in ChangeLogs

[WebKit Commit Bot]

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

Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'CMakeLists.txt', u'ChangeLog', u'Source/CMakeLists.txt', u'Source/Platform/CMakeLists.txt', u'Source/Platform/ChangeLog', u'Source/Platform/PlatformNix.cmake', u'Source/WTF/ChangeLog', u'Source/WTF/wtf/FeatureDefines.h', u'Source/WTF/wtf/Platform.h', u'Source/WTF/wtf/PlatformNix.cmake', u'Source/WebCore/CMakeLists.txt', u'Source/WebCore/ChangeLog', u'Source/WebCore/PlatformNix.cmake', u'Source/cmake/FindEGL.cmake', u'Source/cmake/FindOpenGLES2.cmake', u'Source/cmake/OptionsCommon.cmake', u'Source/cmake/OptionsNix.cmake', u'Tools/ChangeLog', u'Tools/Scripts/build-webkit', u'Tools/Scripts/run-nix-tests', u'Tools/Scripts/run-webkit-tests', u'Tools/Scripts/update-webkit-libs-jhbuild', u'Tools/Scripts/update-webkitnix-libs', u'Tools/Scripts/webkitdirs.pm', u'Tools/Scripts/webkitpy/common/config/ports.py', u'Tools/Scripts/webkitpy/port/factory.py', u'Tools/Scripts/webkitpy/port/nix.py', u'Tools/Scripts/webkitpy/port/nix_unittest.py', u'Tools/jhbuild/jhbuild-wrapper', u'Tools/nix/common.py', u'Tools/nix/jhbuild.modules', u'Tools/nix/jhbuildrc']" exit_code: 1
Source/WebCore/PlatformNix.cmake:316:  Alphabetical sorting problem. "# Uncomment it after https://bugs.webkit.org/show_bug.cgi?id=118598 is fixed and merged to Nix." should be before "platform/network/soup/SynchronousLoaderClientSoup.cpp".  [list/order] [5]
Source/WebCore/PlatformNix.cmake:317:  There should be exactly one empty line instead of 0 between "# Uncomment it after https://bugs.webkit.org/show_bug.cgi?id=118598 is fixed and merged to Nix." and "# platform/soup/SharedBufferSoup.cpp".  [list/emptyline] [5]
Source/Platform/PlatformNix.cmake:3:  Alphabetical sorting problem. "${CMAKE_BINARY_DIR} # For cmakeconfig.h" should be before "nix".  [list/order] [5]
Source/Platform/PlatformNix.cmake:4:  There should be exactly one empty line instead of 0 between "${CMAKE_BINARY_DIR} # For cmakeconfig.h" and "${WEBCORE_DIR}/platform/graphics/ # For IntRect.h".  [list/emptyline] [5]
Source/Platform/PlatformNix.cmake:5:  Alphabetical sorting problem. "${WTF_DIR} # For config.h" should be before "${WEBCORE_DIR}/platform/graphics/ # For IntRect.h".  [list/order] [5]
Source/WTF/wtf/PlatformNix.cmake:11:  Alphabetical sorting problem. "${GLIB_LIBRARIES}" should be before "pthread".  [list/order] [5]
Source/WTF/wtf/PlatformNix.cmake:12:  Alphabetical sorting problem. "${GLIB_GIO_LIBRARIES}" should be before "${GLIB_LIBRARIES}".  [list/order] [5]
Total errors found: 7 in 32 files


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

[Ryosuke Niwa]

Comment on attachment 217858 [details]
Fixing wrong dates in ChangeLogs

rs=me.

[WebKit Commit Bot]

Comment on attachment 217858 [details]
Fixing wrong dates in ChangeLogs

Clearing flags on attachment: 217858

Committed r159806: <http://trac.webkit.org/changeset/159806>

[WebKit Commit Bot]

All reviewed patches have been landed.  Closing bug.