[valadoc] Add support for vala 0.15.1

[Florian Brosch <flobrosch src gnome org>]

commit 27725c56de43ad0ef67b32b1977e086d0704913c
Author: Florian Brosch <flo brosch gmail com>
Date:   Fri Jan 27 04:25:23 2012 +0100

    Add support for vala 0.15.1

 configure.in                       |    8 +++++++-
 src/driver/0.16.x/Makefile.am      |    7 +++++++
 src/driver/0.16.x/driver.vala      |    4 ++++
 src/driver/0.16.x/girwriter.vala   |    5 +++++
 src/driver/0.16.x/treebuilder.vala |   13 ++++++++++++-
 src/driver/Makefile.am             |    4 ++++
 src/libvaladoc/Makefile.am         |    1 +
 7 files changed, 40 insertions(+), 2 deletions(-)
---
diff --git a/configure.in b/configure.in
index 3bfc864..95248c5 100755
--- a/configure.in
+++ b/configure.in
@@ -62,12 +62,18 @@ AC_SUBST(LIBGDKPIXBUF_LIBS)
 ## Drivers:
 ##
 
-PKG_CHECK_MODULES(LIBVALA_0_16_X, libvala-0.16 >= 0.14.0, have_libvala_0_16_x="yes", have_libvala_0_16_x="no")
+PKG_CHECK_MODULES(LIBVALA_0_16_X, libvala-0.16 >= 0.15.1, have_libvala_0_16_x="yes", have_libvala_0_16_x="no")
 AM_CONDITIONAL(HAVE_LIBVALA_0_16_X, test "$have_libvala_0_16_x" = "yes")
 AC_SUBST(LIBVALA_0_16_X_CFLAGS)
 AC_SUBST(LIBVALA_0_16_X_LIBS)
 
 
+PKG_CHECK_MODULES(LIBVALA_0_15_0, libvala-0.16 = 0.15.0, have_libvala_0_15_0="yes", have_libvala_0_15_0="no")
+AM_CONDITIONAL(HAVE_LIBVALA_0_15_0, test "$have_libvala_0_15_0" = "yes")
+AC_SUBST(LIBVALA_0_15_0_CFLAGS)
+AC_SUBST(LIBVALA_0_15_0_LIBS)
+
+
 PKG_CHECK_MODULES(LIBVALA_0_14_X, libvala-0.14 >= 0.13.2, have_libvala_0_14_x="yes", have_libvala_0_14_x="no")
 AM_CONDITIONAL(HAVE_LIBVALA_0_14_X, test "$have_libvala_0_14_x" = "yes")
 AC_SUBST(LIBVALA_0_14_X_CFLAGS)
diff --git a/src/driver/0.16.x/Makefile.am b/src/driver/0.16.x/Makefile.am
index a48f821..b390213 100755
--- a/src/driver/0.16.x/Makefile.am
+++ b/src/driver/0.16.x/Makefile.am
@@ -5,11 +5,17 @@ NULL =
 VERSIONED_VAPI_DIR=`pkg-config libvala-0.16 --variable vapidir`
 
 
+if HAVE_LIBVALA_0_15_0
+VALA_FLAGS = -D VALA_0_15_0
+endif
+
+
 AM_CFLAGS =  -g \
 	-DPACKAGE_ICONDIR=\"$(datadir)/valadoc/icons/\" \
 	-I ../../libvaladoc/ \
 	$(GLIB_CFLAGS) \
 	$(LIBGEE_CFLAGS) \
+	$(LIBVALA_0_15_0_CFLAGS) \
 	$(LIBVALA_0_16_X_CFLAGS) \
 	$(NULL)
 
@@ -52,6 +58,7 @@ libdriver.vala.stamp: $(libdriver_la_VALASOURCES)
 libdriver_la_LIBADD = \
 	../../libvaladoc/libvaladoc.la \
 	$(GLIB_LIBS) \
+	$(LIBVALA_0_15_0_LIBS) \
 	$(LIBVALA_0_16_X_LIBS) \
 	$(LIBGEE_LIBS) \
 	$(NULL)
