Skip to content

W
webkit
Commit 8d65431e authored by carlosgc@webkit.org's avatar carlosgc@webkit.org
Browse files
Options

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.

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@161816 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 93159804
Hide whitespace changes
Inline Side-by-side
Showing with 62 additions and 11 deletions
Source/JavaScriptCore/ChangeLog
View file @ 8d65431e
2014-01-12 Carlos Garcia Campos <cgarcia@igalia.com>
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 <andersca@apple.com>
Try again to fix the build.
......
Source/JavaScriptCore/GNUmakefile.am
View file @ 8d65431e
......@@ -198,6 +198,7 @@ EXTRA_DIST += \
Source/JavaScriptCore/inspector/scripts/CodeGeneratorInspectorStrings.py \
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 \
Source/JavaScriptCore/KeywordLookupGenerator.py \
......@@ -252,6 +253,7 @@ DerivedSources/JavaScriptCore/InspectorJSFrontendDispatchers.cpp: DerivedSources
DerivedSources/JavaScriptCore/InspectorJSBackendCommands.js: DerivedSources/JavaScriptCore/InspectorJSBackendDispatchers.h
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
Source/JavaScriptCore/GNUmakefile.list.am
View file @ 8d65431e
......@@ -8,6 +8,7 @@ javascriptcore_h_api += \
Source/JavaScriptCore/API/WebKitAvailability.h
javascriptcore_built_nosources += \
DerivedSources/JavaScriptCore/InjectedScriptSource.h \
DerivedSources/JavaScriptCore/KeywordLookup.h \
DerivedSources/JavaScriptCore/Lexer.lut.h \
DerivedSources/JavaScriptCore/RegExpJitTables.h \
......@@ -1209,7 +1210,6 @@ javascriptcore_sources += \
Source/JavaScriptCore/yarr/YarrPattern.h \
Source/JavaScriptCore/yarr/YarrSyntaxChecker.cpp \
Source/JavaScriptCore/yarr/YarrSyntaxChecker.h \
DerivedSources/JavaScriptCore/InjectedScriptSource.h \
DerivedSources/JavaScriptCore/InspectorJSBackendDispatchers.cpp \
DerivedSources/JavaScriptCore/InspectorJSBackendDispatchers.h \
DerivedSources/JavaScriptCore/InspectorJSFrontendDispatchers.cpp \
......
Source/WebCore/ChangeLog
View file @ 8d65431e
2014-01-12 Carlos Garcia Campos <cgarcia@igalia.com>
Unreviewed. Fix make distcheck.
* GNUmakefile.list.am: Add missing files.
2014-01-12 Simon Fraser <simon.fraser@apple.com>
Fix some CoreVideo linker errors on iOS by softlinking with more CoreVideo
Source/WebCore/GNUmakefile.list.am
View file @ 8d65431e
......@@ -4249,6 +4249,7 @@ webcore_sources += \
Source/WebCore/page/UserStyleSheet.h \
Source/WebCore/page/UserStyleSheetTypes.h \
Source/WebCore/page/ValidationMessageClient.h \
Source/WebCore/page/ViewState.h \
Source/WebCore/page/WebCoreKeyboardUIMode.h \
Source/WebCore/page/WebKitPoint.h \
Source/WebCore/page/WindowFeatures.cpp \
......@@ -4343,7 +4344,7 @@ webcore_sources += \
Source/WebCore/rendering/RenderAncestorIterator.h \
Source/WebCore/rendering/RenderBlock.cpp \
Source/WebCore/rendering/RenderBlock.h \
Source/WebCore/rendering/RenderBlockFlow.cpp \
Source/WebCore/rendering/RenderBlockFlow.cpp \
Source/WebCore/rendering/RenderBlockFlow.h \
Source/WebCore/rendering/RenderBlockLineLayout.cpp \
Source/WebCore/rendering/RenderBox.cpp \
......@@ -4440,8 +4441,8 @@ webcore_sources += \
Source/WebCore/rendering/RenderMultiColumnFlowThread.h \
Source/WebCore/rendering/RenderMultiColumnSet.cpp \
Source/WebCore/rendering/RenderMultiColumnSet.h \
Source/WebCore/rendering/RenderNamedFlowFragment.cpp \
Source/WebCore/rendering/RenderNamedFlowFragment.h \
Source/WebCore/rendering/RenderNamedFlowFragment.cpp \
Source/WebCore/rendering/RenderNamedFlowFragment.h \
Source/WebCore/rendering/RenderNamedFlowThread.cpp \
Source/WebCore/rendering/RenderNamedFlowThread.h \
Source/WebCore/rendering/RenderObject.cpp \
......@@ -4449,6 +4450,7 @@ webcore_sources += \
Source/WebCore/rendering/RenderOverflow.h \
Source/WebCore/rendering/RenderProgress.cpp \
Source/WebCore/rendering/RenderProgress.h \
Source/WebCore/rendering/RenderPtr.h \
Source/WebCore/rendering/RenderQuote.cpp \
Source/WebCore/rendering/RenderQuote.h \
Source/WebCore/rendering/RenderRegion.cpp \
......@@ -5559,6 +5561,9 @@ platform_sources += \
Source/WebCore/platform/audio/AudioResampler.h \
Source/WebCore/platform/audio/AudioResamplerKernel.cpp \
Source/WebCore/platform/audio/AudioResamplerKernel.h \
Source/WebCore/platform/audio/AudioSession.cpp \
Source/WebCore/platform/audio/AudioSession.h \
Source/WebCore/platform/audio/AudioSessionListener.h \
Source/WebCore/platform/audio/AudioSourceProvider.h \
Source/WebCore/platform/audio/AudioSourceProviderClient.h \
Source/WebCore/platform/audio/AudioUtilities.cpp \
......
Source/WebKit/gtk/ChangeLog
View file @ 8d65431e
2014-01-12 Carlos Garcia Campos <cgarcia@igalia.com>
Unreviewed. Fix make distcheck.
* GNUmakefile.am: Add enum types template files to EXTRA_DIST.
2014-01-12 Tobias Mueller <tobiasmue@gnome.org>
--disable-dependency-tracking causes build failure due to missing directories
......
Source/WebKit/gtk/GNUmakefile.am
View file @ 8d65431e
......@@ -389,6 +389,8 @@ EXTRA_DIST += \
$(WebKit)/docs/webkitenvironment.xml \
$(WebKit)/docs/webkitgtk-overrides.txt \
$(WebKit)/webkitmarshal.list \
$(WebKit)/webkit/webkitenumtypes.cpp.template \
$(WebKit)/webkit/webkitenumtypes.h.template \
$(WebKit)/resources/*
# extra resource files
......
Source/WebKit2/ChangeLog
View file @ 8d65431e
2014-01-12 Carlos Garcia Campos <cgarcia@igalia.com>
Unreviewed. Fix make distcheck.
* 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.
2014-01-12 Carlos Garcia Campos <cgarcia@igalia.com>
[GTK] Fix return value of WebKitDownload::created-destination
......
Source/WebKit2/GNUmakefile.am
View file @ 8d65431e
......@@ -815,6 +815,7 @@ EXTRA_DIST += \
$(WebKit2)/UIProcess/API/gtk/webkit2marshal.list \
$(WebKit2)/UIProcess/API/gtk/WebKitEnumTypes.h.template \
$(WebKit2)/UIProcess/API/gtk/WebKitEnumTypes.cpp.template \
$(WebKit2)/UIProcess/API/gtk/WebKit2InspectorGResourceBundle.xml \
$(WebKit2)/UIProcess/InspectorServer/front-end/inspectorPageIndex.html \
$(WebKit2)/Scripts/generate-forwarding-headers.pl \
$(shell ls $(WebKit2)/NetworkProcess/*.in) \
......
Source/WebKit2/GNUmakefile.list.am
View file @ 8d65431e
......@@ -256,7 +256,6 @@ webkit2_sources += \
Source/WebKit2/Shared/FontInfo.h \
Source/WebKit2/Shared/HTTPCookieAcceptPolicy.h \
Source/WebKit2/Shared/ResourceCachesToClear.h \
Source/WebKit2/Shared/ViewState.h \
Source/WebKit2/Shared/WebMemorySampler.h \
Source/WebKit2/Shared/APIArray.cpp \
Source/WebKit2/Shared/APIArray.h \
......@@ -377,7 +376,6 @@ webkit2_sources += \
Source/WebKit2/Shared/EditorState.h \
Source/WebKit2/Shared/FileAPI/BlobRegistrationData.cpp \
Source/WebKit2/Shared/FileAPI/BlobRegistrationData.h \
Source/WebKit2/Shared/FilterIterator.h \
Source/WebKit2/Shared/FontSmoothingLevel.h \
Source/WebKit2/Shared/ProcessExecutablePath.h \
Source/WebKit2/Shared/UserData.cpp \
......@@ -396,7 +394,6 @@ webkit2_sources += \
Source/WebKit2/Shared/ImageOptions.h \
Source/WebKit2/Shared/ImmutableDictionary.cpp \
Source/WebKit2/Shared/ImmutableDictionary.h \
Source/WebKit2/Shared/IteratorPair.h \
Source/WebKit2/Shared/LayerTreeContext.h \
Source/WebKit2/Shared/MutableDictionary.cpp \
Source/WebKit2/Shared/MutableDictionary.h \
......@@ -622,6 +619,8 @@ webkit2_sources += \
Source/WebKit2/UIProcess/API/C/WKProtectionSpaceTypes.h \
Source/WebKit2/UIProcess/API/C/WKResourceCacheManager.h \
Source/WebKit2/UIProcess/API/C/WKResourceCacheManager.cpp \
Source/WebKit2/UIProcess/API/C/WKSessionRef.h \
Source/WebKit2/UIProcess/API/C/WKSessionRef.cpp \
Source/WebKit2/UIProcess/API/C/WKTextChecker.h \
Source/WebKit2/UIProcess/API/C/WKTextChecker.cpp \
Source/WebKit2/UIProcess/API/C/WKVibration.cpp \
......@@ -788,6 +787,8 @@ webkit2_sources += \
Source/WebKit2/UIProcess/AutoCorrectionCallback.h \
Source/WebKit2/UIProcess/APINavigationData.cpp \
Source/WebKit2/UIProcess/APINavigationData.h \
Source/WebKit2/UIProcess/APISession.cpp \
Source/WebKit2/UIProcess/APISession.h \
Source/WebKit2/UIProcess/BackingStore.cpp \
Source/WebKit2/UIProcess/BackingStore.h \
Source/WebKit2/UIProcess/DefaultUndoController.cpp \
......
Source/WebKit2/NetworkProcess/unix/NetworkProcessMainUnix.cpp
View file @ 8d65431e
......@@ -29,7 +29,6 @@
#if ENABLE(NETWORK_PROCESS)
#include "ProxyResolverSoup.h"
#include "WKBase.h"
#include "WebKit2Initialize.h"
#include <WebCore/ResourceHandle.h>
......@@ -42,6 +41,7 @@
#include <wtf/gobject/GRefPtr.h>
#if PLATFORM(EFL)
#include "ProxyResolverSoup.h"
#include <Ecore.h>
#endif
......
Tools/ChangeLog
View file @ 8d65431e
2014-01-12 Carlos Garcia Campos <cgarcia@igalia.com>
Unreviewed. Fix make distcheck.
* gtk/GNUmakefile.am: Add generate-inspector-gresource-manifest.py
to EXTRA_DIST.
2014-01-12 Tobias Mueller <tobiasmue@gnome.org>
--disable-dependency-tracking causes build failure due to missing directories
......
Tools/gtk/GNUmakefile.am
View file @ 8d65431e
......@@ -2,6 +2,7 @@ EXTRA_DIST += \
Tools/gtk/common.py \
Tools/gtk/generate-feature-defines-files \
Tools/gtk/generate-gtkdoc \
Tools/gtk/generate-inspector-gresource-manifest.py \
Tools/gtk/generate-webkitdom-doc-files \
Tools/gtk/gtkdoc.py
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment