Skip to content

GitLab

W
webkit
Switch branch/tag
  1. 13 Dec, 2013 1 commit
  3. 08 Apr, 2013 1 commit
  5. 08 Feb, 2013 1 commit
  7. 11 Dec, 2012 1 commit
    • zandobersek@gmail.com's avatar
      [GTK] Feature enabling/disabling should be possible through build-webkit · 68b5fe36
      zandobersek@gmail.com authored 
      https://bugs.webkit.org/show_bug.cgi?id=99271

Reviewed by Gustavo Noronha Silva.

.: 

The autogen.sh script now calls the Tools/gtk/override-feature-defines script
before calling autoreconf. This ensures that Source/WebCore/GNUmakefile.features.am
is present and properly modified if the build-webkit script intends to override
any feature.

The Source/WebCore/GNUmakefile.features.am file is added to the ignored files list
so it doesn't pop out as a new, untracked file.

* .gitignore:
* autogen.sh:

Source/WebCore: 

Move the contents of GNUmakefile.features.am into GNUmakefile.features.am.in.
The former is then copied from the latter but then appropriately modified if
the build-webkit script overrides any of the default feature defines.

No new tests - no new testable functionality.

* GNUmakefile.features.am.in: Renamed from Source/WebCore/GNUmakefile.features.am.

Tools: 

Refactor the code in webkitdirs.pm that builds an autotools project to generate
autogen.sh arguments, make arguments and installation prefix from the passed-in
parameters rather than generating all of that in build-webkit. The autogen.sh
arguments now contain only enable/disable flags for options that are actually
configurable in configure.ac, the flag value actually reflecting whether the feature
is enabled or disabled in the feature list.

Other features are overridable through modifying the GNUmakefile.features.am file.
All these features are now stored in the build directory and upon change trigger
a rerun of the autogen.sh script, pretty much like the autogen.sh arguments do.

The override-feature-defines script is called by autogen.sh, before GNUmakefile.in is
generated when calling autoreconf. Its task is to copy the GNUmakefile.features.am.in
into GNUmakefile.features.am and modify it if there's a text file in the build directory
that contains all the feature defines the build-webkit script has written. If the build
is not done through build-webkit (and there's no file in build directory listing all the
feature defines) the script does not advance further from copying.

This approach is taken to overcome the rigidness of the automake system as it's impossible
to effectively generate and use GNUmakefile.features.am or even GNUmakefile.features file
after the autoreconf command execution in autogen.sh.

* Scripts/build-jsc:
(buildMyProject):
* Scripts/build-webkit:
* Scripts/webkitdirs.pm:
(runAutogenForAutotoolsProjectIfNecessary):
(mustReRunAutogen):
(buildAutotoolsProject):
(buildGtkProject):
* Scripts/webkitperl/FeatureList.pm: Update the features that are currently enabled in
Source/WebCore/GNUmakefile.features.am.in but aren't in the feature list.
* Scripts/webkitpy/style/checker.py: Source/WebCore/GNUmakefile.features.am.in is recognized
as a text file and tabulation errors are reported. Skip the file to suppress them.
* gtk/override-feature-defines: Added.
(copy_feature_defines_makefile):
(adjust_feature_defines_makefile):
(adjust_feature_defines_makefile.override_feature_define):
(override_feature_defines):


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@137270 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      68b5fe36
  9. 30 Oct, 2012 1 commit
  11. 28 Aug, 2012 1 commit
  13. 30 Mar, 2012 1 commit
    • commit-queue@webkit.org's avatar
      Split up top-level .gitignore and .gitattributes · 66f25595
      commit-queue@webkit.org authored 
      https://bugs.webkit.org/show_bug.cgi?id=82687

Patch by David Barr <davidbarr@chromium.org> on 2012-03-30
Reviewed by Tor Arne Vestbø.

.:

Jeff King <peff@peff.net> suggested this on the git mailing list.
http://article.gmane.org/gmane.comp.version-control.git/194294
He reported a 1.6 times speed up for 'git status'.

* .gitattributes:
* .gitignore:
* ManualTests/.gitattributes: Added.
* Source/.gitignore: Added.
* Websites/.gitattributes: Added.

PerformanceTests:

* .gitattributes: Added.

Source/JavaScriptCore:

* JavaScriptCore.gyp/.gitignore: Added.

Source/Platform:

* Platform.gyp/.gitignore: Added.

Source/ThirdParty:

* glu/.gitignore: Added.

