Attachment 358071 Details for Bug 193033 – Patch

[patch] Patch

bug-193033-20181225190938.patch (text/plain), 6.12 KB, created by Adrian Perez on 2018-12-25 10:09:40 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Adrian Perez

Created: 2018-12-25 10:09:40 PST

Size: 6.12 KB

patch

obsolete

>Subversion Revision: 239551
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index 8dcee1e52700fae0a737c5008d5a85f0f1a8f060..dc710b0c82a3f9468676a6e054822e3da2c0ca6b 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,19 @@
>+2018-12-25  Adrian Perez de Castro  <aperez@igalia.com>
>+
>+        [Tools] Remove references to Bison and Flex
>+        https://bugs.webkit.org/show_bug.cgi?id=193033
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        The Bison and Flex tools are not needed anymore since r209883.
>+
>+        * CygwinDownloader/cygwin-downloader.py:
>+        * EWSTools/ubuntu-ews-packages:
>+        * Scripts/filter-build-webkit:
>+        (shouldIgnoreLine):
>+        * gtk/install-dependencies:
>+        * wpe/install-dependencies:
>+
> 2018-12-22  Carlos Garcia Campos  <cgarcia@igalia.com>
> 
>         WebDriver: warn about non existing tests when parsing expectations
>diff --git a/Tools/CygwinDownloader/cygwin-downloader.py b/Tools/CygwinDownloader/cygwin-downloader.py
>index f8353942010d17845ccde7e76a3aac258d7d0816..211997054aaf0866d312a5c2044e07261b0e3f95 100644
>--- a/Tools/CygwinDownloader/cygwin-downloader.py
>+++ b/Tools/CygwinDownloader/cygwin-downloader.py
>@@ -46,12 +46,10 @@ def download_package(package, message):
>         download_url_to_file(package_mirror_url + package["path"], package["path"], message)
> 
> required_packages = frozenset(["bc",
>-                               "bison",
>                                "curl",
>                                "diffutils",
>                                "e2fsprogs",
>                                "emacs",
>-                               "flex",
>                                "gcc-g++",
>                                "gperf",
>                                "keychain",
>diff --git a/Tools/EWSTools/ubuntu-ews-packages b/Tools/EWSTools/ubuntu-ews-packages
>index 4e25a73de39e2631c332ed8d8bcfb8778e4d7389..55e4507319f9c6073b1bb8f0b7da65f31818d74e 100644
>--- a/Tools/EWSTools/ubuntu-ews-packages
>+++ b/Tools/EWSTools/ubuntu-ews-packages
>@@ -5,9 +5,7 @@ binutils-gold
> python-mechanize
> libqt4-dev
> gperf
>-bison
> fakeroot
>-flex
> g++
> g++-multilib
> gperf
>@@ -48,8 +46,6 @@ libgnome-keyring-dev
> libcurl4-gnutls-dev
> libcupsys2-dev
> gperf
>-bison
>-flex
> libjpeg62-dev
> libpng12-dev
> libxt-dev
>diff --git a/Tools/Scripts/filter-build-webkit b/Tools/Scripts/filter-build-webkit
>index 54fefeb7c7a81aeb0e98307dab8cb153eef66846..5b629ece5a74487b52d358c690c6857814988ee2 100755
>--- a/Tools/Scripts/filter-build-webkit
>+++ b/Tools/Scripts/filter-build-webkit
>@@ -272,7 +272,7 @@ sub shouldIgnoreLine($$)
>     return 1 if $line =~ /created by an unsupported XCDependencyGraph build$/;
> 
>     if ($platform eq "win") {
>-        return 1 if $line =~ /^\s*(touch|perl|cat|rm -f|bison|del|flex|python|\/usr\/bin\/g\+\+|gperf|echo|sed|if \[ \-f|WebCore\/generate-export-file) /;
>+        return 1 if $line =~ /^\s*(touch|perl|cat|rm -f|del|python|\/usr\/bin\/g\+\+|gperf|echo|sed|if \[ \-f|WebCore\/generate-export-file) /;
>         return 1 if $line =~ /^\s*(if not exist \"|if errorlevel 1)/;
>         return 1 if $line =~ /(^\s*|MSB3073:\s+)(set |REM |cmd \/c)/;
>         return 1 if $line =~ /^\s*[cC]:\\[pP]rogram [fF]iles.*\\.*\\(CL|midl)\.exe /;
>@@ -290,7 +290,7 @@ sub shouldIgnoreLine($$)
>         return 1 if $line =~ /MSB3073:\s+if not exist/;
>         return 1 if $line =~ /which.exe bash/;
>     } else {
>-        return 1 if $line =~ /^(touch|perl|cat|rm -f|bison|flex|python|\/usr\/bin\/g\+\+|\/bin\/ln|gperf|echo|sed|if \[ \-f|WebCore\/generate-export-file|write-file|chmod) /;
>+        return 1 if $line =~ /^(touch|perl|cat|rm -f|python|\/usr\/bin\/g\+\+|\/bin\/ln|gperf|echo|sed|if \[ \-f|WebCore\/generate-export-file|write-file|chmod) /;
>         return 1 if $line =~ /^    / && !shouldShowSubsequentLine($previousLine);
>         return 1 if $line =~ /^printf /;
>         return 1 if $line =~ /^offlineasm: Nothing changed/;
>diff --git a/Tools/gtk/install-dependencies b/Tools/gtk/install-dependencies
>index 78710d054df37d060399e60d67fdbfb23473d004..d4d79e57e0c426f3dc355a26c2fadb6ff111be38 100755
>--- a/Tools/gtk/install-dependencies
>+++ b/Tools/gtk/install-dependencies
>@@ -54,10 +54,8 @@ function installDependenciesWithBrew {
> 
>     brew install autoconf \
>          automake \
>-         bison \
>          cmake \
>          enchant \
>-         flex \
>          gettext \
>          gobject-introspection \
>          intltool \
>@@ -93,10 +91,8 @@ function installDependenciesWithApt {
>         automake \
>         autopoint \
>         autotools-dev \
>-        bison \
>         bubblewrap \
>         cmake \
>-        flex \
>         gawk \
>         geoclue-2.0 \
>         gnome-common \
>@@ -243,14 +239,12 @@ function installDependenciesWithPacman {
>         alsa-lib \
>         autoconf \
>         automake \
>-        bison \
>         bubblewrap \
>         cmake \
>         libedit \
>         libffi \
>         file \
>         findutils \
>-        flex \
>         gawk \
>         gcc \
>         gettext \
>@@ -418,12 +412,10 @@ function installDependenciesWithDnf {
>         alsa-lib-devel \
>         autoconf \
>         automake \
>-        bison \
>         bubblewrap \
>         cairo-devel \
>         cmake \
>         enchant-devel \
>-        flex \
>         gcc-c++ \
>         geoclue2-devel \
>         gettext-devel \
>diff --git a/Tools/wpe/install-dependencies b/Tools/wpe/install-dependencies
>index 0884ff7c5f9ad0591bfa0086fe1731e27763f7ea..b3aa1a0ce1a4f1cbbe72c361c8a7778ff9dbc5e5 100755
>--- a/Tools/wpe/install-dependencies
>+++ b/Tools/wpe/install-dependencies
>@@ -58,9 +58,7 @@ function installDependenciesWithApt {
>         automake \
>         autopoint \
>         autotools-dev \
>-        bison \
>         cmake \
>-        flex \
>         g++ \
>         gawk \
>         gcc \
>@@ -148,11 +146,9 @@ function installDependenciesWithPacman {
>         alsa-lib \
>         autoconf \
>         automake \
>-        bison \
>         cmake \
>         file \
>         findutils \
>-        flex \
>         gawk \
>         gcc \
>         gnutls \
>@@ -248,9 +244,7 @@ function installDependenciesWithDnf {
>         autoconf \
>         automake \
>         alsa-lib-devel \
>-        bison \
>         cmake \
>-        flex \
>         gcc-c++ \
>         gnutls-devel \
>         gperf \

Actions: View | Formatted Diff | Diff

Attachments on bug 193033: 358071