cpw.qulogic.vala: 0a915572: Add Vala bindings autogeneration. Not qu...

qulogic at pidgin.im qulogic at pidgin.im
Sun Nov 21 05:07:39 EST 2010


----------------------------------------------------------------------
Revision: 0a91557298e78e8394a6f92c489de585b89a7403
Parent:   59e16ff94a4636665de90332c92822e35d063b2b
Author:   qulogic at pidgin.im
Date:     10/31/10 04:02:42
Branch:   im.pidgin.cpw.qulogic.vala
URL: http://d.pidgin.im/viewmtn/revision/info/0a91557298e78e8394a6f92c489de585b89a7403

Changelog: 

Add Vala bindings autogeneration. Not quite complete.

Changes against parent 59e16ff94a4636665de90332c92822e35d063b2b

  added    vapi
  added    vapi/Makefile.am
  added    vapi/finch.deps.in
  added    vapi/finch.files.in
  added    vapi/finch.metadata.in
  added    vapi/finch.namespace
  added    vapi/pidgin.deps.in
  added    vapi/pidgin.files.in
  added    vapi/pidgin.metadata.in
  added    vapi/pidgin.namespace
  added    vapi/purple.deps.in
  added    vapi/purple.files.in
  added    vapi/purple.metadata.in
  added    vapi/purple.namespace
  patched  Makefile.am
  patched  configure.ac

-------------- next part --------------
============================================================
--- Makefile.am	fcbb5a8b0528f430b95a912fafa38f97fda19125
+++ Makefile.am	7cb12dadb92b0a254ce7e655fcd7adae13aebee6
@@ -92,6 +92,10 @@ endif
 GNT_DIR=finch
 endif
 
+if ENABLE_VALA
+VAPI_DIR=vapi
+endif
+
 # This is phony, so that we always try to rebuild it.  If it succeeds
 # in calculating changes, it produces its target; otherwise, its
 # target does not exist.
@@ -127,7 +131,7 @@ distcleancheck_listfiles = find . -type 
 # line does is tell 'distcheck' to shut up and ignore those two files.
 distcleancheck_listfiles = find . -type f -a ! -name package_revision.h
 
-SUBDIRS = . libpurple doc $(GNT_DIR) $(GTK_DIR) m4macros $(PO_DIR) share/ca-certs share/sounds
+SUBDIRS = . libpurple doc $(GNT_DIR) $(GTK_DIR) m4macros $(PO_DIR) share/ca-certs share/sounds $(VAPI_DIR)
 
 docs: Doxyfile
 if HAVE_DOXYGEN
============================================================
--- configure.ac	c667b2dcd0d21e06e9c0cd0f4835180774701777
+++ configure.ac	00989b7cf4428dfdbbff66d5da33c51110720a07
@@ -1697,6 +1697,39 @@ dnl ####################################
 fi
 
 dnl #######################################################################
+dnl # Check for Vala support
+dnl #######################################################################
+AC_ARG_ENABLE(vala, [AC_HELP_STRING([--enable-vala], [Enable Vala support])], , enable_vala=yes)
+
+dnl find the vala utilities
+VALA_REQUIRED=0.8.0
+
+if test "x$enable_vala" != "xno"; then
+	PKG_CHECK_MODULES(VALA, vala-0.10 >= "$VALA_REQUIRED", [VALA_PKG=0.10], [
+		PKG_CHECK_MODULES(VALA, [vala-1.0 >= "$VALA_REQUIRED"], [VALA_PKG=1.0])
+		])
+	AC_PATH_PROG(VALA, vala)
+
+	# vala-gen-introspect is useless, but it's just a wrapper,
+	#  so we go use the real parser
+	AC_MSG_CHECKING(for vala/gen-introspect)
+	VALA_GEN_INTROSPECT=`$PKG_CONFIG --variable=gen_introspect vala-$VALA_PKG`
+	if test "x$VALA_GEN_INTROSPECT" = "x"; then
+		AC_MSG_RESULT(no)
+		AC_MSG_ERROR([Cannot find "vala/gen-introspect"])
+	fi
+	AC_MSG_RESULT($VALA_GEN_INTROSPECT)
+	AC_SUBST(VALA_GEN_INTROSPECT)
+ 
+	AC_PATH_PROG(VAPIGEN, vapigen)
+	if test "x$VAPIGEN" = "x"; then
+		AC_MSG_ERROR([Cannot fine "vapigen" in your PATH])
+	fi
+fi
+
+AM_CONDITIONAL(ENABLE_VALA, test "x$enable_vala" = "xyes")
+
+dnl #######################################################################
 dnl # SSL support
 dnl #
 dnl # Thanks go to Evolution for the checks.
