From 13f59ad733477ec3c8758dde3c11e19b8204566c Mon Sep 17 00:00:00 2001 From: "Daniel P. Berrange" Date: Wed, 16 Sep 2009 19:02:59 +0100 Subject: [PATCH] Move example XML files into examples/xml * docs/storage/: Move to examples/xml/storage/ * docs/test*.xml: Move to examples/xml/test/ * docs/Makefile.am: Remove example XML files from dist * Makefile.am: Add examples/xml to EXTRA_DIST * tests/virshtest.c: Update for moved test XML * libvirt.spec.in: Include example XML files as docs * tests/int-overflow: UPdate for moved XML --- Makefile.am | 5 ++++- docs/Makefile.am | 9 +-------- {docs => examples/xml}/storage/pool-dir.xml | 0 {docs => examples/xml}/storage/pool-fs.xml | 0 {docs => examples/xml}/storage/pool-logical.xml | 0 {docs => examples/xml}/storage/pool-netfs.xml | 0 {docs => examples/xml}/storage/vol-cow.xml | 0 {docs => examples/xml}/storage/vol-qcow.xml | 0 {docs => examples/xml}/storage/vol-qcow2.xml | 0 {docs => examples/xml}/storage/vol-raw.xml | 0 {docs => examples/xml}/storage/vol-sparse.xml | 0 {docs => examples/xml}/storage/vol-vmdk.xml | 0 {docs => examples/xml/test}/testdomfc4.xml | 0 {docs => examples/xml/test}/testdomfv0.xml | 0 {docs => examples/xml/test}/testnetdef.xml | 0 {docs => examples/xml/test}/testnetpriv.xml | 0 {docs => examples/xml/test}/testnode.xml | 0 {docs => examples/xml/test}/testnodeinline.xml | 0 {docs => examples/xml/test}/testpool.xml | 0 {docs => examples/xml/test}/testvol.xml | 0 libvirt.spec.in | 1 + tests/int-overflow | 2 +- tests/virshtest.c | 2 +- 23 files changed, 8 insertions(+), 11 deletions(-) rename {docs => examples/xml}/storage/pool-dir.xml (100%) rename {docs => examples/xml}/storage/pool-fs.xml (100%) rename {docs => examples/xml}/storage/pool-logical.xml (100%) rename {docs => examples/xml}/storage/pool-netfs.xml (100%) rename {docs => examples/xml}/storage/vol-cow.xml (100%) rename {docs => examples/xml}/storage/vol-qcow.xml (100%) rename {docs => examples/xml}/storage/vol-qcow2.xml (100%) rename {docs => examples/xml}/storage/vol-raw.xml (100%) rename {docs => examples/xml}/storage/vol-sparse.xml (100%) rename {docs => examples/xml}/storage/vol-vmdk.xml (100%) rename {docs => examples/xml/test}/testdomfc4.xml (100%) rename {docs => examples/xml/test}/testdomfv0.xml (100%) rename {docs => examples/xml/test}/testnetdef.xml (100%) rename {docs => examples/xml/test}/testnetpriv.xml (100%) rename {docs => examples/xml/test}/testnode.xml (100%) rename {docs => examples/xml/test}/testnodeinline.xml (100%) rename {docs => examples/xml/test}/testpool.xml (100%) rename {docs => examples/xml/test}/testvol.xml (100%) diff --git a/Makefile.am b/Makefile.am index 3b01d1f131..a0c9469a70 100644 --- a/Makefile.am +++ b/Makefile.am @@ -9,6 +9,8 @@ SUBDIRS = gnulib/lib include src daemon tools proxy docs gnulib/tests \ ACLOCAL_AMFLAGS = -I m4 -I gnulib/m4 +XML_EXAMPLES = $(wildcard examples/xml/test/*.xml) $(wildcard examples/xml/storage/*.xml) + EXTRA_DIST = \ ChangeLog-old \ libvirt.spec libvirt.spec.in \ @@ -22,7 +24,8 @@ EXTRA_DIST = \ .x-sc_require_config_h \ .x-sc_prohibit_nonreentrant \ Makefile.nonreentrant \ - autogen.sh + autogen.sh \ + $(XML_EXAMPLES) pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libvirt.pc diff --git a/docs/Makefile.am b/docs/Makefile.am index e02369db58..354e14e0d3 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -41,14 +41,7 @@ patches = $(wildcard api_extension/*.patch) xml = \ libvirt-api.xml \ - libvirt-refs.xml \ - testdomfc4.xml \ - testdomfv0.xml \ - testnetdef.xml \ - testnetpriv.xml \ - testnode.xml \ - testpool.xml \ - testvol.xml + libvirt-refs.xml fig = \ libvirt-net-logical.fig \ diff --git a/docs/storage/pool-dir.xml b/examples/xml/storage/pool-dir.xml similarity index 100% rename from docs/storage/pool-dir.xml rename to examples/xml/storage/pool-dir.xml diff --git a/docs/storage/pool-fs.xml b/examples/xml/storage/pool-fs.xml similarity index 100% rename from docs/storage/pool-fs.xml rename to examples/xml/storage/pool-fs.xml diff --git a/docs/storage/pool-logical.xml b/examples/xml/storage/pool-logical.xml similarity index 100% rename from docs/storage/pool-logical.xml rename to examples/xml/storage/pool-logical.xml diff --git a/docs/storage/pool-netfs.xml b/examples/xml/storage/pool-netfs.xml similarity index 100% rename from docs/storage/pool-netfs.xml rename to examples/xml/storage/pool-netfs.xml diff --git a/docs/storage/vol-cow.xml b/examples/xml/storage/vol-cow.xml similarity index 100% rename from docs/storage/vol-cow.xml rename to examples/xml/storage/vol-cow.xml diff --git a/docs/storage/vol-qcow.xml b/examples/xml/storage/vol-qcow.xml similarity index 100% rename from docs/storage/vol-qcow.xml rename to examples/xml/storage/vol-qcow.xml diff --git a/docs/storage/vol-qcow2.xml b/examples/xml/storage/vol-qcow2.xml similarity index 100% rename from docs/storage/vol-qcow2.xml rename to examples/xml/storage/vol-qcow2.xml diff --git a/docs/storage/vol-raw.xml b/examples/xml/storage/vol-raw.xml similarity index 100% rename from docs/storage/vol-raw.xml rename to examples/xml/storage/vol-raw.xml diff --git a/docs/storage/vol-sparse.xml b/examples/xml/storage/vol-sparse.xml similarity index 100% rename from docs/storage/vol-sparse.xml rename to examples/xml/storage/vol-sparse.xml diff --git a/docs/storage/vol-vmdk.xml b/examples/xml/storage/vol-vmdk.xml similarity index 100% rename from docs/storage/vol-vmdk.xml rename to examples/xml/storage/vol-vmdk.xml diff --git a/docs/testdomfc4.xml b/examples/xml/test/testdomfc4.xml similarity index 100% rename from docs/testdomfc4.xml rename to examples/xml/test/testdomfc4.xml diff --git a/docs/testdomfv0.xml b/examples/xml/test/testdomfv0.xml similarity index 100% rename from docs/testdomfv0.xml rename to examples/xml/test/testdomfv0.xml diff --git a/docs/testnetdef.xml b/examples/xml/test/testnetdef.xml similarity index 100% rename from docs/testnetdef.xml rename to examples/xml/test/testnetdef.xml diff --git a/docs/testnetpriv.xml b/examples/xml/test/testnetpriv.xml similarity index 100% rename from docs/testnetpriv.xml rename to examples/xml/test/testnetpriv.xml diff --git a/docs/testnode.xml b/examples/xml/test/testnode.xml similarity index 100% rename from docs/testnode.xml rename to examples/xml/test/testnode.xml diff --git a/docs/testnodeinline.xml b/examples/xml/test/testnodeinline.xml similarity index 100% rename from docs/testnodeinline.xml rename to examples/xml/test/testnodeinline.xml diff --git a/docs/testpool.xml b/examples/xml/test/testpool.xml similarity index 100% rename from docs/testpool.xml rename to examples/xml/test/testpool.xml diff --git a/docs/testvol.xml b/examples/xml/test/testvol.xml similarity index 100% rename from docs/testvol.xml rename to examples/xml/test/testvol.xml diff --git a/libvirt.spec.in b/libvirt.spec.in index cb2b27432a..de4d094fa5 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -746,6 +746,7 @@ fi %doc examples/domain-events/events-c %doc examples/dominfo %doc examples/domsuspend +%doc examples/xml %if %{with_python} %files python diff --git a/tests/int-overflow b/tests/int-overflow index 63bb71a0f5..ac3119b475 100755 --- a/tests/int-overflow +++ b/tests/int-overflow @@ -15,7 +15,7 @@ cd "$t_" || fail=1 echo "error: failed to get domain '4294967298'" > exp || fail=1 echo domname 4294967298 | $abs_top_builddir/tools/virsh --quiet \ - --connect test://$abs_top_srcdir/docs/testnode.xml \ + --connect test://$abs_top_srcdir/examples/xml/test/testnode.xml \ > /dev/null 2> err || fail=1 diff -u err exp || fail=1 diff --git a/tests/virshtest.c b/tests/virshtest.c index 264b800b61..ef760e2e12 100644 --- a/tests/virshtest.c +++ b/tests/virshtest.c @@ -234,7 +234,7 @@ mymain(int argc, char **argv) exit (77); /* means 'test skipped' for automake */ #endif - snprintf(buffer, PATH_MAX-1, "test://%s/../docs/testnode.xml", abs_srcdir); + snprintf(buffer, PATH_MAX-1, "test://%s/../examples/xml/test/testnode.xml", abs_srcdir); buffer[PATH_MAX-1] = '\0'; progname = argv[0]; custom_uri = buffer;