Use vapi instead of gir internally

2024-06-30 23:29:33 +00:00 · 2012-07-12 20:52:07 +02:00 · 2012-07-12 20:52:07 +02:00 · 2701de49ea
commit 2701de49ea
parent c70b058bbe
8 changed files with 123 additions and 39 deletions
--- a/configure.ac
+++ b/configure.ac
@ -218,23 +218,22 @@ GITG_PLUGIN_LIBTOOL_FLAGS="-module -avoid-version"
 AC_SUBST(GITG_PLUGIN_LIBTOOL_FLAGS)

 GITG_PLUGIN_VALAFLAGS="				\
-	--pkg GitgExt-1.0			\
 	--pkg Ggit-1.0 				\
-	--pkg Gitg-1.0				\
-	--pkg GitgGtk-1.0			\
+	--pkg libgitg-ext-1.0			\
+	--pkg libgitg-1.0			\
+	--pkg libgitg-gtk-1.0			\
 	--pkg gio-2.0				\
 	--pkg gtk+-3.0				\
 	--pkg libpeas-1.0			\
 	--pkg gee-1.0				\
 	--pkg json-glib-1.0			\
 	--pkg webkitgtk-3.0			\
+	--pkg config				\
 	\$(GITG_VALAFLAGS)			\
 	--vapidir \$(top_srcdir)/vapi		\
-	--girdir \$(top_srcdir)/vapi		\
-	--girdir \$(top_builddir)/libgitg	\
-	--girdir \$(top_builddir)/libgitg-gtk	\
-	--girdir \$(top_builddir)/libgitg-ext	\
-	--pkg config"
+	--vapidir \$(top_builddir)/libgitg	\
+	--vapidir \$(top_builddir)/libgitg-gtk	\
+	--vapidir \$(top_builddir)/libgitg-ext"

 AC_SUBST(GITG_PLUGIN_VALAFLAGS)

--- a/gitg/Makefile.am
+++ b/gitg/Makefile.am
@ -14,14 +14,16 @@ VALAFLAGS = \
 	$(GITG_VALAFLAGS)					\
 	--pkg config						\
 	--pkg Ggit-1.0						\
-	--pkg Gitg-1.0						\
-	--pkg GitgExt-1.0					\
+	--pkg libgitg-1.0					\
+	--pkg libgitg-ext-1.0					\
 	--pkg gtk+-3.0						\
 	--pkg gio-2.0						\
 	--pkg libpeas-1.0					\
 	--pkg gobject-introspection-1.0				\
 	--girdir "$(top_builddir)/libgitg"			\
-	--girdir "$(top_builddir)/libgitg-ext"
+	--girdir "$(top_builddir)/libgitg-ext"			\
+	--vapidir "$(top_builddir)/libgitg"			\
+	--vapidir "$(top_builddir)/libgitg-ext"

 VALASOURCES =							\
 	gitg.vala						\
--- a/libgitg-ext/Makefile.am
+++ b/libgitg-ext/Makefile.am
@ -8,18 +8,19 @@ INCLUDES =								\
 	-DDATADIR=\""$(datadir)"\"					\
 	-DLIBDIR=\""$(libdir)"\"

-VALAFLAGS = 				\
-	--pkg Ggit-1.0 			\
-	--pkg Gitg-1.0			\
-	--pkg gio-2.0			\
-	--pkg gtk+-3.0			\
-	$(GITG_VALAFLAGS)		\
-	--header libgitg-ext.h		\
-	--includedir libgitg-ext	\
-	--basedir $(top_srcdir)		\
-	--gir GitgExt-1.0.gir		\
-	--library libgitg-ext-1.0	\
-	--girdir $(top_builddir)/libgitg
+VALAFLAGS = 					\
+	--pkg Ggit-1.0 				\
+	--pkg libgitg-1.0			\
+	--pkg gio-2.0				\
+	--pkg gtk+-3.0				\
+	$(GITG_VALAFLAGS)			\
+	--header libgitg-ext.h			\
+	--includedir libgitg-ext		\
+	--basedir $(top_srcdir)			\
+	--gir GitgExt-1.0.gir			\
+	--library libgitg-ext-1.0		\
+	--girdir $(top_builddir)/libgitg	\
+	--vapidir $(top_builddir)/libgitg

 libgitg_ext_1_0_la_LDFLAGS = \
 	-export-dynamic -no-undefined -export-symbols-regex "^[^_].*"
@ -30,6 +31,7 @@ INST_H_FILES =				\
 	libgitg-ext.h

 VALA_FILES =					\
+	gitg-ext-assembly-info.vala		\
 	gitg-ext-application.vala		\
 	gitg-ext-panel.vala			\
 	gitg-ext-view.vala			\
@ -46,6 +48,9 @@ libgitg_ext_1_0_la_SOURCES =		\
 headerdir = $(prefix)/include/libgitg-ext-1.0/libgitg-ext
 header_DATA = $(INST_H_FILES)

+vapidir = $(prefix)/share/vala/vapi
+vapi_DATA = libgitg-ext-1.0.vapi
+
 GitgExt-1.0.gir: libgitg-ext-1.0.la
 libgitg-ext.h: libgitg-ext-1.0.la

