Title: [265181] trunk/Source/WebKit
Revision
265181
Author
[email protected]
Date
2020-08-01 18:18:20 -0700 (Sat, 01 Aug 2020)

Log Message

Fix and further refine makefile rule for WebKit messages generated files
https://bugs.webkit.org/show_bug.cgi?id=215064

Reviewed by Sam Weinig.

* DerivedSources-output.xcfilelist: Updated for a file that was omitted
because of a typo in the makefile.
* DerivedSources.make: Fix "addsufix" typo and reorganized things a bit.

Modified Paths

Diff

Modified: trunk/Source/WebKit/ChangeLog (265180 => 265181)


--- trunk/Source/WebKit/ChangeLog	2020-08-01 22:55:47 UTC (rev 265180)
+++ trunk/Source/WebKit/ChangeLog	2020-08-02 01:18:20 UTC (rev 265181)
@@ -1,3 +1,14 @@
+2020-08-01  Darin Adler  <[email protected]>
+
+        Fix and further refine makefile rule for WebKit messages generated files
+        https://bugs.webkit.org/show_bug.cgi?id=215064
+
+        Reviewed by Sam Weinig.
+
+        * DerivedSources-output.xcfilelist: Updated for a file that was omitted
+        because of a typo in the makefile.
+        * DerivedSources.make: Fix "addsufix" typo and reorganized things a bit.
+
 2020-08-01  Keith Rollin  <[email protected]>
 
         Prevent multiple invocations of generate-message-receiver.py

Modified: trunk/Source/WebKit/DerivedSources-output.xcfilelist (265180 => 265181)


--- trunk/Source/WebKit/DerivedSources-output.xcfilelist	2020-08-01 22:55:47 UTC (rev 265180)
+++ trunk/Source/WebKit/DerivedSources-output.xcfilelist	2020-08-02 01:18:20 UTC (rev 265181)
@@ -169,6 +169,7 @@
 $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit2/RemoteCDMProxyMessages.h
 $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit2/RemoteCDMProxyMessagesReplies.h
 $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit2/RemoteCaptureSampleManagerMessageReceiver.cpp
+$(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit2/RemoteCaptureSampleManagerMessages.h
 $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit2/RemoteCaptureSampleManagerMessagesReplies.h
 $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit2/RemoteLayerTreeDrawingAreaProxyMessageReceiver.cpp
 $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit2/RemoteLayerTreeDrawingAreaProxyMessages.h

Modified: trunk/Source/WebKit/DerivedSources.make (265180 => 265181)


--- trunk/Source/WebKit/DerivedSources.make	2020-08-01 22:55:47 UTC (rev 265180)
+++ trunk/Source/WebKit/DerivedSources.make	2020-08-02 01:18:20 UTC (rev 265181)
@@ -155,8 +155,8 @@
 	UIProcess/mac/SecItemShimProxy \
 	UIProcess/WebGeolocationManagerProxy \
 	UIProcess/Cocoa/PlaybackSessionManagerProxy \
+	UIProcess/Cocoa/UserMediaCaptureManagerProxy \
 	UIProcess/Cocoa/VideoFullscreenManagerProxy \
-	UIProcess/Cocoa/UserMediaCaptureManagerProxy \
 	UIProcess/WebCookieManagerProxy \
 	UIProcess/ViewGestureController \
 	UIProcess/WebProcessProxy \
@@ -242,8 +242,9 @@
 	GPUProcess/media/RemoteAudioDestinationManager \
 #
 
-SCRIPTS = \
-    $(WebKit2)/Scripts/generate-message-receiver.py \
+GENERATE_MESSAGE_RECEIVER_SCRIPT = $(WebKit2)/Scripts/generate-message-receiver.py
+GENERATE_MESSAGE_RECEIVER_SCRIPTS = \
+    $(GENERATE_MESSAGE_RECEIVER_SCRIPT) \
     $(WebKit2)/Scripts/webkit/__init__.py \
     $(WebKit2)/Scripts/webkit/messages.py \
     $(WebKit2)/Scripts/webkit/model.py \
@@ -254,25 +255,20 @@
 HEADER_FLAGS := $(shell echo $(BUILT_PRODUCTS_DIR) $(HEADER_SEARCH_PATHS) $(SYSTEM_HEADER_SEARCH_PATHS) | perl -e 'print "-I" . join(" -I", split(" ", <>));')
 
 MESSAGE_RECEIVER_FILES := $(addsuffix MessageReceiver.cpp,$(notdir $(MESSAGE_RECEIVERS)))
-MESSAGES_FILES := $(addsufix Messages.h,$(notdir $(MESSAGE_RECEIVERS)))
+MESSAGES_FILES := $(addsuffix Messages.h,$(notdir $(MESSAGE_RECEIVERS)))
 MESSAGE_REPLIES_FILES := $(addsuffix MessagesReplies.h,$(notdir $(MESSAGE_RECEIVERS)))
+
+GENERATED_MESSAGES_FILES := $(MESSAGE_RECEIVER_FILES) $(MESSAGES_FILES) $(MESSAGE_REPLIES_FILES) MessageNames.h MessageNames.cpp
+GENERATED_MESSAGES_FILES_AS_PATTERNS := $(subst .,%,$(GENERATED_MESSAGES_FILES))
+
 MESSAGES_IN_FILES := $(addsuffix .messages.in,$(MESSAGE_RECEIVERS))
 
-MESSAGE_RECEIVER_PATTERNS := $(subst .,%,$(MESSAGE_RECEIVER_FILES))
-MESSAGES_PATTERNS := $(subst .,%,$(MESSAGES_FILES))
-MESSAGE_REPLIES_PATTERNS := $(subst .,%,$(MESSAGE_REPLIES_FILES))
-
 .PHONY : all
 
-all : \
-    $(MESSAGE_RECEIVER_FILES) \
-    $(MESSAGES_FILES) \
-    $(MESSAGE_REPLIES_FILES) \
-    MessageNames.h MessageNames.cpp \
-#
+all : $(GENERATED_MESSAGES_FILES)
 
-$(MESSAGE_RECEIVER_PATTERNS) $(MESSAGES_PATTERNS) $(MESSAGE_REPLIES_PATTERNS) MessageNames%h MessageNames%cpp : $(MESSAGES_IN_FILES) $(SCRIPTS)
-	python $(WebKit2)/Scripts/generate-message-receiver.py $(WebKit2) $(MESSAGE_RECEIVERS)
+$(GENERATED_MESSAGES_FILES_AS_PATTERNS) : $(MESSAGES_IN_FILES) $(GENERATE_MESSAGE_RECEIVER_SCRIPTS)
+	python $(GENERATE_MESSAGE_RECEIVER_SCRIPT) $(WebKit2) $(MESSAGE_RECEIVERS)
 
 TEXT_PREPROCESSOR_FLAGS=-E -P -w
 
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to