Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (116955 => 116956)
--- trunk/Source/_javascript_Core/ChangeLog 2012-05-14 16:06:41 UTC (rev 116955)
+++ trunk/Source/_javascript_Core/ChangeLog 2012-05-14 16:10:01 UTC (rev 116956)
@@ -1,3 +1,9 @@
+2012-05-14 Carlos Garcia Campos <[email protected]>
+
+ Unreviewed. Fix make distcheck.
+
+ * GNUmakefile.list.am: Add missing header file.
+
2012-05-14 Yong Li <[email protected]>
DFG JIT didn't work with ARM EABI.
Modified: trunk/Source/_javascript_Core/GNUmakefile.list.am (116955 => 116956)
--- trunk/Source/_javascript_Core/GNUmakefile.list.am 2012-05-14 16:06:41 UTC (rev 116955)
+++ trunk/Source/_javascript_Core/GNUmakefile.list.am 2012-05-14 16:10:01 UTC (rev 116956)
@@ -521,6 +521,7 @@
Source/_javascript_Core/runtime/PropertyDescriptor.cpp \
Source/_javascript_Core/runtime/PropertyDescriptor.h \
Source/_javascript_Core/runtime/PropertyMapHashTable.h \
+ Source/_javascript_Core/runtime/PropertyName.h \
Source/_javascript_Core/runtime/PropertyNameArray.cpp \
Source/_javascript_Core/runtime/PropertyNameArray.h \
Source/_javascript_Core/runtime/PropertySlot.cpp \
Modified: trunk/Source/WebKit2/ChangeLog (116955 => 116956)
--- trunk/Source/WebKit2/ChangeLog 2012-05-14 16:06:41 UTC (rev 116955)
+++ trunk/Source/WebKit2/ChangeLog 2012-05-14 16:10:01 UTC (rev 116956)
@@ -1,3 +1,12 @@
+2012-05-14 Carlos Garcia Campos <[email protected]>
+
+ Unreviewed. Fix make distcheck.
+
+ * GNUmakefile.am: Explicitly link WebProcess to
+ libjavascriptcoregtk to make sure it uses the non installed
+ library.
+ * GNUmakefile.list.am: Add missing header file.
+
2012-05-14 Sudarsana Nagineni <[email protected]>
[GTK] [WK2] Memory leaks in WebKitWebSettings
Modified: trunk/Source/WebKit2/GNUmakefile.am (116955 => 116956)
--- trunk/Source/WebKit2/GNUmakefile.am 2012-05-14 16:06:41 UTC (rev 116955)
+++ trunk/Source/WebKit2/GNUmakefile.am 2012-05-14 16:10:01 UTC (rev 116956)
@@ -342,6 +342,7 @@
Source/WebKit2/gtk/MainGtk.cpp
Programs_WebKitWebProcess_LDADD = \
+ libjavascriptcoregtk-@WEBKITGTK_API_MAJOR_VERSION@.@[email protected] \
libwebkit2gtk-@WEBKITGTK_API_MAJOR_VERSION@.@[email protected] \
$(GLIB_LIBS) \
$(GTK_LIBS) \
Modified: trunk/Source/WebKit2/GNUmakefile.list.am (116955 => 116956)
--- trunk/Source/WebKit2/GNUmakefile.list.am 2012-05-14 16:06:41 UTC (rev 116955)
+++ trunk/Source/WebKit2/GNUmakefile.list.am 2012-05-14 16:10:01 UTC (rev 116956)
@@ -320,6 +320,7 @@
Source/WebKit2/Shared/API/c/WKUserContentURLPattern.h \
Source/WebKit2/Shared/APIObject.cpp \
Source/WebKit2/Shared/APIObject.h \
+ Source/WebKit2/Shared/BlockingResponseMap.h \
Source/WebKit2/Shared/ShareableBitmap.cpp \
Source/WebKit2/Shared/ShareableBitmap.h \
Source/WebKit2/Shared/CacheModel.h \
Modified: trunk/Tools/ChangeLog (116955 => 116956)
--- trunk/Tools/ChangeLog 2012-05-14 16:06:41 UTC (rev 116955)
+++ trunk/Tools/ChangeLog 2012-05-14 16:10:01 UTC (rev 116956)
@@ -1,3 +1,12 @@
+2012-05-14 Carlos Garcia Campos <[email protected]>
+
+ Unreviewed. Fix make distcheck.
+
+ * GNUmakefile.am: Add run-api-tests script to EXTRA_DIST.
+ * gtk/run-api-tests:
+ (TestRunner._lookup_atspi2_binary): Handle the case when
+ pkg_config_file_variable() return None.
+
2012-05-14 Sheriff Bot <[email protected]>
Unreviewed, rolling out r116935.
Modified: trunk/Tools/GNUmakefile.am (116955 => 116956)
--- trunk/Tools/GNUmakefile.am 2012-05-14 16:06:41 UTC (rev 116955)
+++ trunk/Tools/GNUmakefile.am 2012-05-14 16:10:01 UTC (rev 116956)
@@ -250,6 +250,7 @@
Tools/gtk/common.py \
Tools/gtk/generate-gtkdoc \
Tools/gtk/gtkdoc.py \
+ Tools/gtk/run-api-tests \
Tools/Scripts/VCSUtils.pm \
Tools/Scripts/run-gtk-tests \
Tools/Scripts/webkit-build-directory \
Modified: trunk/Tools/gtk/run-api-tests (116955 => 116956)
--- trunk/Tools/gtk/run-api-tests 2012-05-14 16:06:41 UTC (rev 116955)
+++ trunk/Tools/gtk/run-api-tests 2012-05-14 16:10:01 UTC (rev 116956)
@@ -120,6 +120,8 @@
def _lookup_atspi2_binary(self, filename):
exec_prefix = common.pkg_config_file_variable('atspi-2', 'exec_prefix')
+ if not exec_prefix:
+ return None
for path in ['libexec', 'lib/at-spi2-core', 'lib32/at-spi2-core', 'lib64/at-spi2-core']:
filepath = os.path.join(exec_prefix, path, filename)
if os.path.isfile(filepath):
