From c8419d45c8ca6d0592a5a47399988908fd550d3f Mon Sep 17 00:00:00 2001 From: Richard Jones Date: Fri, 7 Aug 2009 17:38:44 +0100 Subject: [PATCH] Tidy up generation of java/Makefile.inc. (Just whitespace and comment changes, and small restructuring of the code). --- java/Makefile.inc | 33 ++++++++++++++++++++++++++++++++- src/generator.ml | 17 +++++++++++------ 2 files changed, 43 insertions(+), 7 deletions(-) diff --git a/java/Makefile.inc b/java/Makefile.inc index e9d30f1..03b6049 100644 --- a/java/Makefile.inc +++ b/java/Makefile.inc @@ -1 +1,32 @@ -java_built_sources = com/redhat/et/libguestfs/IntBool.java com/redhat/et/libguestfs/PV.java com/redhat/et/libguestfs/VG.java com/redhat/et/libguestfs/LV.java com/redhat/et/libguestfs/Stat.java com/redhat/et/libguestfs/StatVFS.java com/redhat/et/libguestfs/Dirent.java com/redhat/et/libguestfs/Version.java com/redhat/et/libguestfs/XAttr.java com/redhat/et/libguestfs/INotifyEvent.java com/redhat/et/libguestfs/GuestFS.java +# libguestfs generated file +# WARNING: THIS FILE IS GENERATED BY 'src/generator.ml'. +# ANY CHANGES YOU MAKE TO THIS FILE WILL BE LOST. +# +# Copyright (C) 2009 Red Hat Inc. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU 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. + +java_built_sources = \ + com/redhat/et/libguestfs/IntBool.java \ + com/redhat/et/libguestfs/PV.java \ + com/redhat/et/libguestfs/VG.java \ + com/redhat/et/libguestfs/LV.java \ + com/redhat/et/libguestfs/Stat.java \ + com/redhat/et/libguestfs/StatVFS.java \ + com/redhat/et/libguestfs/Dirent.java \ + com/redhat/et/libguestfs/Version.java \ + com/redhat/et/libguestfs/XAttr.java \ + com/redhat/et/libguestfs/INotifyEvent.java \ + com/redhat/et/libguestfs/GuestFS.java diff --git a/src/generator.ml b/src/generator.ml index fdf8f09..8d16945 100755 --- a/src/generator.ml +++ b/src/generator.ml @@ -8504,6 +8504,16 @@ and generate_java_struct_list_return typ jtyp cols = pr " guestfs_free_%s_list (r);\n" typ; pr " return jr;\n" +and generate_java_makefile_inc () = + generate_header HashStyle GPLv2; + + pr "java_built_sources = \\\n"; + List.iter ( + fun (typ, jtyp) -> + pr "\tcom/redhat/et/libguestfs/%s.java \\\n" jtyp; + ) java_structs; + pr "\tcom/redhat/et/libguestfs/GuestFS.java\n" + and generate_haskell_hs () = generate_header HaskellStyle LGPLv2; @@ -9261,12 +9271,7 @@ Run it from the top source directory using the command ) java_structs; let close = output_to "java/Makefile.inc" in - pr "java_built_sources ="; - List.iter ( - fun (typ, jtyp) -> - pr " com/redhat/et/libguestfs/%s.java" jtyp; - ) java_structs; - pr " com/redhat/et/libguestfs/GuestFS.java\n"; + generate_java_makefile_inc (); close (); let close = output_to "java/com_redhat_et_libguestfs_GuestFS.c" in -- 1.8.3.1