Changeset 128045 in webkit


Ignore:
Timestamp:
Sep 10, 2012 4:40:29 AM (12 years ago)
Author:
commit-queue@webkit.org
Message:

[Qt] Fix generation of forward headers for generated files in WebCore on Windows
https://bugs.webkit.org/show_bug.cgi?id=96245

Patch by Simon Hausmann <simon.hausmann@nokia.com> on 2012-09-10
Reviewed by Tor Arne Vestbø.

We generate the forwarding header files of generated WebCore sources by using
mkdir to ensure the target directory exists, followed by
echo #include "..." > file.h. On Windows mkdir returns with an error if the
target directory exists. For us that is not an error, so work around it with

(mkdir path 2>nul
echo>nul)
  • DerivedSources.pri:
Location:
trunk/Source/WebKit2
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebKit2/ChangeLog

    r128040 r128045  
     12012-09-10  Simon Hausmann  <simon.hausmann@nokia.com>
     2
     3        [Qt] Fix generation of forward headers for generated files in WebCore on Windows
     4        https://bugs.webkit.org/show_bug.cgi?id=96245
     5
     6        Reviewed by Tor Arne Vestbø.
     7
     8        We generate the forwarding header files of generated WebCore sources by using
     9        mkdir to ensure the target directory exists, followed by
     10        echo #include "..." > file.h. On Windows mkdir returns with an error if the
     11        target directory exists. For us that is not an error, so work around it with
     12        (mkdir path 2>nul || echo>nul)
     13
     14        * DerivedSources.pri:
     15
    1162012-09-10  Allan Sandfeld Jensen  <allan.jensen@nokia.com>
    217
  • trunk/Source/WebKit2/DerivedSources.pri

    r127019 r128045  
    145145    eval($${header_target}.target = $$dest_dir/$$header_name)
    146146    eval($${header_target}.depends = $$header_path)
    147     eval($${header_target}.commands = $${QMAKE_MKDIR} $$dest_dir && echo $${DOUBLE_ESCAPED_QUOTE}\$${LITERAL_HASH}include \\\"$$header_path\\\"$${DOUBLE_ESCAPED_QUOTE} > $$eval($${header_target}.target))
     147
     148    win32: eval($${header_target}.commands = ($${QMAKE_MKDIR} $$toSystemPath($$dest_dir) 2>nul || echo>nul))
     149    else: eval($${header_target}.commands = $${QMAKE_MKDIR} $$toSystemPath($$dest_dir) )
     150
     151    eval($${header_target}.commands += && echo $${DOUBLE_ESCAPED_QUOTE}\$${LITERAL_HASH}include \\\"$$header_path\\\"$${DOUBLE_ESCAPED_QUOTE} > $$eval($${header_target}.target))
    148152
    149153    GENERATORS += $$header_target
Note: See TracChangeset for help on using the changeset viewer.