GNOME.org
 

[vte] bindings: Remove gir and vala bindings to their own directory

commit f0691d3e847058c181280670b477e61142a10c50
Author: Christian Persch <chpe gnome org>
Date:   Sat Feb 11 21:30:21 2017 +0100

    bindings: Remove gir and vala bindings to their own directory

 Makefile.am                              |    2 +-
 bindings/Makefile.am                     |   13 +++
 bindings/gir/Makefile.am                 |   34 ++++++++
 bindings/vala/Makefile.am                |  101 +++++++++++++++++++++++
 {src => bindings/vala}/app.gresource.xml |    0
 {src => bindings/vala}/app.ui            |    0
 {src => bindings/vala}/app.vala          |    0
 {src => bindings/vala}/config.vapi       |    0
 {src => bindings/vala}/search-popover.ui |    0
 configure.ac                             |   16 +++-
 po/POTFILES.skip                         |    2 +-
 src/Makefile.am                          |  130 ------------------------------
 src/vte/vtedeprecated.h                  |    3 +
 13 files changed, 167 insertions(+), 134 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 80d0b25..d7d66e1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,7 @@ NULL =
 
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = src po doc perf
+SUBDIRS = src bindings po doc perf
 
 EXTRA_DIST = \
        HACKING \
diff --git a/bindings/Makefile.am b/bindings/Makefile.am
new file mode 100644
index 0000000..3b149f3
--- /dev/null
+++ b/bindings/Makefile.am
@@ -0,0 +1,13 @@
+SUBDIRS =
+
+if HAVE_INTROSPECTION
+SUBDIRS += gir
+endif
+
+if ENABLE_VAPIGEN
+SUBDIRS += vala
+endif
+
+.DELETE_ON_ERROR:
+
+-include $(top_srcdir)/git.mk
diff --git a/bindings/gir/Makefile.am b/bindings/gir/Makefile.am
new file mode 100644
index 0000000..2717e16
--- /dev/null
+++ b/bindings/gir/Makefile.am
@@ -0,0 +1,34 @@
+CLEANFILES =
+DISTCLEANFILES =
+EXTRA_DIST =
+
+INTROSPECTION_GIRS = Vte-$(VTE_API_VERSION).gir
+INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir) --warn-all
+INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir)
+
+Vte-@VTE_API_VERSION@.gir: $(top_builddir)/src/libvte-$(VTE_API_VERSION).la
+Vte_@VTE_API_VERSION_U@_gir_INCLUDES = Pango-1.0 Gdk-$(GTK_API_VERSION) Gtk-$(GTK_API_VERSION)
+Vte_@VTE_API_VERSION_U@_gir_CFLAGS = $(VTE_CFLAGS) -DVTE_COMPILATION -I$(top_builddir)/src/vte 
-I$(top_srcdir)/src/vte
+Vte_@VTE_API_VERSION_U@_gir_LIBS = $(top_builddir)/src/libvte-$(VTE_API_VERSION).la
+Vte_@VTE_API_VERSION_U@_gir_EXPORT_PACKAGES = vte-$(VTE_API_VERSION)
+Vte_@VTE_API_VERSION_U@_gir_SCANNERFLAGS = --c-include "vte/vte.h"
+Vte_@VTE_API_VERSION_U@_gir_FILES = \
+       $(wildcard $(top_srcdir)/src/vte/*.h) \
+       $(wildcard $(top_builddir)/src/vte/*.h) \
+       $(top_srcdir)/src/pty.cc \
+       $(top_srcdir)/src/vtegtk.cc \
+       $(top_srcdir)/src/vtetypebuiltins.cc \
+       $(NULL)
+
+girdir = $(datadir)/gir-1.0
+nodist_gir_DATA = $(INTROSPECTION_GIRS)
+
+typelibdir = $(libdir)/girepository-1.0
+nodist_typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
+
+CLEANFILES += $(nodist_gir_DATA) $(nodist_typelib_DATA)
+
+.DELETE_ON_ERROR:
+
+include $(INTROSPECTION_MAKEFILE)
+-include $(top_srcdir)/git.mk
diff --git a/bindings/vala/Makefile.am b/bindings/vala/Makefile.am
new file mode 100644
index 0000000..413e8c6
--- /dev/null
+++ b/bindings/vala/Makefile.am
@@ -0,0 +1,101 @@
+if ENABLE_TEST_APPLICATION
+bin_PROGRAMS = vte-@VTE_API_MAJOR_VERSION@.@VTE_API_MINOR_VERSION@
+else
+noinst_PROGRAMS = vte-@VTE_API_MAJOR_VERSION@.@VTE_API_MINOR_VERSION@
+endif
+
+CLEANFILES =
+DISTCLEANFILES =
+EXTRA_DIST =
+
+# VAPI
+
+VAPIGEN_VAPIS = vte-$(VTE_API_VERSION).vapi
+
+vte-@VTE_API_VERSION@.vapi: ../gir/Vte-$(VTE_API_VERSION).gir
+vte_@VTE_API_VERSION_U@_vapi_DEPS = \
+       glib-2.0 \
+       gio-2.0 \
+       pango \
+       gdk-$(GTK_API_VERSION) \
+       gtk+-$(GTK_API_VERSION) \
+       $(NULL)
+vte_@VTE_API_VERSION_U@_vapi_METADATADIRS = $(srcdir)
+vte_@VTE_API_VERSION_U@_vapi_FILES = ../gir/Vte-$(VTE_API_VERSION).gir
+
+vapidir = $(datadir)/vala/vapi
+nodist_vapi_DATA = $(VAPIGEN_VAPIS)
+
+CLEANFILES += $(nodist_vapi_DATA)
+
+# VALA Test application
+
+vte_@VTE_API_MAJOR_VERSION@_@VTE_API_MINOR_VERSION@_SOURCES = \
+       app.vala \
+       config.vapi \
+       vte-$(VTE_API_VERSION).vapi \
+       $(NULL)
+
+nodist_vte_@VTE_API_MAJOR_VERSION@_@VTE_API_MINOR_VERSION@_SOURCES = \
+       appresources.c \
+       $(NULL)
+
+vte_@VTE_API_MAJOR_VERSION@_@VTE_API_MINOR_VERSION@_VALAFLAGS = \
+       --target-glib=2.38 \
+       --vapidir=. \
+       --girdir=. \
+       --pkg=posix \
+       --pkg=gio-2.0 \
+       --pkg=gtk+-$(GTK_API_VERSION) \
+       --gresources app.gresource.xml \
+       $(AM_VALAFLAGS)
+
+vte_@VTE_API_MAJOR_VERSION@_@VTE_API_MINOR_VERSION@_CPPFLAGS = \
+       -I$(top_srcdir)/src \
+       -I$(top_srcdir)/src/vte \
+       -I$(top_builddir)/src/vte \
+       $(AM_CPPFLAGS) \
+       $(NULL)
+
+vte_@VTE_API_MAJOR_VERSION@_@VTE_API_MINOR_VERSION@_CFLAGS = \
+       -Wno-unused-variable \
+       -Wno-unused-but-set-variable \
+       $(VTE_CFLAGS) \
+       $(AM_CFLAGS) \
+       $(NULL)
+
+vte_@VTE_API_MAJOR_VERSION@_@VTE_API_MINOR_VERSION@_LDFLAGS = \
+       $(AM_LDFLAGS) \
+       $(NULL)
+
+vte_@VTE_API_MAJOR_VERSION@_@VTE_API_MINOR_VERSION@_LDADD = \
+       $(top_builddir)/src/libvte-$(VTE_API_VERSION).la \
+       $(VTE_LIBS) \
+       $(NULL)
+
+if HAVE_VALA_0_31
+vte_@VTE_API_MAJOR_VERSION@_@VTE_API_MINOR_VERSION@_VALAFLAGS += --disable-since-check
+endif
+
+if HAVE_GTK_3_16
+vte_@VTE_API_MAJOR_VERSION@_@VTE_API_MINOR_VERSION@_VALAFLAGS += -D GTK_3_16
+endif
+
+CLEANFILES += \
+       app.c \
+       appresources.c \
+       $(NULL)
+
+EXTRA_DIST += \
+        app.gresource.xml \
+       app.ui \
+       search-popover.ui \
+       $(NULL)
+
+appresources.c: app.gresource.xml Makefile $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies 
--sourcedir $(srcdir) $(srcdir)/app.gresource.xml)
+       $(AM_V_GEN) XMLLINT=$(XMLLINT) $(GLIB_COMPILE_RESOURCES) --target $@ --sourcedir $(srcdir) --generate 
--c-name app $<
+
+.DELETE_ON_ERROR:
+
+include $(VAPIGEN_MAKEFILE)
+-include $(top_srcdir)/git.mk
diff --git a/src/app.gresource.xml b/bindings/vala/app.gresource.xml
similarity index 100%
rename from src/app.gresource.xml
rename to bindings/vala/app.gresource.xml
diff --git a/src/app.ui b/bindings/vala/app.ui
similarity index 100%
rename from src/app.ui
rename to bindings/vala/app.ui
diff --git a/src/app.vala b/bindings/vala/app.vala
similarity index 100%
rename from src/app.vala
rename to bindings/vala/app.vala
diff --git a/src/config.vapi b/bindings/vala/config.vapi
similarity index 100%
rename from src/config.vapi
rename to bindings/vala/config.vapi
diff --git a/src/search-popover.ui b/bindings/vala/search-popover.ui
similarity index 100%
rename from src/search-popover.ui
rename to bindings/vala/search-popover.ui
diff --git a/configure.ac b/configure.ac
index e573c48..6dec53d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -364,14 +364,23 @@ if test -z "$enable_introspection"; then
   enable_introspection=yes
 fi
 
-GOBJECT_INTROSPECTION_CHECK([0.9.0])
+m4_ifdef([GOBJECT_INTROSPECTION_CHECK],
+  [GOBJECT_INTROSPECTION_CHECK([0.9.0])],
+  [if test "$enable_introspection" = "yes"; then
+    AC_MSG_ERROR([[Introspection requested but M4 macros not installed.]])
+   fi
+   AM_CONDITIONAL([HAVE_INTROSPECTION],[false])])
 
 # No automagic please!
 if test -z "$enable_vala"; then
   enable_vala=yes
 fi
 
-VAPIGEN_CHECK([0.18])
+m4_ifdef([VAPIGEN_CHECK],
+  [VAPIGEN_CHECK([0.18])],
+  [if test "$enable_vala" = "yes"; then
+     AC_MSG_ERROR([[Vala requested but M4 macros not installed.]])
+   fi])
 
 # ****************
 # Test Application
@@ -445,6 +454,9 @@ Makefile
 src/Makefile
 src/vte.gresource.xml
 src/vte/vteversion.h
+bindings/Makefile
+bindings/gir/Makefile
+bindings/vala/Makefile
 perf/Makefile
 po/Makefile.in
 doc/Makefile
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 6a7b493..06a2af3 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -1,4 +1,4 @@
-src/app.ui
 src/search-popover.ui
 src/vteapp.c
 src/vtespawn.cc
+bindings/vala/app.ui
diff --git a/src/Makefile.am b/src/Makefile.am
index 910eabe..e7c863a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -174,64 +174,6 @@ vteseq-list.h: vteseq-n.gperf
 vteresources.cc: vte.gresource.xml Makefile $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies 
vte.gresource.xml)
        $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target $@ --sourcedir . --generate-source --c-name _vte $<
 
-# introspection
-
-INTROSPECTION_GIRS =
-INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir) --warn-all
-INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir)
-
-if HAVE_INTROSPECTION
-include $(INTROSPECTION_MAKEFILE)
-
-Vte-@VTE_API_VERSION@.gir: libvte-$(VTE_API_VERSION).la
-Vte_@VTE_API_VERSION_U@_gir_INCLUDES = Pango-1.0 Gdk-$(GTK_API_VERSION) Gtk-$(GTK_API_VERSION)
-Vte_@VTE_API_VERSION_U@_gir_CFLAGS = $(VTE_CFLAGS) -DVTE_COMPILATION -I$(builddir)/vte -I$(srcdir)/vte
-Vte_@VTE_API_VERSION_U@_gir_LIBS = libvte-$(VTE_API_VERSION).la
-Vte_@VTE_API_VERSION_U@_gir_EXPORT_PACKAGES = vte-$(VTE_API_VERSION)
-Vte_@VTE_API_VERSION_U@_gir_SCANNERFLAGS = --c-include "vte/vte.h"
-Vte_@VTE_API_VERSION_U@_gir_FILES = \
-       $(header_HEADERS) \
-       $(nodist_header_HEADERS) \
-       vtegtk.cc \
-       vtetypebuiltins.cc \
-       pty.cc \
-       $(NULL)
-
-INTROSPECTION_GIRS += Vte-$(VTE_API_VERSION).gir
-
-girdir = $(datadir)/gir-1.0
-nodist_gir_DATA = $(INTROSPECTION_GIRS)
-
-typelibdir = $(libdir)/girepository-1.0
-nodist_typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
-
-CLEANFILES += $(nodist_gir_DATA) $(nodist_typelib_DATA)
-
-if ENABLE_VAPIGEN
-include $(VAPIGEN_MAKEFILE)
-
-VAPIGEN_VAPIS = vte-$(VTE_API_VERSION).vapi
-
-vte-@VTE_API_VERSION@.vapi: Vte-$(VTE_API_VERSION).gir
-vte_@VTE_API_VERSION_U@_vapi_DEPS = \
-       glib-2.0 \
-       gio-2.0 \
-       pango \
-       gdk-$(GTK_API_VERSION) \
-       gtk+-$(GTK_API_VERSION) \
-       $(NULL)
-vte_@VTE_API_VERSION_U@_vapi_METADATADIRS = $(srcdir)
-vte_@VTE_API_VERSION_U@_vapi_FILES = Vte-$(VTE_API_VERSION).gir
-
-vapidir = $(datadir)/vala/vapi
-nodist_vapi_DATA = $(VAPIGEN_VAPIS)
-
-CLEANFILES += $(nodist_vapi_DATA)
-
-endif # ENABLE_VAPIGEN
-
-endif # HAVE_INTROSPECTION
-
 # C Test application
 
 testvte_SOURCES = \
@@ -256,78 +198,6 @@ testvte_LDADD = \
        libvte-$(VTE_API_VERSION).la \
        $(VTE_LIBS)
 
-# VALA Test application
-
-if ENABLE_TEST_APPLICATION
-
-bin_PROGRAMS += vte-@VTE_API_MAJOR_VERSION@.@VTE_API_MINOR_VERSION@
-
-vte_@VTE_API_MAJOR_VERSION@_@VTE_API_MINOR_VERSION@_SOURCES = \
-       app.vala \
-       config.vapi \
-       vte-$(VTE_API_VERSION).vapi \
-       $(NULL)
-
-nodist_vte_@VTE_API_MAJOR_VERSION@_@VTE_API_MINOR_VERSION@_SOURCES = \
-       appresources.c \
-       $(NULL)
-
-vte_@VTE_API_MAJOR_VERSION@_@VTE_API_MINOR_VERSION@_VALAFLAGS = \
-       --target-glib=2.38 \
-       --vapidir=. \
-       --girdir=. \
-       --pkg=posix \
-       --pkg=gio-2.0 \
-       --pkg=gtk+-$(GTK_API_VERSION) \
-       --gresources app.gresource.xml \
-       $(AM_VALAFLAGS)
-
-vte_@VTE_API_MAJOR_VERSION@_@VTE_API_MINOR_VERSION@_CPPFLAGS = \
-       -I$(srcdir)/vte \
-       -I$(builddir)/vte \
-       $(AM_CPPFLAGS) \
-       $(NULL)
-
-vte_@VTE_API_MAJOR_VERSION@_@VTE_API_MINOR_VERSION@_CFLAGS = \
-       -Wno-unused-variable \
-       -Wno-unused-but-set-variable \
-       $(VTE_CFLAGS) \
-       $(AM_CFLAGS) \
-       $(NULL)
-
-vte_@VTE_API_MAJOR_VERSION@_@VTE_API_MINOR_VERSION@_LDFLAGS = \
-       $(AM_LDFLAGS) \
-       $(NULL)
-
-vte_@VTE_API_MAJOR_VERSION@_@VTE_API_MINOR_VERSION@_LDADD = \
-       libvte-$(VTE_API_VERSION).la \
-       $(VTE_LIBS) \
-       $(NULL)
-
-if HAVE_VALA_0_31
-vte_@VTE_API_MAJOR_VERSION@_@VTE_API_MINOR_VERSION@_VALAFLAGS += --disable-since-check
-endif
-
-if HAVE_GTK_3_16
-vte_@VTE_API_MAJOR_VERSION@_@VTE_API_MINOR_VERSION@_VALAFLAGS += -D GTK_3_16
-endif
-
-CLEANFILES += \
-       app.c \
-       appresources.c \
-       $(NULL)
-
-EXTRA_DIST += \
-        app.gresource.xml \
-       app.ui \
-       search-popover.ui \
-       $(NULL)
-
-appresources.c: app.gresource.xml Makefile $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies 
--sourcedir $(srcdir) $(srcdir)/app.gresource.xml)
-       $(AM_V_GEN) XMLLINT=$(XMLLINT) $(GLIB_COMPILE_RESOURCES) --target $@ --sourcedir $(srcdir) --generate 
--c-name app $<
-
-endif # ENABLE_TEST_APPLICATION
-
 # Misc unit tests and utilities
 
 noinst_PROGRAMS += interpret slowcat
diff --git a/src/vte/vtedeprecated.h b/src/vte/vtedeprecated.h
index b3303e3..1dd3474 100644
--- a/src/vte/vtedeprecated.h
+++ b/src/vte/vtedeprecated.h
@@ -23,6 +23,9 @@
 #ifndef __VTE_DEPRECATED_H__
 #define __VTE_DEPRECATED_H__
 
+#include "vteterminal.h"
+#include "vtepty.h"
+
 #ifndef VTE_DISABLE_DEPRECATION_WARNINGS
 #define _VTE_DEPRECATED G_DEPRECATED
 #else
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]