Source/WebCore:

No new tests, source control administrivia.

* .gitattributes: Added.
* WebCore.gyp/.gitignore: Added.

Source/WebKit/chromium:

* .gitignore: Added.

Source/WTF:

* WTF.gyp/.gitignore: Added.

Tools:

* .gitattributes: Added.
* .gitignore: Added.
* DumpRenderTree/DumpRenderTree.gyp/.gitignore: Added.
* TestWebKitAPI/TestWebKitAPI.gyp/.gitignore: Added.

LayoutTests:

* .gitattributes: Added.
* .gitignore: Added.

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@112683 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      66f25595
  15. 19 Mar, 2012 1 commit
  17. 26 Feb, 2012 1 commit
  19. 07 Feb, 2012 1 commit
  21. 01 Feb, 2012 1 commit
  23. 19 Jan, 2012 1 commit
    • vestbo@webkit.org's avatar
      [Qt] Make build-webkit always do safe incremental builds after update-webkit · 736c89b3
      vestbo@webkit.org authored 
      When building against Qt5 with GCC we would just run 'make' in the build dir,
and rely on the dependency files output by GCC (-MD) to handle dependency
tracking, but that fails for special-cases like adding a Q_OBJECT macro
to a header.

To guarantee that an incrmental build will work, we have to run 'make qmake',
which we now do on every build-webkit that's followed by a successful run
of update-webkit. The reasoning is that update-webkit can result in such
potential corner-cases being applied, and since we can't know for sure
unless we inspect the diff and account for all the corner cases we assume
the worst and always run 'make qmake'.

After a succesful run of build-webkit we proceed to do just 'make' for any
subsequent runs, since we assume that the developer knows what kind of
changes he/she is doing, and when a 'make qmake' is needed.

Reviewed by Simon Hausmann.

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@105398 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      736c89b3
  25. 18 Jan, 2012 1 commit
  27. 04 Jan, 2012 1 commit
    • jamesr@google.com's avatar
      [chromium] Move WebMimeRegistry and dependencies to Source/Platform · a5d23a13
      jamesr@google.com authored 
      https://bugs.webkit.org/show_bug.cgi?id=74583

Reviewed by Darin Fisher.

.:

Update .gitignore for Source/Platform/Platform.gyp/ generated project files.

* .gitignore:

Source/Platform:

This creates a skeleton directory structure for the chromium WebKit platform API and moves WebMimeRegistry.h
along with its dependencies (WebString and WebCString) to their final location.

* Platform.gyp/Platform.gyp: Added.
* Platform.gypi: Added.
* chromium/platform/WebCString.h: Copied from Source/WebKit/chromium/public/platform/WebCString.h.
(WebKit::WebCString::~WebCString):
(WebKit::WebCString::WebCString):
(WebKit::WebCString::operator=):
(WebKit::WebCString::isEmpty):
(WebKit::WebCString::isNull):
(WebKit::WebCString::operator std::string):
(WebKit::WebCString::fromUTF16):
(WebKit::operator<):
* chromium/platform/WebCommon.h: Copied from Source/WebKit/chromium/public/platform/WebCommon.h.
* chromium/platform/WebMimeRegistry.h: Copied from Source/WebKit/chromium/public/platform/WebMimeRegistry.h.
(WebKit::WebMimeRegistry::~WebMimeRegistry):
* chromium/platform/WebString.h: Copied from Source/WebKit/chromium/public/platform/WebString.h.
(WebKit::WebString::~WebString):
(WebKit::WebString::WebString):
(WebKit::WebString::operator=):
(WebKit::WebString::isEmpty):
(WebKit::WebString::isNull):
(WebKit::WebString::operator string16):
(WebKit::WebString::operator NullableString16):
(WebKit::WebString::fromUTF8):
(WebKit::operator==):
(WebKit::operator!=):
* chromium/src/WebCString.cpp: Renamed from Source/WebKit/chromium/src/WebCString.cpp.
(WebKit::WebCString::compare):
(WebKit::WebCString::reset):
(WebKit::WebCString::assign):
(WebKit::WebCString::length):
(WebKit::WebCString::data):
(WebKit::WebCString::utf16):
(WebKit::WebCString::fromUTF16):
(WebKit::WebCString::WebCString):
(WebKit::WebCString::operator=):
(WebKit::WebCString::operator WTF::CString):
* chromium/src/WebString.cpp: Renamed from Source/WebKit/chromium/src/WebString.cpp.
(WebKit::WebString::reset):
(WebKit::WebString::assign):
(WebKit::WebString::length):
(WebKit::WebString::data):
(WebKit::WebString::utf8):
(WebKit::WebString::fromUTF8):
(WebKit::WebString::equals):
(WebKit::WebString::WebString):
(WebKit::WebString::operator=):
(WebKit::WebString::operator WTF::String):
(WebKit::WebString::operator WTF::AtomicString):