@@ -2619,6 +2652,16 @@ AC_CONFIG_FILES([Makefile
 		   finch/libgnt/gnt.pc
 		   finch/libgnt/wms/Makefile
 		   finch/plugins/Makefile
+		   vapi/Makefile
+		   vapi/purple.deps
+		   vapi/purple.files
+		   vapi/purple.metadata
+		   vapi/pidgin.deps
+		   vapi/pidgin.files
+		   vapi/pidgin.metadata
+		   vapi/finch.deps
+		   vapi/finch.files
+		   vapi/finch.metadata
 		   po/Makefile.in
 		   pidgin.spec
 		  ])
@@ -2667,6 +2710,7 @@ echo Build with Tk support......... : $e
 echo Build with Perl support....... : $enable_perl
 echo Build with Tcl support........ : $enable_tcl
 echo Build with Tk support......... : $enable_tk
+echo Build with Vala support....... : $enable_vala
 echo
 echo Print debugging messages...... : $enable_debug
 echo
============================================================
--- /dev/null	
+++ vapi/Makefile.am	f81c2ef0ee2edacc9f59deda9d5ea81a553a9b59
@@ -0,0 +1,34 @@
+
+vapidir=$(datadir)/vala/vapi
+
+targets=purple
+INCLUDES=-I at top_srcdir@/libpurple $(GLIB_CFLAGS)
+
+if ENABLE_GTK
+targets+=pidgin
+INCLUDES+= -I at top_srcdir@/pidgin $(GTK_CFLAGS)
+endif
+
+if ENABLE_GNT
+#targets+=finch
+#INCLUDES+= -I at top_srcdir@/finch
+endif
+
+depsfiles = $(addsuffix .deps,$(targets))
+if ENABLE_VALA
+vapifiles = $(addsuffix .vapi,$(targets))
+vapi_DATA = $(depsfiles) $(vapifiles)
+endif
+
+all: $(vapifiles)
+
+%.vapi: %.gi
+	$(AM_V_gen)$(VAPIGEN) --pkg gtk+-2.0 --library $* $*.gi
+
+%.gi: %.files %.namespace
+	$(AM_V_gen)$(VALA_GEN_INTROSPECT) --namespace=`cat @srcdir@/$*.namespace` $(INCLUDES) `cat $*.files` > $*.gi \
+		&& test -s $*.gi
+
+clean:
+	-rm -rf $(vapifiles) $(subst .vapi,.gi,$(vapifiles))
+
============================================================
--- /dev/null	
+++ vapi/finch.deps.in	5dd28873dc7ffaa4f2eef21f229cdfc9540d3069
@@ -0,0 +1,2 @@
+glib-2.0
+
============================================================
--- /dev/null	
+++ vapi/finch.files.in	815884d242cbc298d2667feab576667411b0e92f
@@ -0,0 +1,20 @@
+ at top_srcdir@/finch/finch.h
+ at top_srcdir@/finch/gntaccount.h
+ at top_srcdir@/finch/gntblist.h
+ at top_srcdir@/finch/gntcertmgr.h
+ at top_srcdir@/finch/gntconn.h
+ at top_srcdir@/finch/gntconv.h
+ at top_srcdir@/finch/gntdebug.h
+ at top_srcdir@/finch/gntft.h
+ at top_srcdir@/finch/gntidle.h
+ at top_srcdir@/finch/gntlog.h
+ at top_srcdir@/finch/gntmedia.h
+ at top_srcdir@/finch/gntnotify.h
+ at top_srcdir@/finch/gntplugin.h
+ at top_srcdir@/finch/gntpounce.h
+ at top_srcdir@/finch/gntprefs.h
+ at top_srcdir@/finch/gntrequest.h
+ at top_srcdir@/finch/gntroomlist.h
+ at top_srcdir@/finch/gntsound.h
+ at top_srcdir@/finch/gntstatus.h
+ at top_srcdir@/finch/gntui.h
============================================================
--- /dev/null	
+++ vapi/finch.metadata.in	da39a3ee5e6b4b0d3255bfef95601890afd80709
============================================================
--- /dev/null	
+++ vapi/finch.namespace	69596aea88bdbcfba5660be1d4b2c00abeb39f2e
@@ -0,0 +1 @@
+Finch
============================================================
--- /dev/null	
+++ vapi/pidgin.deps.in	5dd28873dc7ffaa4f2eef21f229cdfc9540d3069
@@ -0,0 +1,2 @@
+glib-2.0
+
============================================================
--- /dev/null	
+++ vapi/pidgin.files.in	0ff947a3919df4bbe46d98f52985259db60241c3
@@ -0,0 +1,49 @@
+ at top_srcdir@/pidgin/getopt.h
+ at top_srcdir@/pidgin/gtkaccount.h
+ at top_srcdir@/pidgin/gtkblist.h
+ at top_srcdir@/pidgin/gtkblist-theme.h
+ at top_srcdir@/pidgin/gtkblist-theme-loader.h
+ at top_srcdir@/pidgin/gtkcellrendererexpander.h
+ at top_srcdir@/pidgin/gtkcertmgr.h
+ at top_srcdir@/pidgin/gtkconn.h
+ at top_srcdir@/pidgin/gtkconv.h
+ at top_srcdir@/pidgin/gtkconvwin.h
+ at top_srcdir@/pidgin/gtkdebug.h
+ at top_srcdir@/pidgin/gtkdialogs.h
+ at top_srcdir@/pidgin/gtkdnd-hints.h
+ at top_srcdir@/pidgin/gtkdocklet.h
+ at top_srcdir@/pidgin/gtkeventloop.h
+ at top_srcdir@/pidgin/gtkft.h
+ at top_srcdir@/pidgin/gtkicon-theme.h
+ at top_srcdir@/pidgin/gtkicon-theme-loader.h
+ at top_srcdir@/pidgin/gtkidle.h
+ at top_srcdir@/pidgin/gtkimhtml.h
+ at top_srcdir@/pidgin/gtkimhtmltoolbar.h
+ at top_srcdir@/pidgin/gtklog.h
+ at top_srcdir@/pidgin/gtkmedia.h
+ at top_srcdir@/pidgin/gtkmenutray.h
+ at top_srcdir@/pidgin/gtknickcolors.h
+ at top_srcdir@/pidgin/gtknotify.h
+ at top_srcdir@/pidgin/gtkplugin.h
+ at top_srcdir@/pidgin/gtkpluginpref.h
+ at top_srcdir@/pidgin/gtkpounce.h
+ at top_srcdir@/pidgin/gtkprefs.h
+ at top_srcdir@/pidgin/gtkprivacy.h
+ at top_srcdir@/pidgin/gtkrequest.h
+ at top_srcdir@/pidgin/gtkroomlist.h
+ at top_srcdir@/pidgin/gtksavedstatuses.h
+ at top_srcdir@/pidgin/gtkscrollbook.h
+ at top_srcdir@/pidgin/gtksession.h
+ at top_srcdir@/pidgin/gtksmiley.h
+ at top_srcdir@/pidgin/gtksound.h
+ at top_srcdir@/pidgin/gtksourceiter.h
+ at top_srcdir@/pidgin/gtksourceundomanager.h
+ at top_srcdir@/pidgin/gtksourceview-marshal.h
+ at top_srcdir@/pidgin/gtkstatusbox.h
+ at top_srcdir@/pidgin/gtkstatus-icon-theme.h
+ at top_srcdir@/pidgin/gtkthemes.h
+ at top_srcdir@/pidgin/gtkutils.h
+ at top_srcdir@/pidgin/gtkwhiteboard.h
+ at top_srcdir@/pidgin/minidialog.h
+ at top_srcdir@/pidgin/pidginstock.h
+ at top_srcdir@/pidgin/pidgintooltip.h
============================================================
--- /dev/null	
+++ vapi/pidgin.metadata.in	3353530ef6f194df2ec93eef31280393cbb292de
@@ -0,0 +1,4 @@
+# PKG_CONFIG_PATH=../libpurple:../pidgin/ vala-gen-introspect pidgin-uninstalled .
+
+PidginGtkIMHtml.show_comments hidden="1"
+
============================================================
--- /dev/null	
+++ vapi/pidgin.namespace	5b220e0f473ee9301dc249d73e462919245fc4f0
@@ -0,0 +1 @@
+Pidgin
============================================================
--- /dev/null	
+++ vapi/purple.deps.in	5dd28873dc7ffaa4f2eef21f229cdfc9540d3069
@@ -0,0 +1,2 @@
+glib-2.0
+
============================================================
--- /dev/null	
+++ vapi/purple.files.in	5abf05e8e64b4af5061f162c9a696ce12956c763
@@ -0,0 +1,61 @@
+ at top_srcdir@/libpurple/account.h
+ at top_srcdir@/libpurple/accountopt.h
+ at top_srcdir@/libpurple/blist.h
+ at top_srcdir@/libpurple/buddyicon.h
+ at top_srcdir@/libpurple/certificate.h
+ at top_srcdir@/libpurple/cipher.h
+ at top_srcdir@/libpurple/circbuffer.h
+ at top_srcdir@/libpurple/cmds.h
+ at top_srcdir@/libpurple/connection.h
+ at top_srcdir@/libpurple/conversation.h
+ at top_srcdir@/libpurple/core.h
+ at top_srcdir@/libpurple/debug.h
+ at top_srcdir@/libpurple/desktopitem.h
+ at top_srcdir@/libpurple/dnsquery.h
+ at top_srcdir@/libpurple/dnssrv.h
+ at top_srcdir@/libpurple/eventloop.h
+ at top_srcdir@/libpurple/ft.h
+ at top_srcdir@/libpurple/idle.h
+ at top_srcdir@/libpurple/imgstore.h
+ at top_srcdir@/libpurple/log.h
+ at top_srcdir@/libpurple/media.h
+ at top_srcdir@/libpurple/mediamanager.h
+ at top_srcdir@/libpurple/mime.h
+ at top_srcdir@/libpurple/nat-pmp.h
+ at top_srcdir@/libpurple/network.h
+ at top_srcdir@/libpurple/notify.h
+ at top_srcdir@/libpurple/ntlm.h
+ at top_srcdir@/libpurple/plugin.h
+ at top_srcdir@/libpurple/pluginpref.h
+ at top_srcdir@/libpurple/pounce.h
+ at top_srcdir@/libpurple/prefs.h
+ at top_srcdir@/libpurple/privacy.h
+ at top_srcdir@/libpurple/proxy.h
+ at top_srcdir@/libpurple/prpl.h
+ at top_srcdir@/libpurple/request.h
+ at top_srcdir@/libpurple/roomlist.h
+ at top_srcdir@/libpurple/savedstatuses.h
+ at top_srcdir@/libpurple/server.h
+ at top_srcdir@/libpurple/signals.h
+ at top_srcdir@/libpurple/smiley.h
+ at top_srcdir@/libpurple/sound.h
+ at top_srcdir@/libpurple/sound-theme.h
+ at top_srcdir@/libpurple/sound-theme-loader.h
+ at top_srcdir@/libpurple/sslconn.h
+ at top_srcdir@/libpurple/status.h
+ at top_srcdir@/libpurple/stringref.h
+ at top_srcdir@/libpurple/stun.h
+ at top_srcdir@/libpurple/theme.h
+ at top_srcdir@/libpurple/theme-loader.h
+ at top_srcdir@/libpurple/theme-manager.h
+ at top_srcdir@/libpurple/upnp.h
+ at top_srcdir@/libpurple/util.h
+ at top_srcdir@/libpurple/value.h
+ at top_srcdir@/libpurple/whiteboard.h
+ at top_builddir@/libpurple/version.h
+ at top_srcdir@/libpurple/xmlnode.h
+ at top_srcdir@/libpurple/media/backend-iface.h
+ at top_srcdir@/libpurple/media/candidate.h
+ at top_srcdir@/libpurple/media/codec.h
+ at top_srcdir@/libpurple/media/enum-types.h
+
============================================================
--- /dev/null	
+++ vapi/purple.metadata.in	84ac77912456dc538dad33967fd3d3ecf72cd1fc
@@ -0,0 +1,13 @@
+# PKG_CONFIG_PATH=../libpurple vala-gen-introspect purple-uninstalled .
+# vapigen --pkg gtk+-2.0 --pkg gstreamer-0.10 --library purple purple-uninstalled.gi
+
+Purplexmlnode.child hidden="1"
+PurpleBlistNode.* hidden="1"
+PurpleCertificatePool.get_idlist hidden="1"
+PurpleConvChat.left hidden="1"
+PurpleLogLogger.remove hidden="1"
+PurpleNotifySearchResults.rows hidden="1"
+PurpleMediaBackendIface.parent_iface hidden="1"
+# Hmm, why?
+purple_markup_find_tag hidden="1"
+
============================================================
--- /dev/null	
+++ vapi/purple.namespace	f4a5d381d2bed650246e20f5837e1b742dfbdd6e
@@ -0,0 +1 @@
+Purple


More information about the Commits mailing list