Changeset 148755 in webkit


Ignore:
Timestamp:
Apr 19, 2013 10:55:57 AM (11 years ago)
Author:
Martin Robinson
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/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.

Location:
trunk
Files:
1 added
1 deleted
9 edited

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r148718 r148755  
     12013-04-19  Martin Robinson  <mrobinson@igalia.com>
     2
     3        [GTK] JSCore.gir.in has a few problems
     4        https://bugs.webkit.org/show_bug.cgi?id=114710
     5
     6        Reviewed by Philippe Normand.
     7
     8        * GNUmakefile.am: Move common GIR initialization here from WebKit1.
     9        * configure.ac: Updated to reflect new JSC gir file location.
     10
    1112013-04-18  Ryuan Choi  <ryuan.choi@gmail.com>
    212

  • trunk/GNUmakefile.am

    r147927 r148755  
    109109global_cflags :=
    110110global_cxxflags :=
    111 JSCORE_GIRSOURCES :=
    112 WEBKIT_GIRSOURCES :=
    113 typelibsdir :=
    114 typelibs_DATA :=
    115111EXTRA_DIST :=
    116112BUILT_SOURCES :=
    … …  
    120116MAINTAINERCLEANFILES :=
    121117pkgconfig_DATA :=
     118
     119if ENABLE_INTROSPECTION
     120gir_DATA :=
     121typelibs_DATA :=
     122girdir := $(datadir)/gir-1.0
     123typelibsdir := $(libdir)/girepository-1.0
     124endif
    122125
    123126# We do not care at all about this implicit built-in make rules,

  • trunk/Source/JavaScriptCore/ChangeLog

    r148721 r148755  
     12013-04-19  Martin Robinson  <mrobinson@igalia.com>
     2
     3        [GTK] JSCore.gir.in has a few problems
     4        https://bugs.webkit.org/show_bug.cgi?id=114710
     5
     6        Reviewed by Philippe Normand.
     7
     8        * GNUmakefile.am: Add the gobject introspection steps for JavaScriptCore here,
     9        because they are shared between WebKit1 and WebKit2.
     10        * JavaScriptCore.gir.in: Added. Moved from the WebKit1 directory. Now written
     11        as foreign interfaces and referencing the javascriptcoregtk library.
     12
    1132013-04-18  Benjamin Poulain  <bpoulain@apple.com>
    214

  • trunk/Source/JavaScriptCore/GNUmakefile.am

    r120745 r148755  
    201201DISTCLEANFILES += \
    202202        $(top_builddir)/Source/JavaScriptCore/javascriptcoregtk-@WEBKITGTK_API_VERSION@.pc
     203
     204if ENABLE_INTROSPECTION
     205# The GIR file is generated via autoconf, as we don't need to run the scanner against non-GObject libraries.
     206JavaScriptCore-@WEBKITGTK_API_VERSION@.typelib: JavaScriptCore-@WEBKITGTK_API_VERSION@.gir $(G_IR_COMPILER)
     207        $(AM_V_GEN)$(G_IR_COMPILER) --includedir $(WebKit) --includedir $(top_builddir) $< -o $@
     208
     209gir_DATA += JavaScriptCore-@WEBKITGTK_API_VERSION@.gir
     210typelibs_DATA += JavaScriptCore-@WEBKITGTK_API_VERSION@.typelib
     211CLEANFILES += JavaScriptCore-@WEBKITGTK_API_VERSION@.gir JavaScriptCore-@WEBKITGTK_API_VERSION@.typelib
     212endif

  • trunk/Source/WebKit/gtk/ChangeLog

    r148696 r148755  
     12013-04-19  Martin Robinson  <mrobinson@igalia.com>
     2
     3        [GTK] JSCore.gir.in has a few problems
     4        https://bugs.webkit.org/show_bug.cgi?id=114710
     5
     6        Reviewed by Philippe Normand.
     7
     8        * GNUmakefile.am: Updated to reflect new name and location of JavaScriptCore-x.0.gir.
     9        * JSCore.gir.in: Removed.
     10
    1112013-04-17  Geoffrey Garen  <ggaren@apple.com>
    212

  • trunk/Source/WebKit/gtk/GNUmakefile.am

    r148294 r148755  
    294294
    295295if ENABLE_INTROSPECTION
    296 
    297 JSCore-@WEBKITGTK_API_VERSION@.gir: $(top_builddir)/Source/WebKit/gtk/JSCore-@WEBKITGTK_API_VERSION@.gir
    298         $(AM_V_GEN)cp $(top_builddir)/Source/WebKit/gtk/JSCore-@WEBKITGTK_API_VERSION@.gir $(top_builddir)/
    299 
    300 JSCORE_GIRSOURCES += JSCore-@WEBKITGTK_API_VERSION@.gir
    301 WEBKIT_GIRSOURCES += WebKit-@WEBKITGTK_API_VERSION@.gir
    302 
    303 $(WEBKIT_GIRSOURCES): $(G_IR_SCANNER) $(JSCORE_GIRSOURCES) libwebkitgtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la
     296WebKit-@WEBKITGTK_API_VERSION@.gir: $(G_IR_SCANNER) JavaScriptCore-@WEBKITGTK_API_VERSION@.gir libwebkitgtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la
    304297        $(AM_V_GEN)$(G_IR_SCANNER) -v --warn-all \
    305298             --symbol-prefix=webkit \
    … …  
    309302             --include=GObject-2.0 \
    310303             --include=Gtk-@GTK_API_VERSION@ \
    311              --include=JSCore-@WEBKITGTK_API_VERSION@ \
     304             --include=JavaScriptCore-@WEBKITGTK_API_VERSION@ \
    312305             --include=Soup-2.4 \
    313306             --library=webkitgtk-@WEBKITGTK_API_VERSION@ \
    … …  
    336329             $(WebKit)/webkit/*.cpp
    337330
    338 girdir = $(datadir)/gir-1.0
    339 gir_DATA = $(WEBKIT_GIRSOURCES) $(JSCORE_GIRSOURCES)
    340 
    341 typelibsdir += $(libdir)/girepository-1.0
    342 typelibs_DATA += $(JSCORE_GIRSOURCES:.gir=.typelib) $(WEBKIT_GIRSOURCES:.gir=.typelib)
    343 
    344331WebKit-@WEBKITGTK_API_VERSION@.typelib: WebKit-@WEBKITGTK_API_VERSION@.gir $(G_IR_COMPILER)
    345332        $(AM_V_GEN)$(G_IR_COMPILER) --includedir $(WebKit) --includedir $(top_builddir) $< -o $@
    346333
    347 JSCore-@WEBKITGTK_API_VERSION@.typelib: JSCore-@WEBKITGTK_API_VERSION@.gir $(G_IR_COMPILER)
    348         $(AM_V_GEN)$(G_IR_COMPILER) --includedir $(WebKit) --includedir $(top_builddir) $< -o $@
    349 
    350 CLEANFILES += $(JSCORE_GIRSOURCES) $(WEBKIT_GIRSOURCES) $(typelibs_DATA)
    351 
    352 endif
    353 endif
    354 
    355 EXTRA_DIST += $(top_builddir)/Source/WebKit/gtk/JSCore-@WEBKITGTK_API_VERSION@.gir
     334gir_DATA += WebKit-@WEBKITGTK_API_VERSION@.gir
     335typelibs_DATA += WebKit-@WEBKITGTK_API_VERSION@.typelib
     336CLEANFILES += WebKit-@WEBKITGTK_API_VERSION@.gir WebKit-@WEBKITGTK_API_VERSION@.typelib
     337endif
     338endif
    356339
    357340WEBKIT_MARSHAL_LIST = $(WebKit)/webkitmarshal.list

  • trunk/Source/WebKit2/ChangeLog

    r148748 r148755  
     12013-04-19  Martin Robinson  <mrobinson@igalia.com>
     2
     3        [GTK] JSCore.gir.in has a few problems
     4        https://bugs.webkit.org/show_bug.cgi?id=114710
     5
     6        Reviewed by Philippe Normand.
     7
     8        * GNUmakefile.am: Updated to reflect new location of JavaScriptCore gir file. Share the
     9        same autotools data task as the WebKit1 and JavaScriptCore gir installations.
     10
    1112013-04-19  Noam Rosenthal  <noam@webkit.org>
    212

  • trunk/Source/WebKit2/GNUmakefile.am

    r147927 r148755  
    269269             --include=GObject-2.0 \
    270270             --include=Gtk-3.0 \
     271             --include=JavaScriptCore-@WEBKITGTK_API_VERSION@ \
    271272             --include=Soup-2.4 \
    272273             --library=webkit2gtk-@WEBKITGTK_API_VERSION@ \
    … …  
    298299             $(WebKit2)/UIProcess/API/gtk/*.cpp
    299300
    300 gir2dir = $(datadir)/gir-1.0
    301 gir2_DATA = WebKit2-@WEBKITGTK_API_VERSION@.gir
    302 
    303 typelibs2dir = $(libdir)/girepository-1.0
    304 typelibs2_DATA = WebKit2-@WEBKITGTK_API_VERSION@.typelib
    305 
    306301WebKit2-@WEBKITGTK_API_VERSION@.typelib: WebKit2-@WEBKITGTK_API_VERSION@.gir $(G_IR_COMPILER)
    307302        $(AM_V_GEN)$(G_IR_COMPILER) --includedir $(WebKit2) --includedir $(top_builddir) $< -o $@
     303
     304gir_DATA += WebKit2-@WEBKITGTK_API_VERSION@.gir
     305typelibs_DATA += WebKit2-@WEBKITGTK_API_VERSION@.typelib
    308306
    309307CLEANFILES += WebKit2-@WEBKITGTK_API_VERSION@.gir WebKit2-@WEBKITGTK_API_VERSION@.typelib

  • trunk/configure.ac

    r145081 r148755  
    3939######################################################################################
    4040
    41 AC_CONFIG_FILES([GNUmakefile Source/WebCore/platform/gtk/po/POTFILES])
    42 AC_CONFIG_FILES(
    43     [Source/JavaScriptCore/javascriptcoregtk-${WEBKITGTK_API_VERSION}.pc:Source/JavaScriptCore/javascriptcoregtk.pc.in
    44         Source/WebKit/gtk/JSCore-${WEBKITGTK_API_VERSION}.gir:Source/WebKit/gtk/JSCore.gir.in],
    45     [WEBKITGTK_API_VERSION=$WEBKITGTK_API_VERSION,WEBKITGTK_PC_NAME=$WEBKITGTK_PC_NAME])
     41AC_CONFIG_FILES([
     42    GNUmakefile Source/WebCore/platform/gtk/po/POTFILES
     43    Source/JavaScriptCore/javascriptcoregtk-${WEBKITGTK_API_VERSION}.pc:Source/JavaScriptCore/javascriptcoregtk.pc.in
     44    JavaScriptCore-${WEBKITGTK_API_VERSION}.gir:Source/JavaScriptCore/JavaScriptCore.gir.in])
    4645
    4746if test "$enable_webkit1" = "yes"; then
    48     AC_CONFIG_FILES([Source/WebKit/gtk/webkit/webkitversion.h])
    49 
    50     AC_CONFIG_FILES([Source/WebKit/gtk/${WEBKITGTK_PC_NAME}-${WEBKITGTK_API_VERSION}.pc:Source/WebKit/gtk/webkit.pc.in],
    51         [WEBKITGTK_API_VERSION=$WEBKITGTK_API_VERSION,WEBKITGTK_PC_NAME=$WEBKITGTK_PC_NAME])
     47    AC_CONFIG_FILES([
     48        Source/WebKit/gtk/webkit/webkitversion.h
     49        Source/WebKit/gtk/${WEBKITGTK_PC_NAME}-${WEBKITGTK_API_VERSION}.pc:Source/WebKit/gtk/webkit.pc.in])
    5250fi
    5351
    5452if test "$enable_webkit2" = "yes"; then
    55     AC_CONFIG_FILES(
    56         [DerivedSources/WebKit2/webkit2gtk/webkit2/WebKitVersion.h:Source/WebKit2/UIProcess/API/gtk/WebKitVersion.h.in])
    57 
    58     AC_CONFIG_FILES([Source/WebKit2/webkit2gtk-${WEBKITGTK_API_VERSION}.pc:Source/WebKit2/webkit2gtk.pc.in],
    59         [WEBKITGTK_API_VERSION=$WEBKITGTK_API_VERSION,WEBKITGTK_PC_NAME=$WEBKITGTK_PC_NAME])
     53    AC_CONFIG_FILES([
     54        DerivedSources/WebKit2/webkit2gtk/webkit2/WebKitVersion.h:Source/WebKit2/UIProcess/API/gtk/WebKitVersion.h.in
     55        Source/WebKit2/webkit2gtk-${WEBKITGTK_API_VERSION}.pc:Source/WebKit2/webkit2gtk.pc.in])
    6056fi
    6157
Note: See TracChangeset for help on using the changeset viewer.