Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

[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/JavaScriptCore:

* GNUmakefile.am: Add the gobject introspection steps for JavaScriptCore here,
because they are shared between WebKit1 and WebKit2.
* JavaScriptCore.gir.in: Added. Moved from the WebKit1 directory. Now written
as foreign interfaces and referencing the javascriptcoregtk library.

Source/WebKit/gtk:

* GNUmakefile.am: Updated to reflect new name and location of JavaScriptCore-x.0.gir.
* JSCore.gir.in: Removed.

Source/WebKit2:

* GNUmakefile.am: Updated to reflect new location of JavaScriptCore gir file. Share the
same autotools data task as the WebKit1 and JavaScriptCore gir installations.

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@148755 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information...
commit 374ddf7a7e4db149305348db67f64c9772e41d4e 1 parent aa75a91
mrobinson@webkit.org authored
View
10 ChangeLog
@@ -1,3 +1,13 @@
+2013-04-19 Martin Robinson <mrobinson@igalia.com>
+
+ [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 <ryuan.choi@gmail.com>
[EFL] Build break when using cmake without CMAKE_BUILD_TYPE
View
11 GNUmakefile.am
@@ -108,10 +108,6 @@ minibrowser_built_sources :=
global_cppflags :=
global_cflags :=
global_cxxflags :=
-JSCORE_GIRSOURCES :=
-WEBKIT_GIRSOURCES :=
-typelibsdir :=
-typelibs_DATA :=
EXTRA_DIST :=
BUILT_SOURCES :=
CLEANFILES :=
@@ -120,6 +116,13 @@ DISTCLEANFILES :=
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
View
12 Source/JavaScriptCore/ChangeLog
@@ -1,3 +1,15 @@
+2013-04-19 Martin Robinson <mrobinson@igalia.com>
+
+ [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 JavaScriptCore here,
+ because they are shared between WebKit1 and WebKit2.
+ * JavaScriptCore.gir.in: Added. Moved from the WebKit1 directory. Now written
+ as foreign interfaces and referencing the javascriptcoregtk library.
+
2013-04-18 Benjamin Poulain <bpoulain@apple.com>
Use StringJoiner to create the JSString of arrayProtoFuncToString
View
10 Source/JavaScriptCore/GNUmakefile.am
@@ -200,3 +200,13 @@ CLEANFILES += \
DISTCLEANFILES += \
$(top_builddir)/Source/JavaScriptCore/javascriptcoregtk-@WEBKITGTK_API_VERSION@.pc
+
+if ENABLE_INTROSPECTION
+# The GIR file is generated via autoconf, as we don't need to run the scanner against non-GObject libraries.
+JavaScriptCore-@WEBKITGTK_API_VERSION@.typelib: JavaScriptCore-@WEBKITGTK_API_VERSION@.gir $(G_IR_COMPILER)
+ $(AM_V_GEN)$(G_IR_COMPILER) --includedir $(WebKit) --includedir $(top_builddir) $< -o $@
+
+gir_DATA += JavaScriptCore-@WEBKITGTK_API_VERSION@.gir
+typelibs_DATA += JavaScriptCore-@WEBKITGTK_API_VERSION@.typelib
+CLEANFILES += JavaScriptCore-@WEBKITGTK_API_VERSION@.gir JavaScriptCore-@WEBKITGTK_API_VERSION@.typelib
+endif
View
12 Source/JavaScriptCore/JavaScriptCore.gir.in
@@ -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="JavaScriptCore" version="@WEBKITGTK_API_VERSION@"
+ shared-library="javascriptcoregtk-@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>
View
10 Source/WebKit/gtk/ChangeLog
@@ -1,3 +1,13 @@
+2013-04-19 Martin Robinson <mrobinson@igalia.com>
+
+ [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 JavaScriptCore-x.0.gir.
+ * JSCore.gir.in: Removed.
+
2013-04-17 Geoffrey Garen <ggaren@apple.com>
Renamed JSGlobalData to VM
View
27 Source/WebKit/gtk/GNUmakefile.am
@@ -293,14 +293,7 @@ if ENABLE_WEBKIT1
pkgconfig_DATA += Source/WebKit/gtk/@WEBKITGTK_PC_NAME@-@WEBKITGTK_API_VERSION@.pc
if ENABLE_INTROSPECTION
-
-JSCore-@WEBKITGTK_API_VERSION@.gir: $(top_builddir)/Source/WebKit/gtk/JSCore-@WEBKITGTK_API_VERSION@.gir
- $(AM_V_GEN)cp $(top_builddir)/Source/WebKit/gtk/JSCore-@WEBKITGTK_API_VERSION@.gir $(top_builddir)/
-
-JSCORE_GIRSOURCES += JSCore-@WEBKITGTK_API_VERSION@.gir
-WEBKIT_GIRSOURCES += WebKit-@WEBKITGTK_API_VERSION@.gir
-
-$(WEBKIT_GIRSOURCES): $(G_IR_SCANNER) $(JSCORE_GIRSOURCES) libwebkitgtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la
+WebKit-@WEBKITGTK_API_VERSION@.gir: $(G_IR_SCANNER) JavaScriptCore-@WEBKITGTK_API_VERSION@.gir libwebkitgtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la
$(AM_V_GEN)$(G_IR_SCANNER) -v --warn-all \
--symbol-prefix=webkit \
--identifier-prefix=WebKit \
@@ -308,7 +301,7 @@ $(WEBKIT_GIRSOURCES): $(G_IR_SCANNER) $(JSCORE_GIRSOURCES) libwebkitgtk-@WEBKITG
--nsversion=@WEBKITGTK_API_VERSION@ \
--include=GObject-2.0 \
--include=Gtk-@GTK_API_VERSION@ \
- --include=JSCore-@WEBKITGTK_API_VERSION@ \
+ --include=JavaScriptCore-@WEBKITGTK_API_VERSION@ \
--include=Soup-2.4 \
--library=webkitgtk-@WEBKITGTK_API_VERSION@ \
--library=javascriptcoregtk-@WEBKITGTK_API_VERSION@ \
@@ -335,25 +328,15 @@ $(WEBKIT_GIRSOURCES): $(G_IR_SCANNER) $(JSCORE_GIRSOURCES) libwebkitgtk-@WEBKITG
$(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-@WEBKITGTK_API_VERSION@.typelib: WebKit-@WEBKITGTK_API_VERSION@.gir $(G_IR_COMPILER)
$(AM_V_GEN)$(G_IR_COMPILER) --includedir $(WebKit) --includedir $(top_builddir) $< -o $@
-JSCore-@WEBKITGTK_API_VERSION@.typelib: JSCore-@WEBKITGTK_API_VERSION@.gir $(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-@WEBKITGTK_API_VERSION@.gir
+typelibs_DATA += WebKit-@WEBKITGTK_API_VERSION@.typelib
+CLEANFILES += WebKit-@WEBKITGTK_API_VERSION@.gir WebKit-@WEBKITGTK_API_VERSION@.typelib
endif
endif
-EXTRA_DIST += $(top_builddir)/Source/WebKit/gtk/JSCore-@WEBKITGTK_API_VERSION@.gir
-
WEBKIT_MARSHAL_LIST = $(WebKit)/webkitmarshal.list
$(GENSOURCES_WEBKIT)/webkitmarshal.cpp: stamp-webkitmarshal.cpp
@true
View
20 Source/WebKit/gtk/JSCore.gir.in
@@ -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>
View
10 Source/WebKit2/ChangeLog
@@ -1,3 +1,13 @@
+2013-04-19 Martin Robinson <mrobinson@igalia.com>
+
+ [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 JavaScriptCore gir file. Share the
+ same autotools data task as the WebKit1 and JavaScriptCore gir installations.
+
2013-04-19 Noam Rosenthal <noam@webkit.org>
[Texmap] Implementation for pattern compositing
View
10 Source/WebKit2/GNUmakefile.am
@@ -268,6 +268,7 @@ WebKit2-@WEBKITGTK_API_VERSION@.gir: $(G_IR_SCANNER) libwebkit2gtk-@WEBKITGTK_AP
--nsversion=@WEBKITGTK_API_VERSION@ \
--include=GObject-2.0 \
--include=Gtk-3.0 \
+ --include=JavaScriptCore-@WEBKITGTK_API_VERSION@ \
--include=Soup-2.4 \
--library=webkit2gtk-@WEBKITGTK_API_VERSION@ \
--library=javascriptcoregtk-@WEBKITGTK_API_VERSION@ \
@@ -297,15 +298,12 @@ WebKit2-@WEBKITGTK_API_VERSION@.gir: $(G_IR_SCANNER) libwebkit2gtk-@WEBKITGTK_AP
$(webkitgtk_gdom_built_h_api) \
$(WebKit2)/UIProcess/API/gtk/*.cpp
-gir2dir = $(datadir)/gir-1.0
-gir2_DATA = WebKit2-@WEBKITGTK_API_VERSION@.gir
-
-typelibs2dir = $(libdir)/girepository-1.0
-typelibs2_DATA = WebKit2-@WEBKITGTK_API_VERSION@.typelib
-
WebKit2-@WEBKITGTK_API_VERSION@.typelib: WebKit2-@WEBKITGTK_API_VERSION@.gir $(G_IR_COMPILER)
$(AM_V_GEN)$(G_IR_COMPILER) --includedir $(WebKit2) --includedir $(top_builddir) $< -o $@
+gir_DATA += WebKit2-@WEBKITGTK_API_VERSION@.gir
+typelibs_DATA += WebKit2-@WEBKITGTK_API_VERSION@.typelib
+
CLEANFILES += WebKit2-@WEBKITGTK_API_VERSION@.gir WebKit2-@WEBKITGTK_API_VERSION@.typelib
endif
View
24 configure.ac
@@ -38,25 +38,21 @@ m4_include([Source/autotools/SetupAutomake.m4])
# Processing of configuration files
######################################################################################
-AC_CONFIG_FILES([GNUmakefile Source/WebCore/platform/gtk/po/POTFILES])
-AC_CONFIG_FILES(
- [Source/JavaScriptCore/javascriptcoregtk-${WEBKITGTK_API_VERSION}.pc:Source/JavaScriptCore/javascriptcoregtk.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/JavaScriptCore/javascriptcoregtk-${WEBKITGTK_API_VERSION}.pc:Source/JavaScriptCore/javascriptcoregtk.pc.in
+ JavaScriptCore-${WEBKITGTK_API_VERSION}.gir:Source/JavaScriptCore/JavaScriptCore.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])
Please sign in to comment.
Something went wrong with that request. Please try again.