2010-07-15 Martin Robinson <mrobinson@igalia.com>
authormrobinson@webkit.org <mrobinson@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 15 Jul 2010 22:47:38 +0000 (22:47 +0000)
committermrobinson@webkit.org <mrobinson@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 15 Jul 2010 22:47:38 +0000 (22:47 +0000)
        Reviewed by Oliver Hunt.

        [GTK] Simplify the distribution step
        https://bugs.webkit.org/show_bug.cgi?id=42414

        * GNUmakefile.am: Remove unused variables. Rely on WebCore/GNUmakefile.am
        to handle distributing IDL files from WebCore and to modify EXTRA_DIST.
2010-07-15  Martin Robinson  <mrobinson@igalia.com>

        Reviewed by Oliver Hunt.

        [GTK] Simplify the distribution step
        https://bugs.webkit.org/show_bug.cgi?id=42414

        * GNUmakefile.am: Add extra dist files directly to EXTRA_DIST instead
        of adding them by proxy via javascriptcore_dist. Sort the EXTRA_DIST list.
        Refer to create_hash_table and create_regexp_tables directly, as is the
        behavior with other code generation scripts.
2010-07-15  Martin Robinson  <mrobinson@igalia.com>

        Reviewed by Oliver Hunt.

        [GTK] Simplify the distribution step
        https://bugs.webkit.org/show_bug.cgi?id=42414

        No new tests as this is just a build change.

        * GNUmakefile.am: Modify EXTRA_DIST directly and make sure the list
        of files is sorted. Also handle distributing the IDL files from the
        WebCore source tree.

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

ChangeLog
GNUmakefile.am
JavaScriptCore/ChangeLog
JavaScriptCore/GNUmakefile.am
WebCore/ChangeLog
WebCore/GNUmakefile.am

index dd6df53..3bb4258 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2010-07-15  Martin Robinson  <mrobinson@igalia.com>
+
+        Reviewed by Oliver Hunt.
+
+        [GTK] Simplify the distribution step
+        https://bugs.webkit.org/show_bug.cgi?id=42414
+
+        * GNUmakefile.am: Remove unused variables. Rely on WebCore/GNUmakefile.am
+        to handle distributing IDL files from WebCore and to modify EXTRA_DIST.
+
 2010-07-14  Martin Robinson  <mrobinson@igalia.com>
 
         Reviewed by Xan Lopez.
index 099fe63..755b51b 100644 (file)
@@ -40,12 +40,6 @@ GENSOURCES_WEBCORE := $(top_builddir)/DerivedSources/WebCore
 GENSOURCES_WEBKIT := $(top_builddir)/DerivedSources/webkit
 GENPROGRAMS := $(top_builddir)/Programs
 
-# Script for creating hash tables
-CREATE_HASH_TABLE = $(srcdir)/JavaScriptCore/create_hash_table
-
-# Script for creating regexp tables
-CREATE_REGEXP_TABLES = $(srcdir)/JavaScriptCore/create_regex_tables
-
 # Programs to run the WebKitGtk unit tests
 GTESTER = gtester
 GTESTER_REPORT = gtester-report
@@ -65,13 +59,11 @@ javascriptcore_cppflags:=
 javascriptcore_sources :=
 javascriptcore_built_sources :=
 javascriptcore_built_nosources :=
-javascriptcore_dist :=
 webcore_cppflags :=
 webcore_sources :=
 webcore_libadd :=
 webcore_built_sources :=
 webcore_built_nosources :=
-webcore_dist :=
 webcoregtk_cppflags :=
 webcoregtk_sources :=
 IDL_BINDINGS_GDOM :=
@@ -587,8 +579,6 @@ DerivedSources/webkit/webkitdomenumtypes.cpp: $(top_builddir)/WebKit/gtk/webkit/
 EXTRA_DIST += \
        $(srcdir)/gtk-doc.make \
        WebKit/LICENSE \
-       $(javascriptcore_dist) \
-       $(webcore_dist) \
        $(srcdir)/autotools/symbols.filter \
        $(srcdir)/WebKit/gtk/ChangeLog \
        $(srcdir)/WebKit/gtk/NEWS \
