Fix build against Vala master

diff --git a/src/libvaladoc/api/tree.vala b/src/libvaladoc/api/tree.vala
index 868f11034f1c02855dea836c762a6f23db7d56f5..a8b492c15a684558228c8ecb0450aaf703dacebd 100644 (file)
--- a/src/libvaladoc/api/tree.vala
+++ b/src/libvaladoc/api/tree.vala
@@ -114,7 +114,7 @@ public class Valadoc.Api.Tree {
                this.context.checking = settings.enable_checking;
                this.context.deprecated = settings.deprecated;
                this.context.experimental = settings.experimental;
-//             this.context.non_null_experimental = settings.non_null_experimental;
+               this.context.experimental_non_null = settings.experimental || settings.experimental_non_null;
                this.context.dbus_transformation = !settings.disable_dbus_transformation;
 
 
@@ -292,15 +292,6 @@ public class Valadoc.Api.Tree {
                        return false;
                }
 
-//             if (context.non_null_experimental) {
-//                     Vala.NullChecker null_checker = new Vala.NullChecker ();
-//                     null_checker.check (this.context);
-
-//                     if (this.context.report.get_errors () > 0) {
-//                             return false;
-//                     }
-//             }
-
                Api.NodeBuilder builder = new NodeBuilder (this);
                this.context.accept(builder);
                this.resolve_type_references ();

diff --git a/src/libvaladoc/settings.vala b/src/libvaladoc/settings.vala
index 7870ab59ce51cb3dccd3e77460e358a01473c980..8785f8835fef5cb6a235abf07b71b7915c73b14b 100755 (executable)
--- a/src/libvaladoc/settings.vala
+++ b/src/libvaladoc/settings.vala
@@ -33,7 +33,7 @@ public class Valadoc.Settings : Object {
        public bool enable_checking;
        public bool deprecated;
        public bool experimental;
-       public bool non_null_experimental;
+       public bool experimental_non_null;
        public bool disable_dbus_transformation;
 
        public string? profile;
@@ -44,3 +44,4 @@ public class Valadoc.Settings : Object {
        public string[] vapi_directories;
 }
 
+

diff --git a/src/valadoc/valadoc b/src/valadoc/valadoc
deleted file mode 100755 (executable)
index 1cf2345..0000000
--- a/src/valadoc/valadoc
+++ /dev/null
@@ -1,136 +0,0 @@
-#! /bin/sh
-
-# valadoc - temporary wrapper script for .libs/valadoc
-# Generated by ltmain.sh - GNU libtool 1.5.26 (1.1220.2.493 2008/02/01 16:58:18)
-#
-# The valadoc program cannot be directly executed until all the libtool
-# libraries that it depends on are installed.
-#
-# This wrapper script should never be moved out of the build directory.
-# If it is, it will not operate correctly.
-
-# Sed substitution that helps us do robust quoting.  It backslashifies
-# metacharacters that are still active within double-quoted strings.
-Xsed='/bin/sed -e 1s/^X//'
-sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g'
-
-# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
-fi
-BIN_SH=xpg4; export BIN_SH # for Tru64
-DUALCASE=1; export DUALCASE # for MKS sh
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-relink_command="(cd /home/didier/dev/gits/valadoc.git/src/valadoc; { test -z \"\${LIBRARY_PATH+set}\" || unset LIBRARY_PATH || { LIBRARY_PATH=; export LIBRARY_PATH; }; }; { test -z \"\${COMPILER_PATH+set}\" || unset COMPILER_PATH || { COMPILER_PATH=; export COMPILER_PATH; }; }; { test -z \"\${GCC_EXEC_PREFIX+set}\" || unset GCC_EXEC_PREFIX || { GCC_EXEC_PREFIX=; export GCC_EXEC_PREFIX; }; }; { test -z \"\${LD_RUN_PATH+set}\" || unset LD_RUN_PATH || { LD_RUN_PATH=; export LD_RUN_PATH; }; }; { test -z \"\${LD_LIBRARY_PATH+set}\" || unset LD_LIBRARY_PATH || { LD_LIBRARY_PATH=; export LD_LIBRARY_PATH; }; }; PATH=\"/usr/local/bin:/usr/bin:/bin:/opt/bin:/usr/x86_64-pc-linux-gnu/gcc-bin/4.3.2:/home/didier/bin\"; export PATH; gcc -DPACKAGE_DATADIR=\\\"/usr/lib/valadoc/plugins\\\" -DPACKAGE_VERSION=\\\"0.2\\\" -I ../libvaladoc/ -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/include/gee-1.0 -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/include/vala-1.0 -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/include/graphviz -g -O0 -o \$progdir/\$file valadoc.o -Wl,--export-dynamic  ../libvaladoc/.libs/libvaladoc.so /usr/lib64/libxml2.so -L/usr/lib /usr/lib/libvala.so /usr/lib64/libgmodule-2.0.so /usr/lib64/libgvc.so /usr/lib64/libpathplan.so /usr/lib64/libexpat.so /usr/lib64/libltdl.so -ldl -lz -lm /usr/lib64/libgraph.so /usr/lib64/libcdt.so /usr/lib/libgee.so -lgcov /usr/lib64/libgobject-2.0.so /usr/lib64/libglib-2.0.so  -Wl,--rpath -Wl,/home/didier/dev/gits/valadoc.git/src/libvaladoc/.libs -Wl,--rpath -Wl,/usr/lib/valadoc/ ) "
-
-# This environment variable determines our operation mode.
-if test "$libtool_install_magic" = "%%%MAGIC variable%%%"; then
-  # install mode needs the following variable:
-  notinst_deplibs=' ../libvaladoc/libvaladoc.la'
-else
-  # When we are sourced in execute mode, $file and $echo are already set.
-  if test "$libtool_execute_magic" != "%%%MAGIC variable%%%"; then
-    echo="echo"
-    file="$0"
-    # Make sure echo works.
-    if test "X$1" = X--no-reexec; then
-      # Discard the --no-reexec flag, and continue.
-      shift
-    elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then
-      # Yippee, $echo works!
-      :
-    else
-      # Restart under the correct shell, and then maybe $echo will work.
-      exec /bin/sh "$0" --no-reexec ${1+"$@"}
-    fi
-  fi
-
-  # Find the directory that this script lives in.
-  thisdir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
-  test "x$thisdir" = "x$file" && thisdir=.
-
-  # Follow symbolic links until we get to the real thisdir.
-  file=`ls -ld "$file" | /bin/sed -n 's/.*-> //p'`
-  while test -n "$file"; do
-    destdir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
-
-    # If there was a directory component, then change thisdir.
-    if test "x$destdir" != "x$file"; then
-      case "$destdir" in
-      [\\/]* | [A-Za-z]:[\\/]*) thisdir="$destdir" ;;
-      *) thisdir="$thisdir/$destdir" ;;
-      esac
-    fi
-
-    file=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-    file=`ls -ld "$thisdir/$file" | /bin/sed -n 's/.*-> //p'`
-  done
-
-  # Try to get the absolute directory name.
-  absdir=`cd "$thisdir" && pwd`
-  test -n "$absdir" && thisdir="$absdir"
-
-  program=lt-'valadoc'
-  progdir="$thisdir/.libs"
-
-  if test ! -f "$progdir/$program" || \
-     { file=`ls -1dt "$progdir/$program" "$progdir/../$program" 2>/dev/null | /bin/sed 1q`; \
-       test "X$file" != "X$progdir/$program"; }; then
-
-    file="$$-$program"
-
-    if test ! -d "$progdir"; then
-      mkdir "$progdir"
-    else
-      rm -f "$progdir/$file"
-    fi
-
-    # relink executable if necessary
-    if test -n "$relink_command"; then
-      if relink_command_output=`eval $relink_command 2>&1`; then :
-      else
-       echo "$relink_command_output" >&2
-       rm -f "$progdir/$file"
-       exit 1
-      fi
-    fi
-
-    mv -f "$progdir/$file" "$progdir/$program" 2>/dev/null ||
-    { rm -f "$progdir/$program";
-      mv -f "$progdir/$file" "$progdir/$program"; }
-    rm -f "$progdir/$file"
-  fi
-
-  if test -f "$progdir/$program"; then
-    if test "$libtool_execute_magic" != "%%%MAGIC variable%%%"; then
-      # Run the actual program with our arguments.
-
-      # Make sure env LD_LIBRARY_PATH does not mess us up
-      if test -n "${LD_LIBRARY_PATH+set}"; then
-        export LD_LIBRARY_PATH=$progdir:$LD_LIBRARY_PATH
-      fi
-
-      exec "$progdir/$program" ${1+"$@"}
-
-      $echo "$0: cannot exec $program $*"
-      exit 1
-    fi
-  else
-    # The program doesn't exist.
-    $echo "$0: error: \`$progdir/$program' does not exist" 1>&2
-    $echo "This script is just a wrapper for $program." 1>&2
-    echo "See the libtool documentation for more information." 1>&2
-    exit 1
-  fi
-fi

