[webkit-changes] [101242] trunk/Source/JavaScriptCore

Mon, 28 Nov 2011 03:05:00 -0800

Title: [101242] trunk/Source/_javascript_Core
Revision
101242
Author
mrobin...@webkit.org
Date
2011-11-28 03:04:52 -0800 (Mon, 28 Nov 2011)

Log Message

[GTK] _javascript_Core generated sources should build in the DerivedSources directory
https://bugs.webkit.org/show_bug.cgi?id=73197

Reviewed by Philippe Normand.

Build all _javascript_Core generated sources in DerivedSources.

* GNUmakefile.am: Update generation rules.
* GNUmakefile.list.am: Update source lists.

Modified Paths

Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (101241 => 101242)


--- trunk/Source/_javascript_Core/ChangeLog	2011-11-28 11:01:26 UTC (rev 101241)
+++ trunk/Source/_javascript_Core/ChangeLog	2011-11-28 11:04:52 UTC (rev 101242)
@@ -1,3 +1,15 @@
+2011-11-28  Martin Robinson  <mrobin...@igalia.com>
+
+        [GTK] _javascript_Core generated sources should build in the DerivedSources directory
+        https://bugs.webkit.org/show_bug.cgi?id=73197
+
+        Reviewed by Philippe Normand.
+
+        Build all _javascript_Core generated sources in DerivedSources.
+
+        * GNUmakefile.am: Update generation rules.
+        * GNUmakefile.list.am: Update source lists.
+
 2011-11-27  Filip Pizlo  <fpi...@apple.com>
 
         DFG should not emit GetMethod node

Modified: trunk/Source/_javascript_Core/GNUmakefile.am (101241 => 101242)


--- trunk/Source/_javascript_Core/GNUmakefile.am	2011-11-28 11:01:26 UTC (rev 101241)
+++ trunk/Source/_javascript_Core/GNUmakefile.am	2011-11-28 11:04:52 UTC (rev 101242)
@@ -65,9 +65,7 @@
 	-I$(srcdir)/Source/_javascript_Core/wtf/text \
 	-I$(srcdir)/Source/_javascript_Core/wtf/unicode \
 	-I$(srcdir)/Source/_javascript_Core/yarr \
-	-I$(top_builddir)/Source/_javascript_Core \
-	-I$(top_builddir)/Source/_javascript_Core/parser \
-	-I$(top_builddir)/Source/_javascript_Core/runtime
+	-I$(top_builddir)/DerivedSources/_javascript_Core
 
 _javascript_core_cflags += \
 	$(global_cflags) \
@@ -76,16 +74,18 @@
 
 pkgconfig_DATA += Source/_javascript_Core/_javascript_coregtk-@WEBKITGTK_API_VERSION@.pc
 
-Source/_javascript_Core/Lexer.lut.h: $(srcdir)/Source/_javascript_Core/create_hash_table $(srcdir)/Source/_javascript_Core/parser/Keywords.table
+$(shell mkdir -p DerivedSources/_javascript_Core)
+
+DerivedSources/_javascript_Core/Lexer.lut.h: $(srcdir)/Source/_javascript_Core/create_hash_table $(srcdir)/Source/_javascript_Core/parser/Keywords.table
 	$(AM_V_GEN)$(PERL) $^ > $@
 
-Source/_javascript_Core/%.lut.h: $(srcdir)/Source/_javascript_Core/create_hash_table $(srcdir)/Source/_javascript_Core/%.cpp
+DerivedSources/_javascript_Core/%.lut.h: $(srcdir)/Source/_javascript_Core/create_hash_table $(srcdir)/Source/_javascript_Core/runtime/%.cpp
 	$(AM_V_GEN)$(PERL) $^ -i > $@
 
-Source/_javascript_Core/RegExpJitTables.h: $(srcdir)/Source/_javascript_Core/create_regex_tables
+DerivedSources/_javascript_Core/RegExpJitTables.h: $(srcdir)/Source/_javascript_Core/create_regex_tables
 	$(AM_V_GEN)$(PYTHON) $^ > $@
 
-Source/_javascript_Core/KeywordLookup.h: $(srcdir)/Source/_javascript_Core/KeywordLookupGenerator.py $(srcdir)/Source/_javascript_Core/parser/Keywords.table
+DerivedSources/_javascript_Core/KeywordLookup.h: $(srcdir)/Source/_javascript_Core/KeywordLookupGenerator.py $(srcdir)/Source/_javascript_Core/parser/Keywords.table
 	$(AM_V_GEN)$(PYTHON) $^ > $@
 
 jsc: $(_javascript_core_built_nosources) Programs/jsc$(EXEEXT)
@@ -152,29 +152,8 @@
 	Source/_javascript_Core/parser/Keywords.table \
 	Source/_javascript_Core/THANKS
 
-# Clean rules for _javascript_Core
-# FIXME: Should this list be generated from _javascript_core_built_nosources?
 CLEANFILES += \
