- Revision
- 148755
- Author
- [email protected]
- Date
- 2013-04-19 10:55:57 -0700 (Fri, 19 Apr 2013)
Log Message
[GTK] JSCore.gir.in has a few problems
https://bugs.webkit.org/show_bug.cgi?id=114710
Reviewed by Philippe Normand.
.:
* GNUmakefile.am: Move common GIR initialization here from WebKit1.
* configure.ac: Updated to reflect new JSC gir file location.
Source/_javascript_Core:
* GNUmakefile.am: Add the gobject introspection steps for _javascript_Core here,
because they are shared between WebKit1 and WebKit2.
* _javascript_Core.gir.in: Added. Moved from the WebKit1 directory. Now written
as foreign interfaces and referencing the _javascript_coregtk library.
Source/WebKit/gtk:
* GNUmakefile.am: Updated to reflect new name and location of _javascript_Core-x.0.gir.
* JSCore.gir.in: Removed.
Source/WebKit2:
* GNUmakefile.am: Updated to reflect new location of _javascript_Core gir file. Share the
same autotools data task as the WebKit1 and _javascript_Core gir installations.
Modified Paths
Added Paths
Removed Paths
Diff
Modified: trunk/ChangeLog (148754 => 148755)
--- trunk/ChangeLog 2013-04-19 17:25:54 UTC (rev 148754)
+++ trunk/ChangeLog 2013-04-19 17:55:57 UTC (rev 148755)
@@ -1,3 +1,13 @@
+2013-04-19 Martin Robinson <[email protected]>
+
+ [GTK] JSCore.gir.in has a few problems
+ https://bugs.webkit.org/show_bug.cgi?id=114710
+
+ Reviewed by Philippe Normand.
+
+ * GNUmakefile.am: Move common GIR initialization here from WebKit1.
+ * configure.ac: Updated to reflect new JSC gir file location.
+
2013-04-18 Ryuan Choi <[email protected]>
[EFL] Build break when using cmake without CMAKE_BUILD_TYPE
Modified: trunk/GNUmakefile.am (148754 => 148755)
--- trunk/GNUmakefile.am 2013-04-19 17:25:54 UTC (rev 148754)
+++ trunk/GNUmakefile.am 2013-04-19 17:55:57 UTC (rev 148755)
@@ -108,10 +108,6 @@
global_cppflags :=
global_cflags :=
global_cxxflags :=
-JSCORE_GIRSOURCES :=
-WEBKIT_GIRSOURCES :=
-typelibsdir :=
-typelibs_DATA :=
EXTRA_DIST :=
BUILT_SOURCES :=
CLEANFILES :=
@@ -120,6 +116,13 @@
MAINTAINERCLEANFILES :=
pkgconfig_DATA :=
+if ENABLE_INTROSPECTION
+gir_DATA :=
+typelibs_DATA :=
+girdir := $(datadir)/gir-1.0
+typelibsdir := $(libdir)/girepository-1.0
+endif
+
# We do not care at all about this implicit built-in make rules,
# disable them to save some build time
%: %.c
Modified: trunk/Source/_javascript_Core/ChangeLog (148754 => 148755)
--- trunk/Source/_javascript_Core/ChangeLog 2013-04-19 17:25:54 UTC (rev 148754)
+++ trunk/Source/_javascript_Core/ChangeLog 2013-04-19 17:55:57 UTC (rev 148755)
@@ -1,3 +1,15 @@
+2013-04-19 Martin Robinson <[email protected]>
+
+ [GTK] JSCore.gir.in has a few problems
+ https://bugs.webkit.org/show_bug.cgi?id=114710
+
+ Reviewed by Philippe Normand.
+
+ * GNUmakefile.am: Add the gobject introspection steps for _javascript_Core here,
+ because they are shared between WebKit1 and WebKit2.
+ * _javascript_Core.gir.in: Added. Moved from the WebKit1 directory. Now written
+ as foreign interfaces and referencing the _javascript_coregtk library.
+
2013-04-18 Benjamin Poulain <[email protected]>
Use StringJoiner to create the JSString of arrayProtoFuncToString
Modified: trunk/Source/_javascript_Core/GNUmakefile.am (148754 => 148755)
--- trunk/Source/_javascript_Core/GNUmakefile.am 2013-04-19 17:25:54 UTC (rev 148754)
+++ trunk/Source/_javascript_Core/GNUmakefile.am 2013-04-19 17:55:57 UTC (rev 148755)
@@ -200,3 +200,13 @@
DISTCLEANFILES += \
$(top_builddir)/Source/_javascript_Core/_javascript_coregtk-@[email protected]
+
+if ENABLE_INTROSPECTION
+# The GIR file is generated via autoconf, as we don't need to run the scanner against non-GObject libraries.
+_javascript_Core-@[email protected]: _javascript_Core-@[email protected] $(G_IR_COMPILER)
+ $(AM_V_GEN)$(G_IR_COMPILER) --includedir $(WebKit) --includedir $(top_builddir) $< -o $@
+
+gir_DATA += _javascript_Core-@[email protected]
+typelibs_DATA += _javascript_Core-@[email protected]
+CLEANFILES += _javascript_Core-@[email protected] _javascript_Core-@[email protected]
+endif
Added: trunk/Source/_javascript_Core/_javascript_Core.gir.in (0 => 148755)
--- trunk/Source/_javascript_Core/_javascript_Core.gir.in (rev 0)
+++ trunk/Source/_javascript_Core/_javascript_Core.gir.in 2013-04-19 17:55:57 UTC (rev 148755)
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<repository version="1.2"
+ xmlns="http://www.gtk.org/introspection/core/1.0"
+ xmlns:c="http://www.gtk.org/introspection/c/1.0">
+ <namespace name="_javascript_Core" version="@WEBKITGTK_API_VERSION@"
+ shared-library="_javascript_coregtk-@WEBKITGTK_API_VERSION@"
+ c:identifier-prefixes="JS"
+ c:symbol-prefixes="JS">
+ <record name="GlobalContext" c:type="JSGlobalContextRef" foreign="1"/>
+ <record name="Value" c:type="JSValueRef" foreign="1"/>
+ </namespace>
+</repository>
Modified: trunk/Source/WebKit/gtk/ChangeLog (148754 => 148755)
--- trunk/Source/WebKit/gtk/ChangeLog 2013-04-19 17:25:54 UTC (rev 148754)
+++ trunk/Source/WebKit/gtk/ChangeLog 2013-04-19 17:55:57 UTC (rev 148755)
@@ -1,3 +1,13 @@
+2013-04-19 Martin Robinson <[email protected]>
+
+ [GTK] JSCore.gir.in has a few problems
+ https://bugs.webkit.org/show_bug.cgi?id=114710
+
+ Reviewed by Philippe Normand.
+
+ * GNUmakefile.am: Updated to reflect new name and location of _javascript_Core-x.0.gir.
+ * JSCore.gir.in: Removed.
+
2013-04-17 Geoffrey Garen <[email protected]>
Renamed JSGlobalData to VM
Modified: trunk/Source/WebKit/gtk/GNUmakefile.am (148754 => 148755)
--- trunk/Source/WebKit/gtk/GNUmakefile.am 2013-04-19 17:25:54 UTC (rev 148754)
+++ trunk/Source/WebKit/gtk/GNUmakefile.am 2013-04-19 17:55:57 UTC (rev 148755)
@@ -293,14 +293,7 @@
pkgconfig_DATA += Source/WebKit/gtk/@WEBKITGTK_PC_NAME@-@[email protected]
if ENABLE_INTROSPECTION
-
-JSCore-@[email protected]: $(top_builddir)/Source/WebKit/gtk/JSCore-@[email protected]
- $(AM_V_GEN)cp $(top_builddir)/Source/WebKit/gtk/JSCore-@[email protected] $(top_builddir)/
-
-JSCORE_GIRSOURCES += JSCore-@[email protected]
-WEBKIT_GIRSOURCES += WebKit-@[email protected]
-
-$(WEBKIT_GIRSOURCES): $(G_IR_SCANNER) $(JSCORE_GIRSOURCES) libwebkitgtk-@WEBKITGTK_API_MAJOR_VERSION@.@[email protected]
+WebKit-@[email protected]: $(G_IR_SCANNER) _javascript_Core-@[email protected] libwebkitgtk-@WEBKITGTK_API_MAJOR_VERSION@.@[email protected]
$(AM_V_GEN)$(G_IR_SCANNER) -v --warn-all \
--symbol-prefix=webkit \
--identifier-prefix=WebKit \
@@ -308,7 +301,7 @@
--nsversion=@WEBKITGTK_API_VERSION@ \
--include=GObject-2.0 \
--include=Gtk-@GTK_API_VERSION@ \
- --include=JSCore-@WEBKITGTK_API_VERSION@ \
+ --include=_javascript_Core-@WEBKITGTK_API_VERSION@ \
--include=Soup-2.4 \
--library=webkitgtk-@WEBKITGTK_API_VERSION@ \
--library=_javascript_coregtk-@WEBKITGTK_API_VERSION@ \
@@ -335,25 +328,15 @@
$(webkitgtk_gdom_built_h_api) \
$(WebKit)/webkit/*.cpp
-girdir = $(datadir)/gir-1.0
-gir_DATA = $(WEBKIT_GIRSOURCES) $(JSCORE_GIRSOURCES)
-
-typelibsdir += $(libdir)/girepository-1.0
-typelibs_DATA += $(JSCORE_GIRSOURCES:.gir=.typelib) $(WEBKIT_GIRSOURCES:.gir=.typelib)
-
WebKit-@[email protected]: WebKit-@[email protected] $(G_IR_COMPILER)
$(AM_V_GEN)$(G_IR_COMPILER) --includedir $(WebKit) --includedir $(top_builddir) $< -o $@
-JSCore-@[email protected]: JSCore-@[email protected] $(G_IR_COMPILER)
- $(AM_V_GEN)$(G_IR_COMPILER) --includedir $(WebKit) --includedir $(top_builddir) $< -o $@
-
-CLEANFILES += $(JSCORE_GIRSOURCES) $(WEBKIT_GIRSOURCES) $(typelibs_DATA)
-
+gir_DATA += WebKit-@[email protected]
+typelibs_DATA += WebKit-@[email protected]
+CLEANFILES += WebKit-@[email protected] WebKit-@[email protected]
endif
endif
-EXTRA_DIST += $(top_builddir)/Source/WebKit/gtk/JSCore-@[email protected]
-
WEBKIT_MARSHAL_LIST = $(WebKit)/webkitmarshal.list
$(GENSOURCES_WEBKIT)/webkitmarshal.cpp: stamp-webkitmarshal.cpp
@true
Deleted: trunk/Source/WebKit/gtk/JSCore.gir.in (148754 => 148755)
--- trunk/Source/WebKit/gtk/JSCore.gir.in 2013-04-19 17:25:54 UTC (rev 148754)
+++ trunk/Source/WebKit/gtk/JSCore.gir.in 2013-04-19 17:55:57 UTC (rev 148755)
@@ -1,20 +0,0 @@
-<?xml version="1.0"?>
-<repository version="1.2"
- xmlns="http://www.gtk.org/introspection/core/1.0"
- xmlns:c="http://www.gtk.org/introspection/c/1.0">
- <namespace name="JSCore" version="@WEBKITGTK_API_VERSION@" shared-library="webkitgtk-@WEBKITGTK_API_VERSION@">
- <alias name="GlobalContextRef" target="none">
- <type name="JSGlobalContextRef" c:type="JSGlobalContextRef"/>
- </alias>
- <alias name="ObjectRef" target="none">
- <type name="JSObjectRef" c:type="JSObjectRef"/>
- </alias>
- <function name="EvaluateScript" c:identifier="JSEvaluateScript">
- <return-value transfer-ownership="none">
- <type name="none" c:type="void"/>
- </return-value>
- <parameters>
- </parameters>
- </function>
- </namespace>
-</repository>
Modified: trunk/Source/WebKit2/ChangeLog (148754 => 148755)
--- trunk/Source/WebKit2/ChangeLog 2013-04-19 17:25:54 UTC (rev 148754)
+++ trunk/Source/WebKit2/ChangeLog 2013-04-19 17:55:57 UTC (rev 148755)
@@ -1,3 +1,13 @@
+2013-04-19 Martin Robinson <[email protected]>
+
+ [GTK] JSCore.gir.in has a few problems
+ https://bugs.webkit.org/show_bug.cgi?id=114710
+
+ Reviewed by Philippe Normand.
+
+ * GNUmakefile.am: Updated to reflect new location of _javascript_Core gir file. Share the
+ same autotools data task as the WebKit1 and _javascript_Core gir installations.
+
2013-04-19 Noam Rosenthal <[email protected]>
[Texmap] Implementation for pattern compositing
Modified: trunk/Source/WebKit2/GNUmakefile.am (148754 => 148755)
--- trunk/Source/WebKit2/GNUmakefile.am 2013-04-19 17:25:54 UTC (rev 148754)
+++ trunk/Source/WebKit2/GNUmakefile.am 2013-04-19 17:55:57 UTC (rev 148755)
@@ -268,6 +268,7 @@
--nsversion=@WEBKITGTK_API_VERSION@ \
--include=GObject-2.0 \
--include=Gtk-3.0 \
+ --include=_javascript_Core-@WEBKITGTK_API_VERSION@ \
--include=Soup-2.4 \
--library=webkit2gtk-@WEBKITGTK_API_VERSION@ \
--library=_javascript_coregtk-@WEBKITGTK_API_VERSION@ \
@@ -297,15 +298,12 @@
$(webkitgtk_gdom_built_h_api) \
$(WebKit2)/UIProcess/API/gtk/*.cpp
-gir2dir = $(datadir)/gir-1.0
-gir2_DATA = WebKit2-@[email protected]
-
-typelibs2dir = $(libdir)/girepository-1.0
-typelibs2_DATA = WebKit2-@[email protected]
-
WebKit2-@[email protected]: WebKit2-@[email protected] $(G_IR_COMPILER)
$(AM_V_GEN)$(G_IR_COMPILER) --includedir $(WebKit2) --includedir $(top_builddir) $< -o $@
+gir_DATA += WebKit2-@[email protected]
+typelibs_DATA += WebKit2-@[email protected]
+
CLEANFILES += WebKit2-@[email protected] WebKit2-@[email protected]
endif
Modified: trunk/configure.ac (148754 => 148755)
--- trunk/configure.ac 2013-04-19 17:25:54 UTC (rev 148754)
+++ trunk/configure.ac 2013-04-19 17:55:57 UTC (rev 148755)
@@ -38,25 +38,21 @@
# Processing of configuration files
######################################################################################
-AC_CONFIG_FILES([GNUmakefile Source/WebCore/platform/gtk/po/POTFILES])
-AC_CONFIG_FILES(
- [Source/_javascript_Core/_javascript_coregtk-${WEBKITGTK_API_VERSION}.pc:Source/_javascript_Core/_javascript_coregtk.pc.in
- Source/WebKit/gtk/JSCore-${WEBKITGTK_API_VERSION}.gir:Source/WebKit/gtk/JSCore.gir.in],
- [WEBKITGTK_API_VERSION=$WEBKITGTK_API_VERSION,WEBKITGTK_PC_NAME=$WEBKITGTK_PC_NAME])
+AC_CONFIG_FILES([
+ GNUmakefile Source/WebCore/platform/gtk/po/POTFILES
+ Source/_javascript_Core/_javascript_coregtk-${WEBKITGTK_API_VERSION}.pc:Source/_javascript_Core/_javascript_coregtk.pc.in
+ _javascript_Core-${WEBKITGTK_API_VERSION}.gir:Source/_javascript_Core/_javascript_Core.gir.in])
if test "$enable_webkit1" = "yes"; then
- AC_CONFIG_FILES([Source/WebKit/gtk/webkit/webkitversion.h])
-
- AC_CONFIG_FILES([Source/WebKit/gtk/${WEBKITGTK_PC_NAME}-${WEBKITGTK_API_VERSION}.pc:Source/WebKit/gtk/webkit.pc.in],
- [WEBKITGTK_API_VERSION=$WEBKITGTK_API_VERSION,WEBKITGTK_PC_NAME=$WEBKITGTK_PC_NAME])
+ AC_CONFIG_FILES([
+ Source/WebKit/gtk/webkit/webkitversion.h
+ Source/WebKit/gtk/${WEBKITGTK_PC_NAME}-${WEBKITGTK_API_VERSION}.pc:Source/WebKit/gtk/webkit.pc.in])
fi
if test "$enable_webkit2" = "yes"; then
- AC_CONFIG_FILES(
- [DerivedSources/WebKit2/webkit2gtk/webkit2/WebKitVersion.h:Source/WebKit2/UIProcess/API/gtk/WebKitVersion.h.in])
-
- AC_CONFIG_FILES([Source/WebKit2/webkit2gtk-${WEBKITGTK_API_VERSION}.pc:Source/WebKit2/webkit2gtk.pc.in],
- [WEBKITGTK_API_VERSION=$WEBKITGTK_API_VERSION,WEBKITGTK_PC_NAME=$WEBKITGTK_PC_NAME])
+ AC_CONFIG_FILES([
+ DerivedSources/WebKit2/webkit2gtk/webkit2/WebKitVersion.h:Source/WebKit2/UIProcess/API/gtk/WebKitVersion.h.in
+ Source/WebKit2/webkit2gtk-${WEBKITGTK_API_VERSION}.pc:Source/WebKit2/webkit2gtk.pc.in])
fi
m4_include([Source/autotools/PrintBuildConfiguration.m4])
