libvaladoc: Use --api-version instead of --version

diff --git a/src/libvaladoc/Makefile.am b/src/libvaladoc/Makefile.am
index 5b81e1f429b8514da8e61d3676e42acc8c9e3701..2297c82682d20962bc83c17225934d08dbd01b4b 100644 (file)
--- a/src/libvaladoc/Makefile.am
+++ b/src/libvaladoc/Makefile.am
@@ -1,6 +1,6 @@
 NULL =
 
-DEFAULT_DRIVER = "`$(VALAC) --version`"
+DEFAULT_DRIVER = "`$(VALAC) --api-version >& /dev/null; if [ $$? = 0 ]; then $(VALAC) --api-version; else $(VALAC) --version; fi`"
 
 
 AM_CFLAGS = \

diff --git a/src/libvaladoc/moduleloader.vala b/src/libvaladoc/moduleloader.vala
index 6de9f8d481d401d0bbf602e48e6079b7395b33ed..1b7d4725077589f3e6dfdf8bde41a73b2b24d6a6 100644 (file)
--- a/src/libvaladoc/moduleloader.vala
+++ b/src/libvaladoc/moduleloader.vala
@@ -128,7 +128,10 @@ public class Valadoc.ModuleLoader : Object {
                }
 
                string[] segments = driverpath.split (".");
-               if (segments.length != 3 && segments.length != 4) {
+               if (segments.length != 2 && // e.g. 0.20, --pkg-version
+                       segments.length != 3 && // e.g. 0.20.3, --version
+                       segments.length != 4)   // e.g. Vala 0.18.0.60-a4cdb, --version
+               {
                        reporter.simple_error ("error: Invalid driver version format.");
                        return null;
                }
@@ -136,12 +139,15 @@ public class Valadoc.ModuleLoader : Object {
 
                int64 segment_a;
                int64 segment_b;
-               int64 segment_c;
+               int64 segment_c = 0;
                bool tmp;
 
                tmp  = int64.try_parse (segments[0], out segment_a);
                tmp &= int64.try_parse (segments[1], out segment_b);
-               tmp &= int64.try_parse (segments[2], out segment_c);
+
+               if (segments.length > 2) {
+                       tmp &= int64.try_parse (segments[2], out segment_c);
+               }
 
                if (!tmp) {
                        reporter.simple_error ("error: Invalid driver version format.");