Attachment 163305 Details for Bug 96358 – Patch

[patch] Patch

bug-96358-20120911105938.patch (text/plain), 5.82 KB, created by Simon Hausmann on 2012-09-11 01:57:53 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Simon Hausmann

Created: 2012-09-11 01:57:53 PDT

Size: 5.82 KB

patch

obsolete

>Subversion Revision: 128150
>diff --git a/Source/ThirdParty/ANGLE/ChangeLog b/Source/ThirdParty/ANGLE/ChangeLog
>index 079763a9513814f58abb606dbdb1adce624ecd43..2e12f97acb2b165c6b74f316615bc573593a8197 100644
>--- a/Source/ThirdParty/ANGLE/ChangeLog
>+++ b/Source/ThirdParty/ANGLE/ChangeLog
>@@ -1,3 +1,16 @@
>+2012-09-11  Simon Hausmann  <simon.hausmann@nokia.com>
>+
>+        [Qt] Build on Windows requires bison/flex in PATH
>+        https://bugs.webkit.org/show_bug.cgi?id=96358
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Use MAKEFILE_NOOP_COMMAND instead of the \n\t trick to generate a dummy command. Otherwise
>+        the PATH prepend trick will break because it generates a command line along the lines of
>+        (set PATH="...") && with just that trailing ampersand pair.
>+
>+        * DerivedSources.pri:
>+
> 2012-09-06  Andras Becsi  <andras.becsi@nokia.com>
> 
>         [ANGLE] Fix the build with gcc 4.7
>diff --git a/Source/ThirdParty/ANGLE/DerivedSources.pri b/Source/ThirdParty/ANGLE/DerivedSources.pri
>index 791e5273514e73ad650abc7c55b3c0ab54f5e67e..04ae8c1c33ffeab99e3ef6caad307f624b473076 100644
>--- a/Source/ThirdParty/ANGLE/DerivedSources.pri
>+++ b/Source/ThirdParty/ANGLE/DerivedSources.pri
>@@ -31,7 +31,7 @@ anglebison_decl.variable_out = GENERATED_FILES
> GENERATORS += anglebison_decl
> 
> anglebison_impl.input = ANGLE_BISON_SOURCES
>-anglebison_impl.commands = $$escape_expand(\\n)
>+anglebison_impl.commands = $$MAKEFILE_NOOP_COMMAND
> anglebison_impl.depends = $$GENERATED_SOURCES_DESTDIR/${QMAKE_FILE_BASE}_tab.h
> anglebison_impl.output = ${QMAKE_FILE_BASE}_tab.cpp
> GENERATORS += anglebison_impl
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index 9c446110e2a379f01979a35c781021f5217f498b..909dba5975c4ccf336ca04eeef8643e44fa06a10 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,27 @@
>+2012-09-11  Simon Hausmann  <simon.hausmann@nokia.com>
>+
>+        [Qt] Build on Windows requires bison/flex in PATH
>+        https://bugs.webkit.org/show_bug.cgi?id=96358
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        The build requires flex, bison, etc. and they need to be in the PATH when building. On Mac OS X
>+        and Linux that is rarely a problem given how easily available the tools are. On Windows however
>+        a separate installation of various GNU tools is required as the operating system doesn't come with
>+        them. To make the development more convenient, Qt 5 provides a copy of the most essential tools in
>+        the gnuwin32 directory of the qt5.git top-level repository.
>+
>+        This patch tries to detect the presence of those tools and prepends them to the PATH if found.
>+
>+        This is required in preparation for the elimination of qt5/qtwebkit.pri, which currently expands
>+        PATH before calling build-webkit. It it also required for the upcoming introduction of win_flex
>+        as dependency over flex, which can be done with less hassle when qt5's gnuwin32 directory has been
>+        updated with the new tool.
>+
>+        * Scripts/webkitdirs.pm:
>+        (checkRequiredSystemConfig):
>+        * qmake/mkspecs/features/default_post.prf:
>+
> 2012-09-10  Joanmarie Diggs  <jdiggs@igalia.com>
> 
>         Properly expose <legend> elements to ATs
>diff --git a/Tools/Scripts/webkitdirs.pm b/Tools/Scripts/webkitdirs.pm
>index 4bbe2d85de587e7be58fe51c1276f72d53472c39..13278668c424b7bd2c5588cc1ea85b6ec79ebbca 100755
>--- a/Tools/Scripts/webkitdirs.pm
>+++ b/Tools/Scripts/webkitdirs.pm
>@@ -1561,6 +1561,14 @@ sub checkRequiredSystemConfig
>     } elsif (isGtk() or isQt() or isWx() or isEfl()) {
>         my @cmds = qw(flex bison gperf);
>         my @missing = ();
>+        my $oldPath = $ENV{PATH};
>+        if (isQt() and isWindows()) {
>+            chomp(my $gnuWin32Dir = `$qmakebin -query QT_HOST_DATA`);
>+            $gnuWin32Dir = File::Spec->catfile($gnuWin32Dir, "..", "gnuwin32", "bin");
>+            if (-d "$gnuWin32Dir") {
>+                $ENV{PATH} = $gnuWin32Dir . ";" . $ENV{PATH};
>+            }
>+        }
>         foreach my $cmd (@cmds) {
>             push @missing, $cmd if not commandExists($cmd);
>         }
>@@ -1569,6 +1577,9 @@ sub checkRequiredSystemConfig
>             my $list = join ", ", @missing;
>             die "ERROR: $list missing but required to build WebKit.\n";
>         }
>+        if (isQt() and isWindows()) {
>+            $ENV{PATH} = $oldPath;
>+        }
>     }
>     # Win32 and other platforms may want to check for minimum config
> }
>diff --git a/Tools/qmake/mkspecs/features/default_post.prf b/Tools/qmake/mkspecs/features/default_post.prf
>index 5f513fa081be68e6bebf49773447d19840a76b08..12f093a5991ac8db68be086e6ac914a91dbfd35b 100644
>--- a/Tools/qmake/mkspecs/features/default_post.prf
>+++ b/Tools/qmake/mkspecs/features/default_post.prf
>@@ -64,6 +64,17 @@ contains(TEMPLATE, derived) {
> 
>     CONFIG -= debug_and_release
> 
>+    # A lot of our code generators require GNU tools, readily available
>+    # on Linux and Mac OS X. On Windows we do have a convenience copy in
>+    # Qt5's top-level repository, so let's add that to the PATH if we can
>+    # find it.
>+    win32 {
>+        GNUTOOLS=$$[QT_HOST_DATA]/../gnuwin32/bin
>+        exists($$GNUTOOLS/gperf.exe) {
>+            GNUTOOLS = "(set $$escape_expand(\\\")PATH=$$toSystemPath($$GNUTOOLS);%PATH%$$escape_expand(\\\"))"
>+        }
>+    }
>+
>     for(generator, GENERATORS) {
>         eval($${generator}.CONFIG = target_predeps no_link)
>         eval($${generator}.dependency_type = TYPE_C)
>@@ -75,6 +86,11 @@ contains(TEMPLATE, derived) {
>         script = $$eval($${generator}.script)
>         eval($${generator}.depends += $$script)
> 
>+        commands = $$eval($${generator}.commands)
>+        !isEmpty(commands):!isEmpty(GNUTOOLS) {
>+            eval($${generator}.commands = $${GNUTOOLS} && $$val_escape($${generator}.commands))
>+        }
>+
>         !isEmpty($${generator}.input) {
>             # Compiler-style generator
>             QMAKE_EXTRA_COMPILERS += $$generator

Actions: View | Formatted Diff | Diff

Attachments on bug 96358: 163292 | 163305 | 163526