Source/WebKit/chromium:

public/platform/WebMimeRegistry.h is a temporary forwarding header to ease the transition. Once downstream
callers are updated to the new location this header can be removed.

WebString, WebCString, and WebCommon.h will remain in place as forwarding headers for users of the WebKit client
API.

* WebKit.gyp:
* public/platform/WebCString.h:
* public/platform/WebCommon.h:
* public/platform/WebMimeRegistry.h:
* public/platform/WebString.h:

Tools:

Teaches the WEBKIT_EXPORT check about the chromium WebKit platform API header location.

* Scripts/webkitpy/style/checkers/cpp.py:
(check_function_definition):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@104048 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      a5d23a13
  29. 06 Dec, 2011 1 commit
    • dpranke@chromium.org's avatar
      .: Add Tools/Tool.xcodeproj, · f53f1f84
      dpranke@chromium.org authored 
      Source/WebKit/chromium/WebKitUnitTests.xcodeproj,
Source/WebKit/chromium/All.xcodeproj to .gitignore

https://bugs.webkit.org/show_bug.cgi?id=73823

Reviewed by Tony Chang.

* .gitignore:

Source/WebKit/chromium: binaries in webkit.gyp should be split into a new file to break circular dependencies on webkit_support
https://bugs.webkit.org/show_bug.cgi?id=73382

Reviewed by Tony Chang.

XCode (and hence GYP) can't handle circular dependencies between
files (and projects). Accordingly, although the binaries in
WebKit.gyp depend on webkit_support and webkit_support depends
on webkit, we don't mention the latter dependency in the file.
To fix this, this change moves the binaries like DRT into a new
GYP file, and modifies gyp_webkit to build from that file
instead of WebKit.gyp.

* WebKit.gyp:
* All.gyp:
* WebKitUnitTests.gyp:
* gyp_webkit:

Tools: binaries in webkit.gyp should be split into a new file to break circular dependencies on webkit_support
https://bugs.webkit.org/show_bug.cgi?id=73382

Reviewed by Tony Chang.

XCode (and hence GYP) can't handle circular dependencies between
files (and projects). Accordingly, although the binaries in
WebKit.gyp depend on webkit_support and webkit_support depends
on webkit, we don't mention the latter dependency in the file.
To fix this, this change moves the binaries like DRT into a new
GYP file, and modifies gyp_webkit to build from that file
instead of WebKit.gyp.

* Tools.gyp: Added.

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@102201 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      f53f1f84
  31. 05 Dec, 2011 1 commit
  33. 22 Nov, 2011 2 commits
  35. 21 Nov, 2011 2 commits
  37. 17 Nov, 2011 1 commit
  39. 19 Jul, 2011 1 commit
  41. 01 Jul, 2011 1 commit
  43. 03 May, 2011 1 commit
  45. 13 Apr, 2011 1 commit
  47. 08 Apr, 2011 1 commit
  49. 04 Apr, 2011 1 commit
  51. 14 Feb, 2011 1 commit
  53. 09 Feb, 2011 1 commit
  55. 18 Jan, 2011 2 commits
  57. 11 Jan, 2011 1 commit
  59. 08 Jan, 2011 1 commit
    • abarth@webkit.org's avatar
      2011-01-07 Adam Barth <abarth@webkit.org> · 8ac7e159
      abarth@webkit.org authored 
              Rubber-stamped by Eric Seidel.

        Move WebCore to Source
        https://bugs.webkit.org/show_bug.cgi?id=52050

        Remove reference to old directory.

        * PrettyPatch/PrettyPatch.rb:
2011-01-07  Adam Barth  <abarth@webkit.org>

        Rubber-stamped by Eric Seidel.

        Move WebCore to Source
        https://bugs.webkit.org/show_bug.cgi?id=52050

        Update references to WebCore.

        * WebKit.grd:
        * WebKit.gyp:
2011-01-07  Adam Barth  <abarth@webkit.org>

        Rubber-stamped by Eric Seidel.

        Move WebCore to Source
        https://bugs.webkit.org/show_bug.cgi?id=52050

        Update documentation to reference new location of WebCore.

        * docs/qtwebkit.qdoc:
