Adding a new WebCore JavaScript built-in source file does not trigger rebuild of...
authordarin@apple.com <darin@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 24 Jul 2016 11:10:02 +0000 (11:10 +0000)
committerdarin@apple.com <darin@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 24 Jul 2016 11:10:02 +0000 (11:10 +0000)
https://bugs.webkit.org/show_bug.cgi?id=160115

Reviewed by Youenn Fablet.

Source/JavaScriptCore:

* make-generated-sources.sh: Removed. Was unused.

Source/WebCore:

* DerivedSources.make: Added a missing dependency so the rule that builds WebCore_BUILTINS_WRAPPERS
kicks in when the list of WebCore_BUILTINS_SOURCES is modified. Also added another missing dependency
so that changes to the JavaScript built-ins Python scripts will also trigger WebCore_BUILTINS_WRAPPERS.

* make-generated-sources.sh: Removed. Was unused.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@203661 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/JavaScriptCore/ChangeLog
Source/JavaScriptCore/make-generated-sources.sh [deleted file]
Source/WebCore/ChangeLog
Source/WebCore/DerivedSources.make
Source/WebCore/make-generated-sources.sh [deleted file]

index 92870e0..625e473 100644 (file)
@@ -1,3 +1,12 @@
+2016-07-24  Darin Adler  <darin@apple.com>
+
+        Adding a new WebCore JavaScript built-in source file does not trigger rebuild of WebCoreJSBuiltins*
+        https://bugs.webkit.org/show_bug.cgi?id=160115
+
+        Reviewed by Youenn Fablet.
+
+        * make-generated-sources.sh: Removed. Was unused.
+
 2016-07-23  Commit Queue  <commit-queue@webkit.org>
 
         Unreviewed, rolling out r203641.
diff --git a/Source/JavaScriptCore/make-generated-sources.sh b/Source/JavaScriptCore/make-generated-sources.sh
deleted file mode 100755 (executable)
index ccfeedd..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-export SRCROOT=$PWD
-export CREATE_HASH_TABLE="$SRCROOT/create_hash_table"
-export CREATE_REGEXP_TABLES="$SRCROOT/create_regex_tables"
-export CREATE_KEYWORD_LOOKUP="$SRCROOT/KeywordLookupGenerator.py"
-
-mkdir -p DerivedSources/JavaScriptCore
-cd DerivedSources/JavaScriptCore
-
-make -f ../../DerivedSources.make JavaScriptCore=../.. BUILT_PRODUCTS_DIR=../..
-cd ../..
index 4106693..15ecde6 100644 (file)
@@ -1,3 +1,16 @@
+2016-07-24  Darin Adler  <darin@apple.com>
+
+        Adding a new WebCore JavaScript built-in source file does not trigger rebuild of WebCoreJSBuiltins*
+        https://bugs.webkit.org/show_bug.cgi?id=160115
+
+        Reviewed by Youenn Fablet.
+
+        * DerivedSources.make: Added a missing dependency so the rule that builds WebCore_BUILTINS_WRAPPERS
+        kicks in when the list of WebCore_BUILTINS_SOURCES is modified. Also added another missing dependency
+        so that changes to the JavaScript built-ins Python scripts will also trigger WebCore_BUILTINS_WRAPPERS.
+
+        * make-generated-sources.sh: Removed. Was unused.
+
 2016-07-23  Zalan Bujtas  <zalan@apple.com>
 
         Stop isEmpty() from leaking out of SVG.
index 42235eb..0e72b86 100644 (file)
@@ -1329,10 +1329,14 @@ WebCore_BUILTINS_WRAPPERS = \
 # generated should not affect other builtins when not passing '--combined' to the generator.
 
 .PHONY: force
+
+WebCore_BUILTINS_SOURCES_LIST : $(JavaScriptCore_SCRIPTS_DIR)/UpdateContents.py force
+       $(PYTHON) $(JavaScriptCore_SCRIPTS_DIR)/UpdateContents.py '$(WebCore_BUILTINS_SOURCES)' $@
+
 WebCore_BUILTINS_DEPENDENCIES_LIST : $(JavaScriptCore_SCRIPTS_DIR)/UpdateContents.py force
        $(PYTHON) $(JavaScriptCore_SCRIPTS_DIR)/UpdateContents.py '$(BUILTINS_GENERATOR_SCRIPTS)' $@
 
-$(firstword $(WebCore_BUILTINS_WRAPPERS)): WebCore_BUILTINS_DEPENDENCIES_LIST
+$(firstword $(WebCore_BUILTINS_WRAPPERS)): WebCore_BUILTINS_SOURCES_LIST $(BUILTINS_GENERATOR_SCRIPTS) WebCore_BUILTINS_DEPENDENCIES_LIST
        $(PYTHON) $(JavaScriptCore_SCRIPTS_DIR)/generate-js-builtins.py --wrappers-only --output-directory . --framework WebCore $(WebCore_BUILTINS_SOURCES)
 
 %Builtins.h: %.js $(BUILTINS_GENERATOR_SCRIPTS) WebCore_BUILTINS_DEPENDENCIES_LIST
diff --git a/Source/WebCore/make-generated-sources.sh b/Source/WebCore/make-generated-sources.sh
deleted file mode 100755 (executable)
index dbee715..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-export SOURCE_ROOT=$PWD
-export SRCROOT=$PWD
-export WebCore=$PWD
-export InspectorScripts=$PWD/../JavaScriptCore/inspector/scripts
-export WebReplayScripts=$PWD/../JavaScriptCore/replay/scripts
-export GenerateJSBuiltinsScripts=$PWD/../JavaScriptCore
-
-mkdir -p DerivedSources/WebCore &&
-make -C DerivedSources/WebCore -f ../../DerivedSources.make $@