search for: gplv2plus

...ral Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#include <config.h> - -#include "p2v.h" - -/* The license of virt-p2v, for the About dialog. */ - -const char *gplv2plus = - "This program is free software; you can redistribute it and/or modify\n" - "it under the terms of the GNU General Public License as published by\n" - "the Free Software Foundation; either version 2 of the License, or\n" - "(at your option) any later versio...

...- a/p2v/gui.c +++ b/p2v/gui.c @@ -134,6 +134,7 @@ static GtkWidget *run_dlg, /* Colour tags used in the v2v_output GtkTextBuffer. */ static GtkTextTag *v2v_output_tags[16]; +#if !GTK_CHECK_VERSION(3,0,0) /* gtk < 3 */ /* The license of virt-p2v, for the About dialog. */ static const char gplv2plus[] = "This program is free software; you can redistribute it and/or modify\n" @@ -149,6 +150,7 @@ static const char gplv2plus[] = "You should have received a copy of the GNU General Public License\n" "along with this program; if not, write to the Free Software\n&quo...

...++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/generator/daemon.ml b/generator/daemon.ml index fd01e5d8a..1d7461f8c 100644 --- a/generator/daemon.ml +++ b/generator/daemon.ml @@ -976,6 +976,10 @@ let generate_daemon_optgroups_c () = generate_header CStyle GPLv2plus; pr "#include <config.h>\n"; + pr "#include <stdio.h>\n"; + pr "#include <stdlib.h>\n"; + pr "\n"; + pr "#include <caml/mlvalues.h>\n"; pr "\n"; pr "#include \"daemon.h\"\n"; pr...

...ll +let c_quoted_indented ~indent str = + let str = c_quote str in + let str = replace_str str "\\n" ("\\n\"\n" ^ indent ^ "\"") in + str + (* Generate a lot of different functions for guestfish. *) let generate_fish_cmds () = generate_header CStyle GPLv2plus; @@ -138,7 +143,7 @@ let generate_fish_cmds () = pr "struct command_entry %s_cmd_entry = {\n" name; pr " .name = \"%s\",\n" name2; - pr " .help = \"%s\",\n" (c_quote text); + pr " .help = \"%s\",\n" (...

...title=None) ?(shortdesc=None) ?(longdesc=None) f = - let file = sprintf "guestfs-gobject-%s" filename in - let source = sprintf "gobject/%s.c" file in + let source = sprintf "gobject/src/%s.c" filename in output_to source (fun () -> generate_header CStyle GPLv2plus; pr "#include \"guestfs-gobject.h\"\n\n"; pr "/**\n"; - pr " * SECTION:%s\n" file; + pr " * SECTION:%s\n" filename; (match title with | Some title -> @@ -188,19 +187,20 @@ let output_source filename ?(title=None) ?...

This patch replaces patches 14 and 15 from my previous series. The gtk-doc output is now reasonable, and we can rely on an automatically generated guestfs-sections.txt. Matt

...44 --- a/generator/daemon.ml +++ b/generator/daemon.ml @@ -840,3 +840,104 @@ let generate_daemon_optgroups_h () = ) optgroups; pr "#endif /* GUESTFSD_OPTGROUPS_H */\n" + +(* Generate structs-cleanups.c file. *) +and generate_daemon_structs_cleanups_c () = + generate_header CStyle GPLv2plus; + + pr "\ +#include <config.h> + +#include <stdio.h> +#include <stdlib.h> + +#include \"daemon.h\" +#include \"guestfs_protocol.h\" + +"; + + pr "/* Cleanup functions used by CLEANUP_* macros. Do not call\n"; + pr " * these functio...

...yp) -> pr "%s array" typ | RHashtable _ -> pr "(string * string) list" ) + +(* Structure definitions (again). These are used in the daemon, + * but it's convenient to generate them here. + *) +and generate_ocaml_daemon_structs () = + generate_header OCamlStyle GPLv2plus; + + generate_ocaml_structure_decls () diff --git a/generator/OCaml.mli b/generator/OCaml.mli index 4e79a5b5a..a36fbe02f 100644 --- a/generator/OCaml.mli +++ b/generator/OCaml.mli @@ -20,3 +20,4 @@ val generate_ocaml_c : unit -> unit val generate_ocaml_c_errnos : unit -> unit val generate_...

...iter export aliases - ) all_functions_sorted; + ) external_functions_sorted; pr "\n"; @@ -178,7 +178,7 @@ loop(Port) -> ) aliases; pr "\n" - ) all_functions_sorted + ) external_functions_sorted and generate_erlang_c () = generate_header CStyle GPLv2plus; @@ -279,7 +279,7 @@ extern void free_strings (char **r); (* generate the function for typ *) emit_copy_list_function typ | typ, _ -> () (* empty *) - ) (rstructs_used_by all_functions); + ) (rstructs_used_by external_functions); (* The wrapper functions. *) List...

By splitting up large C files we can make parallel compiles a bit faster. Rich.

