Title: [181002] trunk/Source/WebCore
- Revision
- 181002
- Author
- [email protected]
- Date
- 2015-03-04 09:50:18 -0800 (Wed, 04 Mar 2015)
Log 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:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (181001 => 181002)
--- trunk/Source/WebCore/ChangeLog 2015-03-04 17:30:32 UTC (rev 181001)
+++ trunk/Source/WebCore/ChangeLog 2015-03-04 17:50:18 UTC (rev 181002)
@@ -1,3 +1,20 @@
+2015-03-04 Brent Fulgham <[email protected]>
+
+ [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:
+
2015-03-04 Darin Adler <[email protected]>
Make _javascript_ binding get and set legacy event listener attributes directly
Modified: trunk/Source/WebCore/DerivedSources.make (181001 => 181002)
--- trunk/Source/WebCore/DerivedSources.make 2015-03-04 17:30:32 UTC (rev 181001)
+++ trunk/Source/WebCore/DerivedSources.make 2015-03-04 17:50:18 UTC (rev 181002)
@@ -1,4 +1,4 @@
-# Copyright (C) 2006-2008, 2012, 2014, 2015 Apple Inc. All rights reserved.
+# Copyright (C) 2006-2008, 2012, 2014-2015 Apple Inc. All rights reserved.
# Copyright (C) 2006 Samuel Weinig <[email protected]>
# Copyright (C) 2009 Cameron McCormack <[email protected]>
#
@@ -717,8 +717,12 @@
endif
ifeq ($(PLATFORM_FEATURE_DEFINES),)
+ifeq ($(OS), Windows*)
+PLATFORM_FEATURE_DEFINES = $(WEBKIT_LIBRARIES)/tools/vsprops/FeatureDefines.props
+else
PLATFORM_FEATURE_DEFINES = Configurations/FeatureDefines.xcconfig
endif
+endif
ifeq ($(WTF_PLATFORM_IOS), 1)
ADDITIONAL_BINDING_IDLS =
Modified: trunk/Source/WebCore/WebCore.vcxproj/build-generated-files.pl (181001 => 181002)
--- trunk/Source/WebCore/WebCore.vcxproj/build-generated-files.pl 2015-03-04 17:30:32 UTC (rev 181001)
+++ trunk/Source/WebCore/WebCore.vcxproj/build-generated-files.pl 2015-03-04 17:50:18 UTC (rev 181002)
@@ -1,6 +1,6 @@
#!/usr/bin/perl -w
-# Copyright (C) 2007, 2014 Apple Inc. All rights reserved.
+# Copyright (C) 2007, 2014-2015 Apple Inc. All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
@@ -74,5 +74,11 @@
$ENV{'InspectorScripts'} = File::Spec->catdir($XDSTROOT, 'include', 'private', '_javascript_Core');
$ENV{'WebReplayScripts'} = File::Spec->catdir($XDSTROOT, 'include', 'private', '_javascript_Core');
+if ($ARGV[2] eq 'cairo') {
+ $ENV{'PLATFORM_FEATURE_DEFINES'} = File::Spec->catfile($SDKROOT, 'tools', 'vsprops', 'FeatureDefinesCairo.props');
+} else {
+ $ENV{'PLATFORM_FEATURE_DEFINES'} = File::Spec->catfile($SDKROOT, 'tools', 'vsprops', 'FeatureDefines.props');
+}
+
my $DERIVED_SOURCES_MAKEFILE = File::Spec->catfile($XSRCROOT, 'DerivedSources.make');
system('/usr/bin/make', '-f', $DERIVED_SOURCES_MAKEFILE, '-j', $NUMCPUS) and die "Failed to build $DERIVED_SOURCES_MAKEFILE: $!";
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