2011-01-07  Adam Barth  <abarth@webkit.org>

        Rubber-stamped by Eric Seidel.

        Move WebCore to Source
        https://bugs.webkit.org/show_bug.cgi?id=52050

        * GNUmakefile.am:
2011-01-07  Adam Barth  <abarth@webkit.org>

        Rubber-stamped by Eric Seidel.

        Move WebCore to Source
        https://bugs.webkit.org/show_bug.cgi?id=52050

        * WebKit.vcproj/WebKit.sln:
2011-01-07  Adam Barth  <abarth@webkit.org>

        Rubber-stamped by Eric Seidel.

        Move WebCore to Source
        https://bugs.webkit.org/show_bug.cgi?id=52050

        * bindings/python/wscript:
        * wscript:
2011-01-07  Adam Barth  <abarth@webkit.org>

        Rubber-stamped by Eric Seidel.

        Move WebCore to Source
        https://bugs.webkit.org/show_bug.cgi?id=52050

        Update project files to understand WebCore's new location.  I suspect
        there will be some follow-up patches after we land this patch.

        * Android.derived.jscbindings.mk:
        * Android.jscbindings.mk:
        * Android.v8bindings.mk:
        * GNUmakefile.am:
        * WebCore.gyp/WebCore.gyp:
        * WebCore.pri:
        * WebCore.pro:
        * WebCore.vcproj/WebCore.vcproj:
        * WebCore.vcproj/WebCoreGeneratedCairo.vsprops:
        * WebCore.vcproj/WebCoreGeneratedCommon.vsprops:
2011-01-07  Adam Barth  <abarth@webkit.org>

        Rubber-stamped by Eric Seidel.

        Move WebCore to Source
        https://bugs.webkit.org/show_bug.cgi?id=52050

        Update build files and metadata to point to WebCore's new location.

        * .gitattributes:
        * .gitignore:
        * Android.mk:
        * CMakeLists.txt:
        * DerivedSources.pro:
        * GNUmakefile.am:
        * Makefile:
        * Source/autotools/webkit.m4:
        * Source/cmake/OptionsEfl.cmake:
        * WebKit.pri:
        * WebKit.pro:
        * configure.ac:
        * wscript:
2011-01-07  Adam Barth  <abarth@webkit.org>

        Rubber-stamped by Eric Seidel.

        Move WebCore to Source
        https://bugs.webkit.org/show_bug.cgi?id=52050

        Update the tools to understand WebCore's new location.

        * DumpRenderTree/qt/TestNetscapePlugin/TestNetscapePlugin.pro:
        * DumpRenderTree/wscript:
        * GNUmakefile.am:
        * Scripts/build-webkit:
        * Scripts/do-file-rename:
        * Scripts/do-webcore-rename:
        * Scripts/generate-qt-inspector-resource:
        * Scripts/prepare-ChangeLog:
        * Scripts/run-bindings-tests:
        * Scripts/update-iexploder-cssproperties:
        * Scripts/update-sources-list.py:
        * Scripts/update-webkit-localizable-strings:
        * Scripts/webkitdirs.pm:
        * Scripts/webkitpy/common/config/build.py:
        * Scripts/webkitpy/common/config/build_unittest.py:
        * Scripts/webkitpy/layout_tests/deduplicate_tests_unittest.py:
        * Scripts/webkitpy/style/checker.py:
        * Scripts/webkitpy/style/checker_unittest.py:
        * WebKitTestRunner/DerivedSources.pro:
        * WebKitTestRunner/InjectedBundle/qt/InjectedBundle.pro:
        * iExploder/iexploder-1.7.2/tools/update_html_tags_from_sources.sh:
        * wx/browser/wscript:
        * wx/build/settings.py:
2011-01-07  Adam Barth  <abarth@webkit.org>

        Rubber-stamped by Eric Seidel.

        Move WebCore to Source
        https://bugs.webkit.org/show_bug.cgi?id=52050

        * WebKit2.pro:


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75313 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      8ac7e159
  61. 04 Jan, 2011 1 commit
  63. 03 Jan, 2011 1 commit
  65. 27 Dec, 2010 1 commit
  67. 20 Dec, 2010 1 commit
  69. 14 Dec, 2010 1 commit
  71. 01 Dec, 2010 1 commit
  73. 24 Nov, 2010 1 commit