@@ -833,35 +823,7 @@ distclean-local:
        -rm -rf $(GENSOURCES) $(GENPROGRAMS)
 
 dist-hook:
-       cp $(srcdir)/WebKit/gtk/NEWS $(distdir)/
-       mkdir -p $(distdir)/WebCore/css
-       cp $(srcdir)/WebCore/css/*.idl $(distdir)/WebCore/css
-       mkdir -p $(distdir)/WebCore/dom
-       cp $(srcdir)/WebCore/dom/*.idl $(distdir)/WebCore/dom
-       mkdir -p $(distdir)/WebCore/html
-       cp $(srcdir)/WebCore/html/*.idl $(distdir)/WebCore/html
-       mkdir -p $(distdir)/WebCore/html/canvas
-       cp $(srcdir)/WebCore/html/canvas/*.idl $(distdir)/WebCore/html/canvas
-       mkdir -p $(distdir)/WebCore/inspector
-       cp $(srcdir)/WebCore/inspector/*.idl $(distdir)/WebCore/inspector
-       mkdir -p $(distdir)/WebCore/loader/appcache
-       cp $(srcdir)/WebCore/loader/appcache/*.idl $(distdir)/WebCore/loader/appcache
-       mkdir -p $(distdir)/WebCore/notifications
-       cp $(srcdir)/WebCore/notifications/*.idl $(distdir)/WebCore/notifications
-       mkdir -p $(distdir)/WebCore/page
-       cp $(srcdir)/WebCore/page/*.idl $(distdir)/WebCore/page
-       mkdir -p $(distdir)/WebCore/plugins
-       cp $(srcdir)/WebCore/plugins/*.idl $(distdir)/WebCore/plugins
-       mkdir -p $(distdir)/WebCore/storage
-       cp $(srcdir)/WebCore/storage/*.idl $(distdir)/WebCore/storage
-       mkdir -p $(distdir)/WebCore/svg
-       cp $(srcdir)/WebCore/svg/*.idl $(distdir)/WebCore/svg
-       mkdir -p $(distdir)/WebCore/workers
-       cp $(srcdir)/WebCore/workers/*.idl $(distdir)/WebCore/workers
-       mkdir -p $(distdir)/WebCore/xml
-       cp $(srcdir)/WebCore/xml/*.idl $(distdir)/WebCore/xml
-       mkdir -p $(distdir)/WebCore/websockets
-       cp $(srcdir)/WebCore/websockets/*.idl $(distdir)/WebCore/websockets
+       cp $(srcdir)/WebKit/gtk/NEWS $(distdir)
 
 install-data-local: po-install-data-local
 
index 9577c69..395b315 100644 (file)
@@ -1,3 +1,15 @@
+2010-07-15  Martin Robinson  <mrobinson@igalia.com>
+
+        Reviewed by Oliver Hunt.
+
+        [GTK] Simplify the distribution step
+        https://bugs.webkit.org/show_bug.cgi?id=42414
+
+        * GNUmakefile.am: Add extra dist files directly to EXTRA_DIST instead
+        of adding them by proxy via javascriptcore_dist. Sort the EXTRA_DIST list.
+        Refer to create_hash_table and create_regexp_tables directly, as is the
+        behavior with other code generation scripts.
+
 2010-07-15  Oliver Hunt  <oliver@apple.com>
 
         Reviewed by Geoff Garen.
index 28cff47..9a2886f 100644 (file)
@@ -554,14 +554,14 @@ javascriptcore_sources += \
        JavaScriptCore/wtf/unicode/glib/UnicodeMacrosFromICU.h
 endif
 
-JavaScriptCore/Lexer.lut.h: $(CREATE_HASH_TABLE) $(srcdir)/JavaScriptCore/parser/Keywords.table
+JavaScriptCore/Lexer.lut.h: $(srcdir)/JavaScriptCore/create_hash_table $(srcdir)/JavaScriptCore/parser/Keywords.table
        $(AM_V_GEN)$(PERL) $^ > $@
 
-JavaScriptCore/%.lut.h: $(CREATE_HASH_TABLE) $(srcdir)/JavaScriptCore/%.cpp
+JavaScriptCore/%.lut.h: $(srcdir)/JavaScriptCore/create_hash_table $(srcdir)/JavaScriptCore/%.cpp
        $(AM_V_GEN)$(PERL) $^ -i > $@
 
 JavaScriptCore/RegExpJitTables.h: $(srcdir)/JavaScriptCore/create_regex_tables
-       $(AM_V_GEN)$(PYTHON) $(CREATE_REGEXP_TABLES) > $@
+       $(AM_V_GEN)$(PYTHON) $^ > $@
 
 JavaScriptCore/pcre/chartables.c: $(srcdir)/JavaScriptCore/pcre/dftables
        $(AM_V_GEN)$(PERL) $^ $@
@@ -627,20 +627,20 @@ Programs_jsc_CXXFLAGS = \
 Programs_jsc_LDADD = \
        libJavaScriptCore.la
 
-javascriptcore_dist += \
-       $(CREATE_HASH_TABLE) \
-       $(CREATE_REGEXP_TABLES) \
+EXTRA_DIST += \
        JavaScriptCore/AUTHORS \
-       JavaScriptCore/COPYING.LIB \
        JavaScriptCore/ChangeLog \
-       JavaScriptCore/THANKS \
+       JavaScriptCore/COPYING.LIB \
+       JavaScriptCore/create_hash_table \
+       JavaScriptCore/create_regex_tables \
        JavaScriptCore/icu/LICENSE \
        JavaScriptCore/icu/README \
-       JavaScriptCore/pcre/COPYING \
+       JavaScriptCore/parser/Keywords.table \
        JavaScriptCore/pcre/AUTHORS \
+       JavaScriptCore/pcre/COPYING \
        JavaScriptCore/pcre/dftables \
        JavaScriptCore/pcre/ucptable.cpp \
-       JavaScriptCore/parser/Keywords.table
+       JavaScriptCore/THANKS
 
 # Clean rules for JavaScriptCore
 CLEANFILES += \
index 3e7824c..0d9d3ea 100644 (file)
@@ -1,3 +1,16 @@
+2010-07-15  Martin Robinson  <mrobinson@igalia.com>
+
+        Reviewed by Oliver Hunt.
+
+        [GTK] Simplify the distribution step
+        https://bugs.webkit.org/show_bug.cgi?id=42414
+
+        No new tests as this is just a build change.
+
+        * GNUmakefile.am: Modify EXTRA_DIST directly and make sure the list
+        of files is sorted. Also handle distributing the IDL files from the
+        WebCore source tree.
+
 2010-07-15  Eric Seidel  <eric@webkit.org>
 
         Reviewed by Adam Barth.
index bec0ec5..dfd78eb 100644 (file)
@@ -4602,56 +4602,70 @@ $(libgdom_objects): AM_CXXFLAGS+=$(libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@W
 libgdom.la: $(libgdom_objects)
        $(CXXLINK) $(libgdom_objects) $(LIBS)
 
-webcore_dist += \
-       WebCore/ChangeLog \
-       WebCore/LICENSE-APPLE \
-       WebCore/LICENSE-LGPL-2 \
-       WebCore/LICENSE-LGPL-2.1 \
-       WebCore/icu/LICENSE \
+EXTRA_DIST += \
+       $(shell ls $(srcdir)/WebCore/css/*.idl) \
+       $(shell ls $(srcdir)/WebCore/dom/*.idl) \
+       $(shell ls $(srcdir)/WebCore/html/canvas/*.idl) \
+       $(shell ls $(srcdir)/WebCore/html/*.idl) \
+       $(shell ls $(srcdir)/WebCore/inspector/*.idl) \
+       $(shell ls $(srcdir)/WebCore/loader/appcache/*.idl) \
+       $(shell ls $(srcdir)/WebCore/notifications/*.idl) \
+       $(shell ls $(srcdir)/WebCore/page/*.idl) \
+       $(shell ls $(srcdir)/WebCore/plugins/*.idl) \
+       $(shell ls $(srcdir)/WebCore/storage/*.idl) \
+       $(shell ls $(srcdir)/WebCore/svg/*.idl) \
+       $(shell ls $(srcdir)/WebCore/websockets/*.idl) \
+       $(shell ls $(srcdir)/WebCore/workers/*.idl) \
+       $(shell ls $(srcdir)/WebCore/xml/*.idl) \
+       WebCore/bindings/scripts/CodeGeneratorGObject.pm \
+       WebCore/bindings/scripts/CodeGeneratorJS.pm \
        WebCore/bindings/scripts/CodeGenerator.pm \
+       WebCore/bindings/scripts/generate-bindings.pl \
+       WebCore/bindings/scripts/gobject-generate-headers.pl \
        WebCore/bindings/scripts/IDLParser.pm \
        WebCore/bindings/scripts/IDLStructure.pm \
        WebCore/bindings/scripts/InFilesParser.pm \
-       WebCore/bindings/scripts/generate-bindings.pl \
-       WebCore/bindings/scripts/CodeGeneratorJS.pm \
-       WebCore/bindings/scripts/CodeGeneratorGObject.pm \
-       WebCore/bindings/scripts/gobject-generate-headers.pl \
+       WebCore/ChangeLog \
+       WebCore/css/CSSGrammar.y \
+       WebCore/css/CSSPropertyNames.in \
+       WebCore/css/CSSValueKeywords.in \
        WebCore/css/html.css \
+       WebCore/css/make-css-file-arrays.pl \
+       WebCore/css/makegrammar.pl \
+       WebCore/css/makeprop.pl \
+       WebCore/css/maketokenizer \
+       WebCore/css/makevalues.pl \
        WebCore/css/mathml.css \
-       WebCore/css/quirks.css \
-       WebCore/css/view-source.css \
-       WebCore/css/svg.css \
-       WebCore/css/wml.css \
        WebCore/css/mediaControls.css \
        WebCore/css/mediaControlsGtk.css \
-       WebCore/css/CSSGrammar.y \
-       WebCore/css/CSSValueKeywords.in \
+       WebCore/css/quirks.css \
+       WebCore/css/svg.css \
        WebCore/css/SVGCSSPropertyNames.in \
-       WebCore/css/maketokenizer \
-       WebCore/css/makeprop.pl \
-       WebCore/css/makevalues.pl \
-       WebCore/css/tokenizer.flex \
-       WebCore/css/CSSPropertyNames.in \
-       WebCore/css/make-css-file-arrays.pl \
        WebCore/css/SVGCSSValueKeywords.in \
-       WebCore/css/makegrammar.pl \
+       WebCore/css/tokenizer.flex \
+       WebCore/css/view-source.css \
+       WebCore/css/wml.css \
        WebCore/dom/make_names.pl \
+       WebCore/html/DocTypeStrings.gperf \
+       WebCore/html/HTMLAttributeNames.in \
+       WebCore/html/HTMLEntityNames.gperf \
+       WebCore/html/HTMLTagNames.in \
+       WebCore/icu/LICENSE \
        WebCore/inspector/CodeGeneratorInspector.pm \
+       WebCore/LICENSE-APPLE \
+       WebCore/LICENSE-LGPL-2 \
+       WebCore/LICENSE-LGPL-2.1 \
+       WebCore/make-hash-tools.pl \
        WebCore/mathml/mathattrs.in \
        WebCore/mathml/mathtags.in \
-       WebCore/platform/text/mac/make-charset-table.pl \
        WebCore/platform/ColorData.gperf \
-       WebCore/svg/xlinkattrs.in \
+       WebCore/platform/text/mac/make-charset-table.pl \
        WebCore/svg/svgattrs.in \
        WebCore/svg/svgtags.in \
-       WebCore/html/DocTypeStrings.gperf \
-       WebCore/html/HTMLTagNames.in \
-       WebCore/html/HTMLEntityNames.gperf \
-       WebCore/html/HTMLAttributeNames.in \
+       WebCore/svg/xlinkattrs.in \
        WebCore/xml/xmlattrs.in \
        WebCore/xml/xmlnsattrs.in \
-       WebCore/xml/XPathGrammar.y \
-       WebCore/make-hash-tools.pl
+       WebCore/xml/XPathGrammar.y
 
 # Installing web inspector files
 webinspectordir = ${datadir}/webkit-@WEBKITGTK_API_VERSION@/webinspector