diff --git a/src/valadoc/valadoc.vala b/src/valadoc/valadoc.vala
index 0cd605500818f059ce00c1b70622f68dd3ddc63b..86332c2cf9139384eae0cba345734ed743e4e003 100755 (executable)
--- a/src/valadoc/valadoc.vala
+++ b/src/valadoc/valadoc.vala
@@ -46,7 +46,7 @@ public class ValaDoc : Object {
        private static bool enable_checking;
        private static bool deprecated;
        private static bool experimental;
-       private static bool non_null_experimental = false;
+       private static bool experimental_non_null = false;
        private static bool disable_dbus_transformation;
        private static string profile;
 
@@ -63,7 +63,7 @@ public class ValaDoc : Object {
                { "enable-checking", 0, 0, OptionArg.NONE, ref enable_checking, "Enable additional run-time checks", null },
                { "enable-deprecated", 0, 0, OptionArg.NONE, ref deprecated, "Enable deprecated features", null },
                { "enable-experimental", 0, 0, OptionArg.NONE, ref experimental, "Enable experimental features", null },
-               { "enable-non-null-experimental", 0, 0, OptionArg.NONE, ref non_null_experimental, "Enable experimental enhancements for non-null types", null },
+               { "enable-experimental-non-null", 0, 0, OptionArg.NONE, ref experimental_non_null, "Enable experimental enhancements for non-null types", null },
                { "disable-dbus-transformation", 0, 0, OptionArg.NONE, ref disable_dbus_transformation, "Disable transformation of D-Bus member names", null },
                { "vapidir", 0, 0, OptionArg.FILENAME_ARRAY, ref vapi_directories, "Look for package bindings in DIRECTORY", "DIRECTORY..." },
                { "profile", 0, 0, OptionArg.STRING, ref profile, "Use the given profile instead of the default", "PROFILE" },
@@ -141,7 +141,7 @@ public class ValaDoc : Object {
                settings.enable_checking = enable_checking;
                settings.deprecated = deprecated;
                settings.experimental = experimental;
-               settings.non_null_experimental = non_null_experimental;
+               settings.experimental_non_null = experimental_non_null;
                settings.disable_dbus_transformation = disable_dbus_transformation;
                settings.basedir = basedir;
                settings.directory = directory;
@@ -294,3 +294,4 @@ public class ValaDoc : Object {
        }
 }
 
+