diff --git a/src/driver/0.16.x/driver.vala b/src/driver/0.16.x/driver.vala
index 35d43d1..1a16497 100755
--- a/src/driver/0.16.x/driver.vala
+++ b/src/driver/0.16.x/driver.vala
@@ -33,7 +33,11 @@ public class Valadoc.Drivers.Driver : Object, Valadoc.Driver {
 	private Api.Tree? tree;
 
 	public void write_gir (Settings settings, ErrorReporter reporter) {
+#if VALA_0_15_0
+		var gir_writer = new Vala.GIRWriter ();
+#else
 		var gir_writer = new Drivers.GirWriter (resolver);
+#endif
 
 		// put .gir file in current directory unless -d has been explicitly specified
 		string gir_directory = ".";
diff --git a/src/driver/0.16.x/girwriter.vala b/src/driver/0.16.x/girwriter.vala
index 12762d1..4128409 100644
--- a/src/driver/0.16.x/girwriter.vala
+++ b/src/driver/0.16.x/girwriter.vala
@@ -24,6 +24,8 @@
 using Valadoc.Api;
 
 
+#if ! VALA_0_15_0
+
 /**
  * Code visitor generating .gir file for the public interface.
  */
@@ -201,3 +203,6 @@ public class Valadoc.Drivers.GirWriter : Vala.GIRWriter {
 	}
 }
 
+
+#endif
+
diff --git a/src/driver/0.16.x/treebuilder.vala b/src/driver/0.16.x/treebuilder.vala
index 353119e..4813bcd 100644
--- a/src/driver/0.16.x/treebuilder.vala
+++ b/src/driver/0.16.x/treebuilder.vala
@@ -82,11 +82,15 @@ public class Valadoc.Drivers.TreeBuilder : Vala.CodeVisitor {
 				foreach (Vala.Comment c in vns.get_comments()) {
 					if (c.source_reference.file == vns.source_reference.file) {
 						Vala.SourceReference pos = c.source_reference;
+#if ! VALA_0_15_0
 						if (c is Vala.GirComment) {
 							comment = new GirSourceComment (c.content, file, pos.first_line, pos.first_column, pos.last_line, pos.last_column);
 						} else {
 							comment = new SourceComment (c.content, file, pos.first_line, pos.first_column, pos.last_line, pos.last_column);
 						}
+#else
+						comment = new SourceComment (c.content, file, pos.first_line, pos.first_column, pos.last_line, pos.last_column);
+#endif
 						break;
 					}
 				}
@@ -291,6 +295,13 @@ public class Valadoc.Drivers.TreeBuilder : Vala.CodeVisitor {
 	}
 
 	private SourceComment? create_comment (Vala.Comment? comment) {
+#if VALA_0_15_0
+		if (comment != null) {
+			Vala.SourceReference pos = comment.source_reference;
+			SourceFile file = files.get (pos.file);
+			return new SourceComment (comment.content, file, pos.first_line, pos.first_column, pos.last_line, pos.last_column);
+		}
+#else
 		if (comment != null) {
 			Vala.SourceReference pos = comment.source_reference;
 			SourceFile file = files.get (pos.file);
@@ -313,7 +324,7 @@ public class Valadoc.Drivers.TreeBuilder : Vala.CodeVisitor {
 				return new SourceComment (comment.content, file, pos.first_line, pos.first_column, pos.last_line, pos.last_column);
 			}
 		}
-
+#endif
 		return null;
 	}
 
diff --git a/src/driver/Makefile.am b/src/driver/Makefile.am
index e366d3a..863cc95 100755
--- a/src/driver/Makefile.am
+++ b/src/driver/Makefile.am
@@ -26,6 +26,10 @@ if HAVE_LIBVALA_0_14_X
 DRIVER_0_14_X_DIR = 0.14.x
 endif
 
+if HAVE_LIBVALA_0_15_0
+DRIVER_0_16_X_DIR = 0.16.x
+endif
+
 if HAVE_LIBVALA_0_16_X
 DRIVER_0_16_X_DIR = 0.16.x
 endif
diff --git a/src/libvaladoc/Makefile.am b/src/libvaladoc/Makefile.am
index 7db46be..b2f07a6 100755
--- a/src/libvaladoc/Makefile.am
+++ b/src/libvaladoc/Makefile.am
@@ -1,5 +1,6 @@
 NULL =
 
+DEFAULT_DRIVER = "`$(VALAC) --version`"
 
 
 AM_CFLAGS = \