...ml index 2ae462864..ac410b733 100644 --- a/generator/daemon.ml +++ b/generator/daemon.ml @@ -471,6 +471,193 @@ let generate_daemon_stubs actions () = pr "}\n\n"; ) (actions |> daemon_functions |> sort) +let generate_daemon_caml_types_ml () = + generate_header OCamlStyle GPLv2plus + +let generate_daemon_caml_callbacks_ml () = + generate_header OCamlStyle GPLv2plus; + + if actions |> impl_ocaml_functions <> [] then ( + pr "let init_callbacks () =\n"; + pr " (* Initialize callbacks to OCaml code. *)\n"; + List.iter ( + fun ({ name...

...h.ml index 646674d..980f55f 100644 --- a/generator/fish.ml +++ b/generator/fish.ml @@ -1106,3 +1106,36 @@ event_bitmask_of_event_set (const char *arg, uint64_t *eventset_r) return 0; } " + +and generate_fish_test_prep_sh () = + pr "#!/bin/bash -\n"; + generate_header HashStyle GPLv2plus; + + let all_disks = sprintf "prep{1..%d}.img" (List.length prepopts) in + + pr "\ +set -e + +rm -f %s + +$VG guestfish \\ +" all_disks; + + let vg_count = ref 0 in + + iteri ( + fun i (name, _, _, _) -> + let params = [name] in + let params = + if fin...

...s_c_api.ml index 6be753f..8c4e5ef 100644 --- a/generator/tests_c_api.ml +++ b/generator/tests_c_api.ml @@ -28,6 +28,8 @@ open Optgroups open Actions open Structs +module StringSet = Set.Make (String) + (* Generate the C API tests. *) let rec generate_c_api_tests () = generate_header CStyle GPLv2plus; @@ -41,6 +43,7 @@ let rec generate_c_api_tests () = #include <string.h> #include <sys/types.h> #include <sys/stat.h> +#include <stdbool.h> #include \"guestfs.h\" #include \"guestfs-internal-frontend.h\" @@ -53,6 +56,74 @@ let rec generate_c_api_te...

...as major, minor, release) -> sprintf "%d.%d.%d" major minor release - | _ -> assert false + (match version_added f with + | Some version -> pr "(Added in %s)\n\n\n" version + | None -> assert false + ) and generate_structs_pod () = generate_header PODStyle GPLv2plus; diff --git a/generator/docstrings.ml b/generator/docstrings.ml index 8ca54d1..caf836c 100644 --- a/generator/docstrings.ml +++ b/generator/docstrings.ml @@ -51,6 +51,12 @@ fact that they are deprecated indicates that there are problems with correct use of these functions." prefix alt in...

This patch series is just FYI at the moment. However it does pass the tests. The daemon is a self-contained program. We don't need to write it all in C. Writing parts of it in OCaml would make it simpler and less error-prone. In particular if the daemon was written in a more sane programming language then we could move the inspection code to run entirely inside the appliance, which would

This reverts commit 3f6ca541c7b24d4c86688a509582cb41a7e0078c. The original commit was reverted prematurely. --- generator/generator_actions.ml | 10 +++++----- generator/generator_checks.ml | 5 +++++ generator/generator_types.ml | 3 +++ 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/generator/generator_actions.ml b/generator/generator_actions.ml index

Use interfaces files (*.mli files) instead of exporting all symbols randomly. Change the 'file is generated' warnings at the top of generated files so they accurately describe which source file generates each output file. Rich.

...diff --git a/generator/bindtests.ml b/generator/bindtests.ml index 58d7897b3..8a5682d5e 100644 --- a/generator/bindtests.ml +++ b/generator/bindtests.ml @@ -983,6 +983,9 @@ and generate_php_bindtests () = dump "bindtests" +and generate_rust_bindtests () = + generate_header CStyle GPLv2plus + (* Language-independent bindings tests - we do it this way to * ensure there is parity in testing bindings across all languages. *) diff --git a/generator/bindtests.mli b/generator/bindtests.mli index 6f469b3a1..0e18a4c44 100644 --- a/generator/bindtests.mli +++ b/generator/bindtests.mli @@...

...General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ /** @@ -152,8 +151,7 @@ static const char gplv2plus[] = "GNU General Public License for more details.\n" "\n" "You should have received a copy of the GNU General Public License\n" - "along with this program; if not, write to the Free Software\n" - "Foundation, Inc., 51 Franklin Street, Fifth Fl...

...tring.concat " \\\n " headers); - pr "guestfs_gobject_sources=\\\n %s\n" (String.concat " \\\n " sources) + pr "guestfs_gobject_sources= \\\n %s\n" (String.concat " \\\n " sources) let generate_gobject_header () = generate_header CStyle GPLv2plus; diff --git a/gobject/Makefile.am b/gobject/Makefile.am index e28a8b1..1aa2e0f 100644 --- a/gobject/Makefile.am +++ b/gobject/Makefile.am @@ -17,15 +17,19 @@ SUBDIRS = . docs +include $(top_srcdir)/subdir-rules.mk + include $(srcdir)/Makefile.inc -BUILT_SOURCES = \ - $(guestfs_gobject_head...