-	Source/_javascript_Core/Lexer.lut.h \
-	Source/_javascript_Core/RegExpJitTables.h \
-	Source/_javascript_Core/runtime/ArrayConstructor.lut.h \
-	Source/_javascript_Core/runtime/ArrayPrototype.lut.h \
-	Source/_javascript_Core/runtime/BooleanPrototype.lut.h \
-	Source/_javascript_Core/runtime/DateConstructor.lut.h \
-	Source/_javascript_Core/runtime/DatePrototype.lut.h \
-	Source/_javascript_Core/runtime/ErrorPrototype.lut.h \
-	Source/_javascript_Core/runtime/JSGlobalObject.lut.h \
-	Source/_javascript_Core/runtime/JSONObject.lut.h \
-	Source/_javascript_Core/runtime/MathObject.lut.h \
-	Source/_javascript_Core/runtime/NumberConstructor.lut.h \
-	Source/_javascript_Core/runtime/NumberPrototype.lut.h \
-	Source/_javascript_Core/runtime/ObjectConstructor.lut.h \
-	Source/_javascript_Core/runtime/ObjectPrototype.lut.h \
-	Source/_javascript_Core/runtime/RegExpConstructor.lut.h \
-	Source/_javascript_Core/runtime/RegExpObject.lut.h \
-	Source/_javascript_Core/runtime/RegExpPrototype.lut.h \
-	Source/_javascript_Core/runtime/StringConstructor.lut.h \
-	Source/_javascript_Core/runtime/StringPrototype.lut.h \
+	$(_javascript_core_built_nosources) \
 	Programs/jsc \
 	Programs/jsc-@WEBKITGTK_API_MAJOR_VERSION@ \
 	Programs/minidom

Modified: trunk/Source/_javascript_Core/GNUmakefile.list.am (101241 => 101242)


--- trunk/Source/_javascript_Core/GNUmakefile.list.am	2011-11-28 11:01:26 UTC (rev 101241)
+++ trunk/Source/_javascript_Core/GNUmakefile.list.am	2011-11-28 11:04:52 UTC (rev 101242)
@@ -11,27 +11,27 @@
 	Source/_javascript_Core/API/WebKitAvailability.h
 
 _javascript_core_built_nosources += \
-	Source/_javascript_Core/KeywordLookup.h \
-	Source/_javascript_Core/Lexer.lut.h \
-	Source/_javascript_Core/RegExpJitTables.h \
-	Source/_javascript_Core/runtime/ArrayConstructor.lut.h \
-	Source/_javascript_Core/runtime/ArrayPrototype.lut.h \
-	Source/_javascript_Core/runtime/BooleanPrototype.lut.h \
-	Source/_javascript_Core/runtime/DateConstructor.lut.h \
-	Source/_javascript_Core/runtime/DatePrototype.lut.h \
-	Source/_javascript_Core/runtime/ErrorPrototype.lut.h \
-	Source/_javascript_Core/runtime/JSGlobalObject.lut.h \
-	Source/_javascript_Core/runtime/JSONObject.lut.h \
-	Source/_javascript_Core/runtime/MathObject.lut.h \
-	Source/_javascript_Core/runtime/NumberConstructor.lut.h \
-	Source/_javascript_Core/runtime/NumberPrototype.lut.h \
-	Source/_javascript_Core/runtime/ObjectConstructor.lut.h \
-	Source/_javascript_Core/runtime/ObjectPrototype.lut.h \
-	Source/_javascript_Core/runtime/RegExpConstructor.lut.h \
-	Source/_javascript_Core/runtime/RegExpObject.lut.h \
-	Source/_javascript_Core/runtime/RegExpPrototype.lut.h \
-	Source/_javascript_Core/runtime/StringConstructor.lut.h \
-	Source/_javascript_Core/runtime/StringPrototype.lut.h
+	DerivedSources/_javascript_Core/KeywordLookup.h \
+	DerivedSources/_javascript_Core/Lexer.lut.h \
+	DerivedSources/_javascript_Core/RegExpJitTables.h \
+	DerivedSources/_javascript_Core/ArrayConstructor.lut.h \
+	DerivedSources/_javascript_Core/ArrayPrototype.lut.h \
+	DerivedSources/_javascript_Core/BooleanPrototype.lut.h \
+	DerivedSources/_javascript_Core/DateConstructor.lut.h \
+	DerivedSources/_javascript_Core/DatePrototype.lut.h \
+	DerivedSources/_javascript_Core/ErrorPrototype.lut.h \
+	DerivedSources/_javascript_Core/JSGlobalObject.lut.h \
+	DerivedSources/_javascript_Core/JSONObject.lut.h \
+	DerivedSources/_javascript_Core/MathObject.lut.h \
+	DerivedSources/_javascript_Core/NumberConstructor.lut.h \
+	DerivedSources/_javascript_Core/NumberPrototype.lut.h \
+	DerivedSources/_javascript_Core/ObjectConstructor.lut.h \
+	DerivedSources/_javascript_Core/ObjectPrototype.lut.h \
+	DerivedSources/_javascript_Core/RegExpConstructor.lut.h \
+	DerivedSources/_javascript_Core/RegExpObject.lut.h \
+	DerivedSources/_javascript_Core/RegExpPrototype.lut.h \
+	DerivedSources/_javascript_Core/StringConstructor.lut.h \
+	DerivedSources/_javascript_Core/StringPrototype.lut.h
 
 _javascript_core_sources += \
 	Source/_javascript_Core/API/APICast.h \

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to