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

PATCH In review Fabio Fantoni 1 participant 2 messages Mar 12, 2012

Share & tools

Fabio Fantoni

author

2012-03-12 12:25 UTC #0 lore raw

PATCH 1/1 tools/examples: Move examples to $(DOCDIR)/examples

# HG changeset patch
# User Fabio Fantoni
# Date 1331130972 -3600
# Node ID 196b5000ca3e1827076b5f4fff48a1f29123e310 # Parent 2993a6131f0c7f91dddd28989f06d5a055b17076 tools/examples: Move examples to $(DOCDIR)/examples

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

tools/examples/Makefile mer mar 07 15:36:12 2012 +0100 renamed from tools/examples/Makefile mer mar 07 15:25:31 2012 +0100 +22 ~~-11~~

diff -r 2993a6131f0c -r 196b5000ca3e tools/examples/Makefile
@@ -9,18 +9,18 @@
 # 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 @@
 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_DATA) $$i $(DESTDIR)$(XEN_CONFIG_DIR); \
     done
 
+.PHONY: install-examples
+install-examples:
+    [ -d $(DESTDIR)$(DOCDIR) ] || \
+        $(INSTALL_DIR) $(DESTDIR)$(DOCDIR)
+    [ -d $(DESTDIR)$(DOCDIR)/examples ] || \
+        $(INSTALL_DIR) $(DESTDIR)$(DOCDIR)/examples
+    set -e; for i in $(XEN_EXAMPLES); \
+        do [ -e $(DESTDIR)$(DOCDIR)/examples/$$i ] || \
+        $(INSTALL_DATA) $$i $(DESTDIR)$(DOCDIR)/examples; \
+    done
+
 .PHONY: install-configs
 install-configs: $(XEN_CONFIGS)
     [ -d $(DESTDIR)$(XEN_CONFIG_DIR) ] || \

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

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

diff -r 2993a6131f0c -r 196b5000ca3e tools/examples/Makefile
@@ -9,18 +9,18 @@
 # 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 @@
 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_DATA) $$i $(DESTDIR)$(XEN_CONFIG_DIR); \
 	done
 
+.PHONY: install-examples
+install-examples:
+	[ -d $(DESTDIR)$(DOCDIR) ] || \
+		$(INSTALL_DIR) $(DESTDIR)$(DOCDIR)
+	[ -d $(DESTDIR)$(DOCDIR)/examples ] || \
+		$(INSTALL_DIR) $(DESTDIR)$(DOCDIR)/examples
+	set -e; for i in $(XEN_EXAMPLES); \
+	    do [ -e $(DESTDIR)$(DOCDIR)/examples/$$i ] || \
+	    $(INSTALL_DATA) $$i $(DESTDIR)$(DOCDIR)/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

Fantu

author

2012-03-12 12:36 UTC #1 lore raw

Fantu wrote

Quoted 71 lines

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

diff -r 2993a6131f0c -r 196b5000ca3e tools/examples/Makefile

tools/examples/Makefile mer mar 07 15:36:12 2012 +0100 renamed from tools/examples/Makefile mer mar 07 15:25:31 2012 +0100 +22 ~~-11~~

@@ -9,18 +9,18 @@
  # 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 @@
  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_DATA) $$i $(DESTDIR)$(XEN_CONFIG_DIR); \
      done
 
+.PHONY: install-examples
+install-examples:
+    [ -d $(DESTDIR)$(DOCDIR) ] || \
+        $(INSTALL_DIR) $(DESTDIR)$(DOCDIR)
+    [ -d $(DESTDIR)$(DOCDIR)/examples ] || \
+        $(INSTALL_DIR) $(DESTDIR)$(DOCDIR)/examples
+    set -e; for i in $(XEN_EXAMPLES); \
+        do [ -e $(DESTDIR)$(DOCDIR)/examples/$$i ] || \
+        $(INSTALL_DATA) $$i $(DESTDIR)$(DOCDIR)/examples; \
+    done
+
  .PHONY: install-configs
  install-configs: $(XEN_CONFIGS)
      [ -d $(DESTDIR)$(XEN_CONFIG_DIR) ] || \

Quoted 5 lines

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

Should be right but /usr/share/doc/xen/examples was not present, probably deleted afterwards by "docs" script?

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