[Tools] Remove references to Bison and Flex
authoraperez@igalia.com <aperez@igalia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 26 Dec 2018 18:30:10 +0000 (18:30 +0000)
committeraperez@igalia.com <aperez@igalia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 26 Dec 2018 18:30:10 +0000 (18:30 +0000)
https://bugs.webkit.org/show_bug.cgi?id=193033

Reviewed by Michael Catanzaro.

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:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@239553 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Tools/ChangeLog
Tools/CygwinDownloader/cygwin-downloader.py
Tools/EWSTools/ubuntu-ews-packages
Tools/Scripts/filter-build-webkit
Tools/gtk/install-dependencies
Tools/wpe/install-dependencies

index 8dcee1e..1ce64ef 100644 (file)
@@ -1,3 +1,19 @@
+2018-12-26  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 Michael Catanzaro.
+
+        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
index f835394..2119970 100644 (file)
@@ -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",
index 4e25a73..55e4507 100644 (file)
@@ -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
index 54fefeb..5b629ec 100755 (executable)
@@ -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/;
index 78710d0..d4d79e5 100755 (executable)
@@ -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 \
index 0884ff7..b3aa1a0 100755 (executable)
@@ -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 \