tools/examples: Move examples to $(DOC_DIR)/examples

PATCH In review Fabio Fantoni 2 participants 3 messages Mar 2, 2012 – Mar 14, 2012

lore

Share & tools

lore

Fabio Fantoni

author

2012-03-02 10:08 UTC #0 lore raw

PATCH v2 1/1 tools/examples: Move examples to $(DOC_DIR)/examples

tools/examples: Move examples to $(DOC_DIR)/examples

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

tools/examples/Makefile +22 ~~-11~~

index 8cea724..185bef9 100644
@@ -9,18 +9,18 @@ XENDOMAINS_SYSCONFIG = init.d/sysconfig.xendomains
 # Xen configuration dir and configs to go there.
 XEN_READMES = README
 XEN_READMES += README.incompatibilities
+XEN_EXAMPLES += xmexample1
+XEN_EXAMPLES += xmexample2
+XEN_EXAMPLES += xmexample3
+XEN_EXAMPLES += xmexample.hvm
+XEN_EXAMPLES += xmexample.hvm-stubdom
+XEN_EXAMPLES += xmexample.pv-grub
+XEN_EXAMPLES += xmexample.nbd
+XEN_EXAMPLES += xmexample.vti
+XEN_EXAMPLES += xlexample.hvm
+XEN_EXAMPLES += xlexample.pvlinux
 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_CONFIGS += xend-pci-quirks.sxp
 XEN_CONFIGS += xend-pci-permissive.sxp
 XEN_CONFIGS += xl.conf

@@ -33,7 +33,7 @@ all:
 build:
 
 .PHONY: install
-install: all install-readmes install-configs $(HOTPLUGS)
+install: all install-readmes install-examples install-configs $(HOTPLUGS)
 
 .PHONY: install-readmes
 install-readmes:

@@ -44,6 +44,17 @@ install-readmes:
         $(INSTALL_DATA) $$i $(DESTDIR)$(XEN_CONFIG_DIR); \
     done
 
+.PHONY: install-examples
+install-examples:
+    [ -d $(DESTDIR)$(DOC_DIR) ] || \
+        $(INSTALL_DIR) $(DESTDIR)$(DOC_DIR)
+    [ -d $(DESTDIR)$(DOC_DIR)/examples ] || \
+        $(INSTALL_DIR) $(DESTDIR)$(DOC_DIR)/examples
+    set -e; for i in $(XEN_EXAMPLES); \
+        do [ -e $(DESTDIR)$(DOC_DIR)/examples/$$i ] || \
+        $(INSTALL_DATA) $$i $(DESTDIR)$(DOC_DIR)/examples; \
+    done
+
 .PHONY: install-configs
 install-configs: $(XEN_CONFIGS)
     [ -d $(DESTDIR)$(XEN_CONFIG_DIR) ] || \

tools/examples: Move examples to $(DOC_DIR)/examples

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

tools/examples/Makefile +22 ~~-11~~

index 8cea724..185bef9 100644
@@ -9,18 +9,18 @@ XENDOMAINS_SYSCONFIG = init.d/sysconfig.xendomains
 # Xen configuration dir and configs to go there.
 XEN_READMES = README
 XEN_READMES += README.incompatibilities
+XEN_EXAMPLES += xmexample1 
+XEN_EXAMPLES += xmexample2
+XEN_EXAMPLES += xmexample3
+XEN_EXAMPLES += xmexample.hvm
+XEN_EXAMPLES += xmexample.hvm-stubdom
+XEN_EXAMPLES += xmexample.pv-grub
+XEN_EXAMPLES += xmexample.nbd
+XEN_EXAMPLES += xmexample.vti
+XEN_EXAMPLES += xlexample.hvm
+XEN_EXAMPLES += xlexample.pvlinux
 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_CONFIGS += xend-pci-quirks.sxp
 XEN_CONFIGS += xend-pci-permissive.sxp
 XEN_CONFIGS += xl.conf

@@ -33,7 +33,7 @@ all:
 build:
 
 .PHONY: install
-install: all install-readmes install-configs $(HOTPLUGS)
+install: all install-readmes install-examples install-configs $(HOTPLUGS)
 
 .PHONY: install-readmes
 install-readmes:

@@ -44,6 +44,17 @@ install-readmes:
 	    $(INSTALL_DATA) $$i $(DESTDIR)$(XEN_CONFIG_DIR); \
 	done
 
+.PHONY: install-examples
+install-examples:
+	[ -d $(DESTDIR)$(DOC_DIR) ] || \
+		$(INSTALL_DIR) $(DESTDIR)$(DOC_DIR)
+	[ -d $(DESTDIR)$(DOC_DIR)/examples ] || \
+		$(INSTALL_DIR) $(DESTDIR)$(DOC_DIR)/examples
+	set -e; for i in $(XEN_EXAMPLES); \
+	    do [ -e $(DESTDIR)$(DOC_DIR)/examples/$$i ] || \
+	    $(INSTALL_DATA) $$i $(DESTDIR)$(DOC_DIR)/examples; \
+	done
+
 .PHONY: install-configs
 install-configs: $(XEN_CONFIGS)
 	[ -d $(DESTDIR)$(XEN_CONFIG_DIR) ] || \

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

Ian Jackson

2012-03-14 12:19 UTC #1 lore raw

Fabio Fantoni writes ("[Xen-devel] [PATCH v2] tools/examples: Move examples to $(DOC_DIR)/examples"):

Quoted 1 line

tools/examples: Move examples to $(DOC_DIR)/examples

If I do a "make -j4" this leaves the docs in dist/install/examples/ which is not right. I think you need to investigate why and how DOC_DIR is (supposed to be) set.

Thanks,
Ian.

Fabio Fantoni

author

2012-03-14 20:47 UTC #2 lore raw

Il 14/03/2012 13:19, Ian Jackson ha scritto:

Quoted 6 lines

Fabio Fantoni writes ("[Xen-devel] [PATCH v2] tools/examples: Move examples to $(DOC_DIR)/examples"):
Quoted 1 line
tools/examples: Move examples to $(DOC_DIR)/examples
If I do a "make -j4" this leaves the docs in dist/install/examples/ which is not right. I think you need to investigate why and how DOC_DIR is (supposed to be) set.

Quoted 10 lines

Thanks,
Ian.
-----
Nessun virus nel messaggio.
Controllato da AVG - www.avg.com
Versione: 2012.0.1913 / Database dei virus: 2114/4870 - Data di rilascio: 14/03/2012

This is wrong "DOC_DIR" sorry, see v3 already sent, right apparently but with problem.

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