[valadoc] Fix build with vala 0.10.0
- From: Florian Brosch <flobrosch src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [valadoc] Fix build with vala 0.10.0
- Date: Tue, 21 Sep 2010 23:20:13 +0000 (UTC)
commit 8c6943fc086c8a216c9cd20857e6add1cea8ac95
Author: Florian Brosch <flo brosch gmail com>
Date: Sun Sep 19 17:31:02 2010 +0200
Fix build with vala 0.10.0
configure.in | 13 +++++++------
src/doclets/valadoc.org/doclet.vala | 2 +-
src/libvaladoc/html/basicdoclet.vala | 2 +-
3 files changed, 9 insertions(+), 8 deletions(-)
---
diff --git a/configure.in b/configure.in
index 2400705..8cdaa49 100644
--- a/configure.in
+++ b/configure.in
@@ -25,7 +25,7 @@ AM_CONDITIONAL(ENABLE_VALADOCORG, test x$enable_valadocorg = xyes)
-LIBVALA_REQUIRED=0.3.4
+LIBVALA_REQUIRED=0.10.0
LIBGEE_REQUIRED=0.5
LIBGVC_REQUIRED=2.16
GLIB_REQUIRED=2.12.0
@@ -47,13 +47,14 @@ AC_SUBST(GMODULE_CFLAGS)
AC_SUBST(GMODULE_LIBS)
PKG_CHECK_EXISTS(vala-0.12,
- [
- PKG_CHECK_MODULES(LIBVALA, vala-0.12 >= $LIBVALA_REQUIRED)
- VALA_PACKAGE=vala-0.12
- ], [
+[
PKG_CHECK_MODULES(LIBVALA, vala-0.10 >= $LIBVALA_REQUIRED)
VALA_PACKAGE=vala-0.10
- ])
+ ], [
+ PKG_CHECK_MODULES(LIBVALA, vala-0.12 >= $LIBVALA_REQUIRED)
+ VALA_PACKAGE=vala-0.12
+ ]
+)
AC_SUBST(LIBVALA_CFLAGS)
AC_SUBST(LIBVALA_LIBS)
AC_SUBST(VALA_PACKAGE)
diff --git a/src/doclets/valadoc.org/doclet.vala b/src/doclets/valadoc.org/doclet.vala
index 64acc31..a6eda32 100755
--- a/src/doclets/valadoc.org/doclet.vala
+++ b/src/doclets/valadoc.org/doclet.vala
@@ -155,7 +155,7 @@ public class Valadoc.ValadocOrg.Doclet : Valadoc.Html.BasicDoclet {
}
protected override void write_wiki_page (WikiPage page, string contentp, string css_path, string js_path, string pkg_name) {
- GLib.FileStream file = GLib.FileStream.open (Path.build_filename(contentp, page.name.ndup(page.name.len()-7).replace ("/", ".")+"wiki.tpl"), "w");
+ GLib.FileStream file = GLib.FileStream.open (Path.build_filename(contentp, page.name.ndup(page.name.length-7).replace ("/", ".")+"wiki.tpl"), "w");
writer = new Html.MarkupWriter (file);
_renderer.set_writer (writer);
_renderer.set_container (page);
diff --git a/src/libvaladoc/html/basicdoclet.vala b/src/libvaladoc/html/basicdoclet.vala
index 0601f66..1519800 100755
--- a/src/libvaladoc/html/basicdoclet.vala
+++ b/src/libvaladoc/html/basicdoclet.vala
@@ -182,7 +182,7 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet {
}
protected virtual void write_wiki_page (WikiPage page, string contentp, string css_path, string js_path, string pkg_name) {
- GLib.FileStream file = GLib.FileStream.open (Path.build_filename(contentp, page.name.ndup(page.name.len()-7).replace ("/", ".")+"html"), "w");
+ GLib.FileStream file = GLib.FileStream.open (Path.build_filename(contentp, page.name.ndup(page.name.length-7).replace ("/", ".")+"html"), "w");
writer = new MarkupWriter (file);
_renderer.set_writer (writer);
this.write_file_header (css_path, js_path, pkg_name);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]