On 29.10.2012 15:43, Zeeshan Ali (Khattak) wrote:
> From: "Zeeshan Ali (Khattak)" <zeeshanak@xxxxxxxxx>
>
> Mark 'name' and 'vendor' in oses and hypervisor, and 'name' in devices
> for translation.
>
> This implies that now we generate the actual XML files to automatically
> get translations inserted into them.
>
> Co-author: Eric Blake <eblake@xxxxxxxxxx>
> ---
> .gitignore | 25 ++++
> cfg.mk | 6 +-
> data/devices/Makefile.am | 14 +-
> data/devices/{qemu-pci.xml => qemu-pci.xml.in} | 26 ++--
> data/devices/{qemu-ps2.xml => qemu-ps2.xml.in} | 4 +-
> data/devices/{qemu-usb.xml => qemu-usb.xml.in} | 2 +-
> data/devices/{virtio-pci.xml => virtio-pci.xml.in} | 10 +-
> data/devices/{xen.xml => xen.xml.in} | 0
> data/hypervisors/Makefile.am | 8 +-
> data/hypervisors/{rhel-xen.xml => rhel-xen.xml.in} | 32 ++---
> data/hypervisors/{xen.xml => xen.xml.in} | 76 +++++-----
> data/oses/Makefile.am | 46 +++---
> data/oses/{centos.xml => centos.xml.in} | 8 +-
> data/oses/{debian.xml => debian.xml.in} | 48 +++----
> data/oses/{dos.xml => dos.xml.in} | 4 +-
> data/oses/{fedora.xml => fedora.xml.in} | 72 +++++-----
> data/oses/{freebsd.xml => freebsd.xml.in} | 160 ++++++++++-----------
> data/oses/{gnome.xml => gnome.xml.in} | 4 +-
> data/oses/{macos.xml => macos.xml.in} | 32 ++---
> data/oses/{mandrake.xml => mandrake.xml.in} | 68 ++++-----
> data/oses/{mandriva.xml => mandriva.xml.in} | 52 +++----
> data/oses/{netbsd.xml => netbsd.xml.in} | 56 ++++----
> data/oses/{netware.xml => netware.xml.in} | 12 +-
> data/oses/{openbsd.xml => openbsd.xml.in} | 28 ++--
> data/oses/{opensuse.xml => opensuse.xml.in} | 32 ++---
> data/oses/{rhel.xml => rhel.xml.in} | 160 ++++++++++-----------
> data/oses/{rhl.xml => rhl.xml.in} | 80 +++++------
> data/oses/{solaris.xml => solaris.xml.in} | 12 +-
> data/oses/{suse.xml => suse.xml.in} | 24 ++--
> data/oses/{ubuntu.xml => ubuntu.xml.in} | 68 ++++-----
> data/oses/{windows.xml => windows.xml.in} | 80 +++++------
> data/schemas/libosinfo.rng | 48 +++++--
> po/POTFILES.in | 25 ++++
> 33 files changed, 711 insertions(+), 611 deletions(-)
> rename data/devices/{qemu-pci.xml => qemu-pci.xml.in} (87%)
> rename data/devices/{qemu-ps2.xml => qemu-ps2.xml.in} (86%)
> rename data/devices/{qemu-usb.xml => qemu-usb.xml.in} (90%)
> rename data/devices/{virtio-pci.xml => virtio-pci.xml.in} (88%)
> rename data/devices/{xen.xml => xen.xml.in} (100%)
> rename data/hypervisors/{rhel-xen.xml => rhel-xen.xml.in} (84%)
> rename data/hypervisors/{xen.xml => xen.xml.in} (84%)
> rename data/oses/{centos.xml => centos.xml.in} (88%)
> rename data/oses/{debian.xml => debian.xml.in} (86%)
> rename data/oses/{dos.xml => dos.xml.in} (73%)
> rename data/oses/{fedora.xml => fedora.xml.in} (97%)
> rename data/oses/{freebsd.xml => freebsd.xml.in} (81%)
> rename data/oses/{gnome.xml => gnome.xml.in} (92%)
> rename data/oses/{macos.xml => macos.xml.in} (79%)
> rename data/oses/{mandrake.xml => mandrake.xml.in} (81%)
> rename data/oses/{mandriva.xml => mandriva.xml.in} (80%)
> rename data/oses/{netbsd.xml => netbsd.xml.in} (82%)
> rename data/oses/{netware.xml => netware.xml.in} (73%)
> rename data/oses/{openbsd.xml => openbsd.xml.in} (92%)
> rename data/oses/{opensuse.xml => opensuse.xml.in} (93%)
> rename data/oses/{rhel.xml => rhel.xml.in} (83%)
> rename data/oses/{rhl.xml => rhl.xml.in} (82%)
> rename data/oses/{solaris.xml => solaris.xml.in} (80%)
> rename data/oses/{suse.xml => suse.xml.in} (78%)
> rename data/oses/{ubuntu.xml => ubuntu.xml.in} (96%)
> rename data/oses/{windows.xml => windows.xml.in} (92%)
>
Should I check all of these renames or can I trust you that you didn't
infiltrate anything bad? ;)
> diff --git a/.gitignore b/.gitignore
> index 4383a35..b3ad378 100644
> --- a/.gitignore
> +++ b/.gitignore
> @@ -59,7 +59,32 @@ test/test-treeuris
> build/
> gtk-doc.make
> data/95-osinfo.rules
> +data/devices/qemu-pci.xml
> +data/devices/qemu-ps2.xml
> +data/devices/qemu-usb.xml
> +data/devices/virtio-pci.xml
> +data/devices/xen.xml
> +data/hypervisors/rhel-xen.xml
> +data/hypervisors/xen.xml
> data/pci.ids
> +data/oses/centos.xml
> +data/oses/debian.xml
> +data/oses/dos.xml
> +data/oses/fedora.xml
> +data/oses/freebsd.xml
> +data/oses/gnome.xml
> +data/oses/mandrake.xml
> +data/oses/mandriva.xml
> +data/oses/netbsd.xml
> +data/oses/netware.xml
> +data/oses/openbsd.xml
> +data/oses/opensuse.xml
> +data/oses/rhel.xml
> +data/oses/rhl.xml
> +data/oses/solaris.xml
> +data/oses/suse.xml
> +data/oses/ubuntu.xml
> +data/oses/windows.xml
> data/usb.ids
> tools/osinfo-detect
> tools/osinfo-detect.1
Okay, since these doesn't expand rapidly we can enumerate them. Or just
ignore every *.xml in there:
diff --git a/.gitignore b/.gitignore
index 4383a35..ccf1d61 100644
--- a/.gitignore
+++ b/.gitignore
@@ -59,7 +59,10 @@ test/test-treeuris
build/
gtk-doc.make
data/95-osinfo.rules
+data/devices/*.xml
+data/hypervisors/*.xml
data/pci.ids
+data/oses/*.xml
data/usb.ids
tools/osinfo-detect
tools/osinfo-detect.1
I've taken a quick look at renamed files and it looks ok. So ACK.
Michal
