Remove src/api-support and generate this information from actions add…

…ed field.

Makefile.am

@@ -571,7 +571,6 @@ maintainer-check-extra-dist:
 	git ls-files | sort > tmp/gitfiles
 	diff -ur tmp/tarfiles tmp/gitfiles | \
 	  grep '^\+' | \
-	  grep -v '^\+src/api-support/[0-9]' | \
 	  grep -v '^\+intltool-.*\.in' | \
 	  grep -v '^\+.gitmodules' | \
 	  grep -v '^\+.gnulib' ||:

generator/Makefile.am

@@ -21,8 +21,6 @@ include $(top_srcdir)/subdir-rules.mk
 sources = \
 	actions.ml \
 	actions.mli \
-	api_versions.ml \
-	api_versions.mli \
 	bindtests.ml \
 	c.ml \
 	checks.ml \
@@ -64,7 +62,6 @@ objects = \
 	utils.cmo \
 	actions.cmo \
 	structs.cmo \
-	api_versions.cmo \
 	optgroups.cmo \
 	prepopts.cmo \
 	events.cmo \

generator/c.ml

@@ -24,7 +24,6 @@ open Types
 open Utils
 open Pr
 open Docstrings
-open Api_versions
 open Optgroups
 open Actions
 open Structs
@@ -302,10 +301,8 @@ I<The caller must free the returned buffer after use>.\n\n"
     pr "This function takes a key or passphrase parameter which
 could contain sensitive material.  Read the section
 L</KEYS AND PASSPHRASES> for more information.\n\n";
-  (match lookup_api_version ("guestfs_" ^ c_name) with
-  | Some version -> pr "(Added in %s)\n\n" version
-  | None -> ()
-  );
+  let version = api_version f.added in
+  pr "(Added in %s)\n\n" version;
 
   (* Handling of optional argument variants. *)
   if optargs <> [] then (
@@ -325,7 +322,7 @@ L</KEYS AND PASSPHRASES> for more information.\n\n";
     pr "See L</CALLS WITH OPTIONAL ARGUMENTS>.\n\n";
   )
 
-and generate_actions_pod_back_compat_entry { name = name;
+and generate_actions_pod_back_compat_entry { name = name; added = added;
                                              style = ret, args, _ } =
   pr "=head2 guestfs_%s\n\n" name;
   generate_prototype ~extern:false ~indent:" " ~handle:"g"
@@ -337,11 +334,13 @@ and generate_actions_pod_back_compat_entry { name = name;
   pr "L</guestfs_%s_opts> with no optional arguments.\n" name;
   pr "\n";
 
-  (match lookup_api_version ("guestfs_" ^ name) with
-  | Some version -> pr "(Added in %s)\n\n" version
-  | None -> ()
-  );
-  pr "\n"
+  let version = api_version added in
+  pr "(Added in %s)\n\n\n" version;
+
+and api_version = function
+  | (0, 0, release) -> sprintf "0.%d" release
+  | ((0|1) as major, minor, release) -> sprintf "%d.%d.%d" major minor release
+  | _ -> assert false
 
 and generate_structs_pod () =
   generate_header PODStyle GPLv2plus;

generator/main.ml

@@ -24,7 +24,6 @@ open Printf
 open Pr
 open Actions
 open Structs
-open Api_versions
 open Types
 
 open C
@@ -80,9 +79,6 @@ Run it from the top source directory using the command
      perror "lock: BUGS" exn;
      exit 1);
 
-  (* Read the API versions file. *)
-  load_api_versions "src/api-support/added";
-
   output_to "src/guestfs_protocol.x" generate_xdr;
   output_to "src/guestfs.h" generate_guestfs_h;
   output_to "src/guestfs-internal-actions.h" generate_internal_actions_h;

src/Makefile.am

@@ -59,10 +59,7 @@ EXTRA_DIST = \
 	MAX_PROC_NR \
 	libguestfs.3 \
 	libguestfs.pc.in \
-	guestfs.pod \
-	api-support/added \
-	api-support/README \
-	api-support/update-from-tarballs.sh
+	guestfs.pod
 
 include_HEADERS = guestfs.h