Title: [151955] trunk/Source/WebCore
Revision
151955
Author
[email protected]
Date
2013-06-24 22:58:25 -0700 (Mon, 24 Jun 2013)

Log Message

DerivedSources.make should optionally include SupplementalDependencies.dep
https://bugs.webkit.org/show_bug.cgi?id=117972

Reviewed by Dan Bernstein.

make(1) logs a non-fatal error to stderr when an included Makefile can't
be found. This error is non-fatal because after make(1) reads in all the
Makefiles it runs the recipe for any rule that specifies one of the
Makefiles as a target. Only if the Makefile is still missing after
applying these rules does the error become fatal.

Since SupplementalDependencies.dep is generated by running a script on
SupplementalDependencies.txt, the file won't exist during clean builds.
Each time make(1) logs this non-fatal error, Xcode sees it and itself
logs a non-fatal error. This is annoying.

We don't care about this error. We only care if the recipe to generate
SupplementalDependencies.dep fails, which is already a fatal error.
Suppress the error by including SupplementalDependencies.dep optionally.

* DerivedSources.make:

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (151954 => 151955)


--- trunk/Source/WebCore/ChangeLog	2013-06-25 04:23:13 UTC (rev 151954)
+++ trunk/Source/WebCore/ChangeLog	2013-06-25 05:58:25 UTC (rev 151955)
@@ -1,3 +1,27 @@
+2013-06-24  Andy Estes  <[email protected]>
+
+        DerivedSources.make should optionally include SupplementalDependencies.dep
+        https://bugs.webkit.org/show_bug.cgi?id=117972
+
+        Reviewed by Dan Bernstein.
+
+        make(1) logs a non-fatal error to stderr when an included Makefile can't
+        be found. This error is non-fatal because after make(1) reads in all the
+        Makefiles it runs the recipe for any rule that specifies one of the
+        Makefiles as a target. Only if the Makefile is still missing after
+        applying these rules does the error become fatal.
+
+        Since SupplementalDependencies.dep is generated by running a script on
+        SupplementalDependencies.txt, the file won't exist during clean builds.
+        Each time make(1) logs this non-fatal error, Xcode sees it and itself
+        logs a non-fatal error. This is annoying.
+
+        We don't care about this error. We only care if the recipe to generate
+        SupplementalDependencies.dep fails, which is already a fatal error.
+        Suppress the error by including SupplementalDependencies.dep optionally.
+
+        * DerivedSources.make:
+
 2013-06-24  Kangil Han  <[email protected]>
 
         Add support for document.currentScript

Modified: trunk/Source/WebCore/DerivedSources.make (151954 => 151955)


--- trunk/Source/WebCore/DerivedSources.make	2013-06-25 04:23:13 UTC (rev 151954)
+++ trunk/Source/WebCore/DerivedSources.make	2013-06-25 05:58:25 UTC (rev 151955)
@@ -1027,7 +1027,7 @@
 JS%.h : %.idl $(JS_BINDINGS_SCRIPTS) $(IDL_ATTRIBUTES_FILE) $(WINDOW_CONSTRUCTORS_FILE) $(WORKERCONTEXT_CONSTRUCTORS_FILE) $(PLATFORM_FEATURE_DEFINES)
 	$(call generator_script, $(JS_BINDINGS_SCRIPTS)) $(IDL_COMMON_ARGS) --defines "$(FEATURE_DEFINES) $(ADDITIONAL_IDL_DEFINES) LANGUAGE_JAVASCRIPT" --generator JS --idlAttributesFile $(IDL_ATTRIBUTES_FILE) --supplementalDependencyFile $(SUPPLEMENTAL_DEPENDENCY_FILE) $<
 
-include $(SUPPLEMENTAL_MAKEFILE_DEPS)
+-include $(SUPPLEMENTAL_MAKEFILE_DEPS)
 
 # Inspector interfaces generator
 
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to