Changeset 161816 in webkit for trunk/Source/JavaScriptCore

Timestamp:

Jan 12, 2014, 11:15:54 AM (11 years ago)

Author:

Carlos Garcia Campos

Message:

Unreviewed. Fix make distcheck.

Source/JavaScriptCore:

• GNUmakefile.am: Add inline-and-minify-stylesheets-and-scripts.py

to EXTRA_DIST and fix InjectedScriptSource.h generation rule.

• GNUmakefile.list.am: Move InjectedScriptSource.h to

built_nosources to make sure it's not disted.

Source/WebCore:

• GNUmakefile.list.am: Add missing files.

Source/WebKit/gtk:

• GNUmakefile.am: Add enum types template files to EXTRA_DIST.

Source/WebKit2:

• GNUmakefile.am: Add WebKit2InspectorGResourceBundle.xml to

EXTRA_DIST.

• GNUmakefile.list.am: Removed deleted files and add missing ones.
• NetworkProcess/unix/NetworkProcessMainUnix.cpp: Move

ProxyResolverSoup.h to EFL platform ifdef, because GTK port doesn't
build the proxy resolver.

Tools:

• gtk/GNUmakefile.am: Add generate-inspector-gresource-manifest.py

to EXTRA_DIST.

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• GNUmakefile.am (modified) (2 diffs)
• GNUmakefile.list.am (modified) (2 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2014-01-12  Carlos Garcia Campos  <[email protected]>
+
+        Unreviewed. Fix make distcheck.
+
+        * GNUmakefile.am: Add inline-and-minify-stylesheets-and-scripts.py
+        to EXTRA_DIST and fix InjectedScriptSource.h generation rule.
+        * GNUmakefile.list.am: Move InjectedScriptSource.h to
+        built_nosources to make sure it's not disted.
+
 2014-01-11  Anders Carlsson  <[email protected]>
 

trunk/Source/JavaScriptCore/GNUmakefile.am

@@ -199 +199 @@
         Source/JavaScriptCore/inspector/scripts/cssmin.py \
         Source/JavaScriptCore/inspector/scripts/generate-combined-inspector-json.py \
+        Source/JavaScriptCore/inspector/scripts/inline-and-minify-stylesheets-and-scripts.py \
         Source/JavaScriptCore/inspector/scripts/jsmin.py \
         Source/JavaScriptCore/inspector/scripts/xxd.pl \
@@ -253 +254 @@
 DerivedSources/JavaScriptCore/InspectorJSBackendDispatchers.h: DerivedSources/JavaScriptCore/InspectorJSBackendDispatchers.cpp
 
-DerivedSources/JavaScriptCore/InjectedScriptSource.h: $(JavaScriptCore)/inspector/InjectedScriptSource.js
-        $(AM_V_GEN)$(PYTHON) $(INSPECTOR_SCRIPTS_DIR)/jsmin.py <$(JavaScriptCore)/inspector/InjectedScriptSource.js > $(GENSOURCES_JAVASCRIPTCORE)/InjectedScriptSource.min.js
-        $(AM_V_GEN)$(PERL) $(INSPECTOR_SCRIPTS_DIR)/xxd.pl InjectedScriptSource_js $(GENSOURCES_JAVASCRIPTCORE)/InjectedScriptSource.min.js $(GENSOURCES_JAVASCRIPTCORE)/InjectedScriptSource.h
+DerivedSources/JavaScriptCore/InjectedScriptSource.h: $(JavaScriptCore)/inspector/InjectedScriptSource.js $(INSPECTOR_SCRIPTS_DIR)/xxd.pl $(INSPECTOR_SCRIPTS_DIR)/jsmin.py
+        $(AM_V_GEN)$(PYTHON) $(INSPECTOR_SCRIPTS_DIR)/jsmin.py < $< > $(GENSOURCES_JAVASCRIPTCORE)/InjectedScriptSource.min.js
+        $(AM_V_at)$(PERL) $(INSPECTOR_SCRIPTS_DIR)/xxd.pl InjectedScriptSource_js $(GENSOURCES_JAVASCRIPTCORE)/InjectedScriptSource.min.js $@
+        $(AM_V_at)rm -rf $(GENSOURCES_JAVASCRIPTCORE)/InjectedScriptSource.min.js

trunk/Source/JavaScriptCore/GNUmakefile.list.am

@@ -9 +9 @@
 
 javascriptcore_built_nosources += \
+        DerivedSources/JavaScriptCore/InjectedScriptSource.h \
         DerivedSources/JavaScriptCore/KeywordLookup.h \
         DerivedSources/JavaScriptCore/Lexer.lut.h \
@@ -1210 +1211 @@
         Source/JavaScriptCore/yarr/YarrSyntaxChecker.cpp \
         Source/JavaScriptCore/yarr/YarrSyntaxChecker.h \
-        DerivedSources/JavaScriptCore/InjectedScriptSource.h \
         DerivedSources/JavaScriptCore/InspectorJSBackendDispatchers.cpp \
         DerivedSources/JavaScriptCore/InspectorJSBackendDispatchers.h \