Changeset 151271 in webkit


Ignore:
Timestamp:
Jun 6, 2013 7:42:09 AM (11 years ago)
Author:
commit-queue@webkit.org
Message:

[WinCairo] Fix build-webkit to build WinCairo under VS2010.
​https://bugs.webkit.org/show_bug.cgi?id=117255

Patch by ​peavo@outlook.com <​peavo@outlook.com> on 2013-06-06
Reviewed by Daniel Bates.

Need to update configuration names according to solution file.

  • Scripts/webkitdirs.pm:

(determineConfiguration):
(determinePassedConfiguration):

Location:
trunk/Tools
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/Tools/ChangeLog

    r151263 r151271  
     12013-06-06  peavo@outlook.com  <peavo@outlook.com>
     2
     3        [WinCairo] Fix build-webkit to build WinCairo under VS2010.
     4        https://bugs.webkit.org/show_bug.cgi?id=117255
     5
     6        Reviewed by Daniel Bates.
     7
     8        Need to update configuration names according to solution file.
     9
     10        * Scripts/webkitdirs.pm:
     11        (determineConfiguration):
     12        (determinePassedConfiguration):
     13
    1142013-06-06  Ryosuke Niwa  <rniwa@webkit.org>
    215

  • trunk/Tools/Scripts/webkitdirs.pm

    r151216 r151271  
    283283
    284284    if ($configuration && isWinCairo()) {
    285         unless ($configuration =~ /_Cairo_CFLite$/) {
    286             $configuration .= "_Cairo_CFLite";
     285        unless ($configuration =~ /_WinCairo$/) {
     286            $configuration .= "_WinCairo";
    287287        }
    288288    }
    … …  
    620620            splice(@ARGV, $i, 1);
    621621            $passedConfiguration = "Debug";
    622             $passedConfiguration .= "_Cairo_CFLite" if (isWinCairo() && isCygwin());
     622            $passedConfiguration .= "_WinCairo" if (isWinCairo() && isCygwin());
    623623            return;
    624624        }
    … …  
    626626            splice(@ARGV, $i, 1);
    627627            $passedConfiguration = "Release";
    628             $passedConfiguration .= "_Cairo_CFLite" if (isWinCairo() && isCygwin());
     628            $passedConfiguration .= "_WinCairo" if (isWinCairo() && isCygwin());
    629629            return;
    630630        }
    … …  
    632632            splice(@ARGV, $i, 1);
    633633            $passedConfiguration = "Profiling";
    634             $passedConfiguration .= "_Cairo_CFLite" if (isWinCairo() && isCygwin());
     634            $passedConfiguration .= "_WinCairo" if (isWinCairo() && isCygwin());
    635635            return;
    636636        }
Note: See TracChangeset for help on using the changeset viewer.