--- a/libgitg-ext/gitg-ext-assembly-info.vala
+++ b/libgitg-ext/gitg-ext-assembly-info.vala
@ -0,0 +1,23 @@
+/*
+ * This file is part of gitg
+ *
+ * Copyright (C) 2012 - Jesse van den Kieboom
+ *
+ * gitg is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * gitg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with gitg. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+[CCode (gir_namespace = "GitgExt", gir_version = "1.0")]
+namespace GitgExt {}
+
+// ex:set ts=4 noet
--- a/libgitg-gtk/Makefile.am
+++ b/libgitg-gtk/Makefile.am
@ -20,27 +20,29 @@ libgitg_gtk_1_0_la_LIBADD = 				\
 INST_H_FILES =				\
 	libgitg-gtk.h

-VALAFLAGS = 				\
-	--pkg Ggit-1.0 			\
-	--pkg Gitg-1.0			\
-	--pkg gtk+-3.0			\
-	--pkg gio-2.0			\
-	--pkg webkitgtk-3.0		\
-	--pkg gee-1.0			\
-	--pkg json-glib-1.0		\
-	$(GITG_VALAFLAGS)		\
-	--vapidir $(top_srcdir)/vapi	\
-	--header libgitg-gtk.h		\
-	--includedir libgitg-gtk	\
-	--basedir $(top_srcdir)		\
-	--gir GitgGtk-1.0.gir		\
-	--library libgitg-gtk-1.0	\
-	--girdir "$(top_builddir)/libgitg"
+VALAFLAGS = 					\
+	--pkg Ggit-1.0 				\
+	--pkg libgitg-1.0			\
+	--pkg gtk+-3.0				\
+	--pkg gio-2.0				\
+	--pkg webkitgtk-3.0			\
+	--pkg gee-1.0				\
+	--pkg json-glib-1.0			\
+	$(GITG_VALAFLAGS)			\
+	--vapidir $(top_srcdir)/vapi		\
+	--header libgitg-gtk.h			\
+	--includedir libgitg-gtk		\
+	--basedir $(top_srcdir)			\
+	--gir GitgGtk-1.0.gir			\
+	--library libgitg-gtk-1.0		\
+	--girdir "$(top_builddir)/libgitg"	\
+	--vapidir "$(top_builddir)/libgitg"

 GitgGtk-1.0.gir: libgitg-gtk-1.0.la
 libgitg-gtk.h: libgitg-gtk-1.0.la

 VALA_FILES =						\
+	gitg-gtk-assembly-info.vala			\
 	gitg-gtk-commit-model.vala			\
 	gitg-gtk-label-renderer.vala			\
 	gitg-gtk-cell-renderer-lanes.vala		\
@ -63,6 +65,9 @@ libgitg_gtk_1_0_la_SOURCES = 		\
 headerdir = $(prefix)/include/libgitg-gtk-1.0/libgitg-gtk
 header_DATA = $(INST_H_FILES)

+vapidir = $(prefix)/share/vala/vapi
+vapi_DATA = libgitg-gtk-1.0.vapi
+
 girdir = $(INTROSPECTION_GIRDIR)
 gir_DATA = GitgGtk-1.0.gir

--- a/libgitg-gtk/gitg-gtk-assembly-info.vala
+++ b/libgitg-gtk/gitg-gtk-assembly-info.vala
@ -0,0 +1,23 @@
+/*
+ * This file is part of gitg
+ *
+ * Copyright (C) 2012 - Jesse van den Kieboom
+ *
+ * gitg is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * gitg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with gitg. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+[CCode (gir_namespace = "GitgGtk", gir_version = "1.0")]
+namespace GitgGtk {}
+
+// ex:set ts=4 noet
--- a/libgitg/Makefile.am
+++ b/libgitg/Makefile.am
@ -30,6 +30,7 @@ Gitg-1.0.gir: libgitg-1.0.la
 libgitg.h: libgitg-1.0.la

 VALA_FILES =				\
+	gitg-assembly-info.vala		\
 	gitg-repository.vala		\
 	gitg-ref.vala			\
 	gitg-lane.vala			\
@ -49,6 +50,9 @@ libgitg_1_0_la_SOURCES = 		\
 headerdir = $(prefix)/include/libgitg-1.0/libgitg
 header_DATA = $(INST_H_FILES)

+vapidir = $(prefix)/share/vala/vapi
+vapi_DATA = libgitg-1.0.vapi
+
 girdir = $(INTROSPECTION_GIRDIR)
 gir_DATA = Gitg-1.0.gir

--- a/libgitg/gitg-assembly-info.vala
+++ b/libgitg/gitg-assembly-info.vala
@ -0,0 +1,23 @@
+/*
+ * This file is part of gitg
+ *
+ * Copyright (C) 2012 - Jesse van den Kieboom
+ *
+ * gitg is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * gitg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with gitg. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+[CCode (gir_namespace = "Gitg", gir_version = "1.0")]
+namespace Gitg {}
+
+// ex:set ts=4 noet