Changeset 151216 in webkit


Ignore:
Timestamp:
Jun 5, 2013 5:34:30 AM (11 years ago)
Author:
rakuco@webkit.org
Message:

Use WEBKITOUTPUTDIR if WEBKIT_OUTPUTDIR is not present.
https://bugs.webkit.org/show_bug.cgi?id=117244

Reviewed by Daniel Bates.

Fixed a regression introduced by r151196: not only does webkit.org
still mention WEBKITOUTPUTDIR instead of WEBKIT_OUTPUTDIR, but the
infrastructure used by ports such as GTK+ and EFL also use on it for
things such as jhbuild.

While everything is not fully transitioned to WEBKIT_OUTPUTDIR, read
both environment variables.

  • Scripts/webkitdirs.pm:

(determineBaseProductDir):

Location:
trunk/Tools
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Tools/ChangeLog

    r151215 r151216  
     12013-06-05  Raphael Kubo da Costa  <raphael.kubo.da.costa@intel.com>
     2
     3        Use WEBKITOUTPUTDIR if WEBKIT_OUTPUTDIR is not present.
     4        https://bugs.webkit.org/show_bug.cgi?id=117244
     5
     6        Reviewed by Daniel Bates.
     7
     8        Fixed a regression introduced by r151196: not only does webkit.org
     9        still mention WEBKITOUTPUTDIR instead of WEBKIT_OUTPUTDIR, but the
     10        infrastructure used by ports such as GTK+ and EFL also use on it for
     11        things such as jhbuild.
     12
     13        While everything is not fully transitioned to WEBKIT_OUTPUTDIR, read
     14        both environment variables.
     15
     16        * Scripts/webkitdirs.pm:
     17        (determineBaseProductDir):
     18
    1192013-06-05  Wojciech Bielawski  <w.bielawski@samsung.com>
    220
  • trunk/Tools/Scripts/webkitdirs.pm

    r151196 r151216  
    184184
    185185    my $setSharedPrecompsDir;
     186
     187    # FIXME: See https://bugs.webkit.org/show_bug.cgi?id=117249.
     188    #        Once all ports have migrated to WEBKIT_OUTPUTDIR, we can stop
     189    #        reading the WEBKITOUTPUTDIR environment variable.
    186190    $baseProductDir = $ENV{"WEBKIT_OUTPUTDIR"};
     191    $baseProductDir = $ENV{"WEBKITOUTPUTDIR"} if not $baseProductDir;
    187192
    188193    if (!defined($baseProductDir) and isAppleMacWebKit()) {
Note: See TracChangeset for help on using the changeset viewer.