tools/examples: Move readmes and examples to subdirectory docs

PATCH In review Fabio Fantoni 2 participants 5 messages Feb 28, 2012 – Mar 2, 2012

lore

Share & tools

lore

Fabio Fantoni

author

2012-02-28 14:03 UTC #0 lore raw

PATCH 1/1 tools/examples: Move readmes and examples to subdirectory docs

tools/examples: Move readmes and examples to subdirectory docs

Signed-off-by Fabio Fantoni <[email protected]>

tools/examples/Makefile +20 ~~-18~~

index 8cea724..be71872 100644
@@ -7,20 +7,20 @@ XENDOMAINS_INITD = init.d/xendomains
 XENDOMAINS_SYSCONFIG = init.d/sysconfig.xendomains
 
 # Xen configuration dir and configs to go there.
-XEN_READMES = README
-XEN_READMES += README.incompatibilities
+XEN_DOCS = README
+XEN_DOCS += README.incompatibilities
 XEN_CONFIGS = xend-config.sxp
 XEN_CONFIGS += xm-config.xml
-XEN_CONFIGS += xmexample1
-XEN_CONFIGS += xmexample2
-XEN_CONFIGS += xmexample3
-XEN_CONFIGS += xmexample.hvm
-XEN_CONFIGS += xmexample.hvm-stubdom
-XEN_CONFIGS += xmexample.pv-grub
-XEN_CONFIGS += xmexample.nbd
-XEN_CONFIGS += xmexample.vti
-XEN_CONFIGS += xlexample.hvm
-XEN_CONFIGS += xlexample.pvlinux
+XEN_DOCS += xmexample1
+XEN_DOCS += xmexample2
+XEN_DOCS += xmexample3
+XEN_DOCS += xmexample.hvm
+XEN_DOCS += xmexample.hvm-stubdom
+XEN_DOCS += xmexample.pv-grub
+XEN_DOCS += xmexample.nbd
+XEN_DOCS += xmexample.vti
+XEN_DOCS += xlexample.hvm
+XEN_DOCS += xlexample.pvlinux
 XEN_CONFIGS += xend-pci-quirks.sxp
 XEN_CONFIGS += xend-pci-permissive.sxp
 XEN_CONFIGS += xl.conf

@@ -33,15 +33,17 @@ all:
 build:
 
 .PHONY: install
-install: all install-readmes install-configs $(HOTPLUGS)
+install: all install-docs install-configs $(HOTPLUGS)
 
-.PHONY: install-readmes
-install-readmes:
+.PHONY: install-docs
+install-docs:
     [ -d $(DESTDIR)$(XEN_CONFIG_DIR) ] || \
         $(INSTALL_DIR) $(DESTDIR)$(XEN_CONFIG_DIR)
-    set -e; for i in $(XEN_READMES); \
-        do [ -e $(DESTDIR)$(XEN_CONFIG_DIR)/$$i ] || \
-        $(INSTALL_DATA) $$i $(DESTDIR)$(XEN_CONFIG_DIR); \
+    [ -d $(DESTDIR)$(XEN_CONFIG_DIR)/docs ] || \
+        $(INSTALL_DIR) $(DESTDIR)$(XEN_CONFIG_DIR)/docs
+    set -e; for i in $(XEN_DOCS); \
+        do [ -e $(DESTDIR)$(XEN_CONFIG_DIR)/docs/$$i ] || \
+        $(INSTALL_DATA) $$i $(DESTDIR)$(XEN_CONFIG_DIR)/docs/; \
     done
 
 .PHONY: install-configs

tools/examples: Move readmes and examples to subdirectory docs

Signed-off-by Fabio Fantoni <[email protected]>

tools/examples/Makefile +20 ~~-18~~

index 8cea724..be71872 100644
@@ -7,20 +7,20 @@ XENDOMAINS_INITD = init.d/xendomains
 XENDOMAINS_SYSCONFIG = init.d/sysconfig.xendomains
 
 # Xen configuration dir and configs to go there.
-XEN_READMES = README
-XEN_READMES += README.incompatibilities
+XEN_DOCS = README
+XEN_DOCS += README.incompatibilities
 XEN_CONFIGS = xend-config.sxp
 XEN_CONFIGS += xm-config.xml
