Changeset 181002 in webkit


Ignore:
Timestamp:
Mar 4, 2015 9:50:18 AM (9 years ago)
Author:
Brent Fulgham
Message:

[Win] Missing dependency checking in DerivedSources.make for FeatureDefines.props
​https://bugs.webkit.org/show_bug.cgi?id=142284

Reviewed by David Kilzer.

Make DerivedSources.make understand its build dependency on FeatureDefines.props
when building on Windows:

  1. Modify DerivedSources.make to declare a default dependency (on Windows) to $(WEBKIT_LIBRARIES)/tools/vsprops/FeatureDefines.props.
  2. Update the Windows script 'build-generated-files.pl' to specify the correct FeatureDefines{Cairo}.props value to use, depending on build environment.
  • DerivedSources.make:
  • WebCore.vcxproj/build-generated-files.pl:
Location:
trunk/Source/WebCore
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r181001 r181002  
     12015-03-04  Brent Fulgham  <bfulgham@apple.com>
     2
     3        [Win] Missing dependency checking in DerivedSources.make for FeatureDefines.props
     4        https://bugs.webkit.org/show_bug.cgi?id=142284
     5
     6        Reviewed by David Kilzer.
     7
     8        Make DerivedSources.make understand its build dependency on FeatureDefines.props
     9        when building on Windows:
     10        1. Modify DerivedSources.make to declare a default dependency (on Windows)
     11           to $(WEBKIT_LIBRARIES)/tools/vsprops/FeatureDefines.props.
     12        2. Update the Windows script 'build-generated-files.pl' to specify the correct
     13           FeatureDefines{Cairo}.props value to use, depending on build environment.
     14
     15        * DerivedSources.make:
     16        * WebCore.vcxproj/build-generated-files.pl:
     17
    1182015-03-04  Darin Adler  <darin@apple.com>
    219

  • trunk/Source/WebCore/DerivedSources.make

    r180601 r181002  
    1 # Copyright (C) 2006-2008, 2012, 2014, 2015 Apple Inc. All rights reserved.
     1# Copyright (C) 2006-2008, 2012, 2014-2015 Apple Inc. All rights reserved.
    22# Copyright (C) 2006 Samuel Weinig <sam.weinig@gmail.com>
    33# Copyright (C) 2009 Cameron McCormack <cam@mcc.id.au>
    … …  
    718718
    719719ifeq ($(PLATFORM_FEATURE_DEFINES),)
     720ifeq ($(OS), Windows*)
     721PLATFORM_FEATURE_DEFINES = $(WEBKIT_LIBRARIES)/tools/vsprops/FeatureDefines.props
     722else
    720723PLATFORM_FEATURE_DEFINES = Configurations/FeatureDefines.xcconfig
     724endif
    721725endif
    722726

  • trunk/Source/WebCore/WebCore.vcxproj/build-generated-files.pl

    r170937 r181002  
    11#!/usr/bin/perl -w
    22
    3 # Copyright (C) 2007, 2014 Apple Inc.  All rights reserved.
     3# Copyright (C) 2007, 2014-2015 Apple Inc.  All rights reserved.
    44#
    55# Redistribution and use in source and binary forms, with or without
    … …  
    7575$ENV{'WebReplayScripts'} = File::Spec->catdir($XDSTROOT, 'include', 'private', 'JavaScriptCore');
    7676
     77if ($ARGV[2] eq 'cairo') {
     78    $ENV{'PLATFORM_FEATURE_DEFINES'} = File::Spec->catfile($SDKROOT, 'tools', 'vsprops', 'FeatureDefinesCairo.props');
     79} else {
     80    $ENV{'PLATFORM_FEATURE_DEFINES'} = File::Spec->catfile($SDKROOT, 'tools', 'vsprops', 'FeatureDefines.props');
     81}
     82
    7783my $DERIVED_SOURCES_MAKEFILE = File::Spec->catfile($XSRCROOT, 'DerivedSources.make');
    7884system('/usr/bin/make', '-f', $DERIVED_SOURCES_MAKEFILE, '-j', $NUMCPUS) and die "Failed to build $DERIVED_SOURCES_MAKEFILE: $!";
Note: See TracChangeset for help on using the changeset viewer.