All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH v2] tools/examples: Move examples to $(DOC_DIR)/examples
@ 2012-03-02 10:08 Fabio Fantoni
  2012-03-14 12:19 ` Ian Jackson
  0 siblings, 1 reply; 3+ messages in thread
From: Fabio Fantoni @ 2012-03-02 10:08 UTC (permalink / raw)
  To: xen-devel


[-- Attachment #1.1.1: Type: text/plain, Size: 2150 bytes --]

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

Signed-off-by: Fabio Fantoni <fabio.fantoni@heliman.it>

diff --git a/tools/examples/Makefile b/tools/examples/Makefile
index 8cea724..185bef9 100644
--- a/tools/examples/Makefile
+++ b/tools/examples/Makefile
@@ -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) ] || \

[-- Attachment #1.1.2: move_examples_to_DOCDIR.patch --]
[-- Type: text/plain, Size: 2034 bytes --]

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

Signed-off-by: Fabio Fantoni <fabio.fantoni@heliman.it>

diff --git a/tools/examples/Makefile b/tools/examples/Makefile
index 8cea724..185bef9 100644
--- a/tools/examples/Makefile
+++ b/tools/examples/Makefile
@@ -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) ] || \

[-- Attachment #1.2: Firma crittografica S/MIME --]
[-- Type: application/pkcs7-signature, Size: 4803 bytes --]

[-- Attachment #2: Type: text/plain, Size: 126 bytes --]

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel

^ permalink raw reply related	[flat|nested] 3+ messages in thread
* Re: [PATCH v2] tools/examples: Move examples to $(DOC_DIR)/examples
  2012-03-02 10:08 [PATCH v2] tools/examples: Move examples to $(DOC_DIR)/examples Fabio Fantoni
@ 2012-03-14 12:19 ` Ian Jackson
  2012-03-14 20:47   ` Fabio Fantoni
  0 siblings, 1 reply; 3+ messages in thread
From: Ian Jackson @ 2012-03-14 12:19 UTC (permalink / raw)
  To: fantonifabio; +Cc: xen-devel

Fabio Fantoni writes ("[Xen-devel] [PATCH v2] tools/examples: Move examples to $(DOC_DIR)/examples"):
> 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.

^ permalink raw reply	[flat|nested] 3+ messages in thread
* Re: [PATCH v2] tools/examples: Move examples to $(DOC_DIR)/examples
  2012-03-14 12:19 ` Ian Jackson
@ 2012-03-14 20:47   ` Fabio Fantoni
  0 siblings, 0 replies; 3+ messages in thread
From: Fabio Fantoni @ 2012-03-14 20:47 UTC (permalink / raw)
  To: Ian Jackson; +Cc: xen-devel


[-- Attachment #1.1: Type: text/plain, Size: 674 bytes --]

Il 14/03/2012 13:19, Ian Jackson ha scritto:
> Fabio Fantoni writes ("[Xen-devel] [PATCH v2] tools/examples: Move examples to $(DOC_DIR)/examples"):
>> 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.
>
>
> -----
> 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.


[-- Attachment #1.2: Firma crittografica S/MIME --]
[-- Type: application/pkcs7-signature, Size: 4803 bytes --]

[-- Attachment #2: Type: text/plain, Size: 126 bytes --]

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel

^ permalink raw reply	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-03-14 20:47 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-03-02 10:08 [PATCH v2] tools/examples: Move examples to $(DOC_DIR)/examples Fabio Fantoni
2012-03-14 12:19 ` Ian Jackson
2012-03-14 20:47   ` Fabio Fantoni

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.