-XEN_CONFIGS += xmexample1 
-XEN_CONFIGS += xmexample2
-XEN_CONFIGS += xmexample3
-XEN_CONFIGS += xmexample.hvm
-XEN_CONFIGS += xmexample.hvm-stubdom
-XEN_CONFIGS += xmexample.pv-grub
-XEN_CONFIGS += xmexample.nbd
-XEN_CONFIGS += xmexample.vti
-XEN_CONFIGS += xlexample.hvm
-XEN_CONFIGS += xlexample.pvlinux
+XEN_DOCS += xmexample1 
+XEN_DOCS += xmexample2
+XEN_DOCS += xmexample3
+XEN_DOCS += xmexample.hvm
+XEN_DOCS += xmexample.hvm-stubdom
+XEN_DOCS += xmexample.pv-grub
+XEN_DOCS += xmexample.nbd
+XEN_DOCS += xmexample.vti
+XEN_DOCS += xlexample.hvm
+XEN_DOCS += xlexample.pvlinux
 XEN_CONFIGS += xend-pci-quirks.sxp
 XEN_CONFIGS += xend-pci-permissive.sxp
 XEN_CONFIGS += xl.conf

@@ -33,15 +33,17 @@ all:
 build:
 
 .PHONY: install
-install: all install-readmes install-configs $(HOTPLUGS)
+install: all install-docs install-configs $(HOTPLUGS)
 
-.PHONY: install-readmes
-install-readmes:
+.PHONY: install-docs
+install-docs:
 	[ -d $(DESTDIR)$(XEN_CONFIG_DIR) ] || \
 		$(INSTALL_DIR) $(DESTDIR)$(XEN_CONFIG_DIR)
-	set -e; for i in $(XEN_READMES); \
-	    do [ -e $(DESTDIR)$(XEN_CONFIG_DIR)/$$i ] || \
-	    $(INSTALL_DATA) $$i $(DESTDIR)$(XEN_CONFIG_DIR); \
+	[ -d $(DESTDIR)$(XEN_CONFIG_DIR)/docs ] || \
+		$(INSTALL_DIR) $(DESTDIR)$(XEN_CONFIG_DIR)/docs
+	set -e; for i in $(XEN_DOCS); \
+	    do [ -e $(DESTDIR)$(XEN_CONFIG_DIR)/docs/$$i ] || \
+	    $(INSTALL_DATA) $$i $(DESTDIR)$(XEN_CONFIG_DIR)/docs/; \
 	done
 
 .PHONY: install-configs

_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xen.org/xen-devel

Ian Jackson

2012-03-01 17:53 UTC #1 lore raw

Fabio Fantoni writes ("[Xen-devel] [PATCH] tools/examples: Move readmes and examples to subdirectory docs"):

Quoted 1 line

tools/examples: Move readmes and examples to subdirectory docs

This patch has been mangled and I cannot apply it to see the results. Can you please investigate your email client ? If all else fails, you can send a copy of the patch as an attachment as well as inline.

Thanks,
Ian.

Fantu

author

2012-03-01 17:57 UTC #2 lore raw

Ian Jackson-2 wrote

Quoted 9 lines

Fabio Fantoni writes ("[Xen-devel] [PATCH] tools/examples: Move readmes and examples to subdirectory docs"):
Quoted 1 line
tools/examples: Move readmes and examples to subdirectory docs
This patch has been mangled and I cannot apply it to see the results. Can you please investigate your email client ? If all else fails, you can send a copy of the patch as an attachment as well as inline.

Quoted 8 lines

Thanks,
Ian.
_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xen.org/xen-devel

There is already also attachment

--
View this message in context: http://xen.1045712.n5.nabble.com/PATCH-tools-examples-Move-readmes-and-examples-to-subdirectory-docs-tp5521913p5528662.html
Sent from the Xen - Dev mailing list archive at Nabble.com.

Ian Jackson

2012-03-01 18:50 UTC #3 lore raw

Fantu writes ("Re: [Xen-devel] [PATCH] tools/examples: Move readmes and examples to subdirectory docs"):

Quoted 1 line

There is already also attachment

So there is, sorry for not spotting it.

I took a look at the results, and they include /etc/xen/docs. I don't think that's right. They should be in dist/install/usr/share/doc/xen somewhere. usr/share/doc/xen/examples perhaps.

Ian.

Fantu

author

2012-03-02 09:32 UTC #4 lore raw

I thought it best to remain there because of the DomU config files are put there.
Now I redo the patch with move it on /usr/share/doc/xen/examples

--
View this message in context: http://xen.1045712.n5.nabble.com/PATCH-tools-examples-Move-readmes-and-examples-to-subdirectory-docs-tp5521913p5530472.html
Sent from the Xen - Dev mailing list archive at Nabble.com.