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

diff --git a/Makefile.am b/Makefile.am
index 3b01d1f1311a64713f39db78581d811040d7e696..a0c9469a702e98fa189a99b46b46ae99a2cb8d94 100644 (file)
--- 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 e02369db580429ddebab3712b2232f615b39d672..354e14e0d3c6f094e837075d141644b0dbd6f4f8 100644 (file)
--- 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 cb2b27432aca54e62d4d80b21b1219245d7e99e8..de4d094fa5e9fd6e9edef8f8c73f24efd7311c0e 100644 (file)
--- 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 63bb71a0f572588e3c8485ccb452db478d5aa1ff..ac3119b475308967d8ee608695f20f37d8c68a53 100755 (executable)
--- 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 264b800b61712a1693ecf57934a1312564ee27a9..ef760e2e12f8dd09f6186f365552d54368f4a08f 100644 (file)
--- 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;