summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 47b952e)
raw | patch | inline | side by side (parent: 47b952e)
author | Sam Nelson <sam.nelson@ti.com> | |
Tue, 22 Nov 2016 22:01:22 +0000 (17:01 -0500) | ||
committer | Sam Nelson <sam.nelson@ti.com> | |
Tue, 22 Nov 2016 22:01:22 +0000 (17:01 -0500) |
Added new target to install rov files. These files are used for test
automation.
Signed-off-by: Sam Nelson <sam.nelson@ti.com>
automation.
Signed-off-by: Sam Nelson <sam.nelson@ti.com>
diff --git a/src/examples/makefile b/src/examples/makefile
index f3f07bf2cb6ff1587d72872579f93297cc2e8d6b..37f939a02b538b3addc050dac8e15a1273073741 100755 (executable)
--- a/src/examples/makefile
+++ b/src/examples/makefile
# Only elf supported now
EXLDR = elf
-ARCHIVES = $(wildcard $(PLATFORM)_$(EXHOSTOS)_$(EXLDR)/ex??_*)
-EXAMPLES = $(filter %/, $(wildcard *_$(EXHOSTOS)_$(EXLDR)/ex??_*/))
+ARCHIVES = $(filter %.zip, $(wildcard $(PLATFORM)_$(EXHOSTOS)_$(EXLDR)/ex??_*))
+EXAMPLES = $(filter %/, $(wildcard $(PLATFORM)_$(EXHOSTOS)_$(EXLDR)/ex??_*/))
all:
@echo "#"
endif
endif
+install_rov::
+ @echo "#"
+ @echo "# Installing ROV of examples into $(EXEC_DIR)"
+ifeq ("$(EXAMPLES)","")
+ @echo "No examples found to install."
+else
+ ifeq ("$(MKSH)","SH")
+ @for d in $(EXAMPLES); do \
+ $(MAKE) -C $$d install_rov EXEC_DIR=$(EXEC_DIR); \
+ done
+ else
+ @for %%d in ($(EXAMPLES)) do \
+ $(MAKE) -C %%d install_rov EXEC_DIR=$(EXEC_DIR)
+ endif
+endif
+
+
# portable install commands
ifneq ($(wildcard $(XDC_INSTALL_DIR)/bin/echo.exe),)
INSTALL_M = $(XDC_INSTALL_DIR)/bin/cp.exe
diff --git a/src/examples/templates/ex01_hello/makefile b/src/examples/templates/ex01_hello/makefile
index 807b877194e76bb72b4c827e8cd2ceeead166c44..b092ca0ec9f169ad1b05c105cd32d6ee662a3bff 100644 (file)
@$(MKDIR) $(EXEC_DIR)/release
$(MAKE) -C $(subst _install,,$@) EXEC_DIR=$(EXEC_DIR) install
+install_rov: $(PROCLIST) $(addsuffix _install_rov,$(PROCLIST))
+$(addsuffix _install_rov,$(PROCLIST)):
+ @$(ECHO) "#"
+ @$(ECHO) "# Making $@ ..."
+ @$(MKDIR) $(EXEC_DIR)/debug
+ @$(MKDIR) $(EXEC_DIR)/release
+ $(MAKE) -C $(subst _install_rov,,$@) EXEC_DIR=$(EXEC_DIR) install_rov
+
clean:: $(addsuffix _clean,$(ALL))
$(RMDIR) install
diff --git a/src/examples/templates/ex01_hello/slave/makefile b/src/examples/templates/ex01_hello/slave/makefile
index 5a7082c1a93f73ed31dd14d9ee6143870d8d1fd1..78a6b75d9d0f0ba857a79bf7c77fb8f465de4eeb 100644 (file)
$(CP) ex01_hello_`lcCore`.gel $(EXEC_DIR)/release
% }
+install_rov:
+ @$(ECHO) "#"
+ @$(ECHO) "# Making $@ ..."
+ @$(MKDIR) $(EXEC_DIR)/debug
+ $(CP) bin/debug/configuro/package/cfg/`core`_p`suffix`.rov.xs $(EXEC_DIR)/debug
+ @$(MKDIR) $(EXEC_DIR)/release
+ $(CP) bin/release/configuro/package/cfg/`core`_p`suffix`.rov.xs $(EXEC_DIR)/release
+
help:
@$(ECHO) "make # build executable"
@$(ECHO) "make clean # clean everything"
diff --git a/src/examples/templates/ex02_messageq/host/makefile_bios b/src/examples/templates/ex02_messageq/host/makefile_bios
index 13fca7a9222c80dae09a0263e006ae58d823dc0e..c465359e4b43d4b02c0772b60a16cfbf78c377e5 100644 (file)
@$(MKDIR) $(EXEC_DIR)/release
$(CP) bin/release/app_host.x`suffix` $(EXEC_DIR)/release
+install_rov:
+ @$(ECHO) "#"
+ @$(ECHO) "# Making $@ ..."
+ @$(MKDIR) $(EXEC_DIR)/debug
+ $(CP) bin/debug/configuro/package/cfg/Host_p`suffix`.rov.xs $(EXEC_DIR)/debug
+ @$(MKDIR) $(EXEC_DIR)/release
+ $(CP) bin/release/configuro/package/cfg/Host_p`suffix`.rov.xs $(EXEC_DIR)/release
+
help:
@$(ECHO) "make # build executable"
@$(ECHO) "make clean # clean everything"
diff --git a/src/examples/templates/ex02_messageq/makefile b/src/examples/templates/ex02_messageq/makefile
index 6de3eedd04450fe7495445350d199714eaf79a82..297e61923401b8a3bd3bcdf9c8a7d62bd3b9ed39 100644 (file)
@$(ECHO) "make install EXEC_DIR=/.../testbench # install folder"
# setup install goal
-ifeq ($(filter install install_rov,$(MAKECMDGOALS)),$(MAKECMDGOALS))
+ifeq ($(filter $(MAKECMDGOALS),install install_rov),$(MAKECMDGOALS))
ifeq (,$(EXEC_DIR))
EXEC_DIR=$(CURDIR)/install
endif
$(addsuffix _install_rov,$(PROCLIST)):
@$(ECHO) "#"
@$(ECHO) "# Making $@ ..."
+ @$(ECHO) SAM: $(filter $(MAKECMDGOALS),install install_rov)
@$(MKDIR) $(EXEC_DIR)/debug
@$(MKDIR) $(EXEC_DIR)/release
$(MAKE) -C $(subst _install_rov,,$@) EXEC_DIR=$(EXEC_DIR) install_rov
diff --git a/src/examples/templates/ex02_messageq/slave/makefile b/src/examples/templates/ex02_messageq/slave/makefile
index 1df7c065ddc891ab7eeb74b227d75b2258ee1239..5d69c293749079021cc6dbf3f36ee99354576c61 100644 (file)
@$(MKDIR) $(EXEC_DIR)/release
$(CP) bin/release/server_`lcCore`.x`suffix` $(EXEC_DIR)/release
+install_rov:
+ @$(ECHO) "#"
+ @$(ECHO) "# Making $@ ..."
+ @$(MKDIR) $(EXEC_DIR)/debug
+ $(CP) bin/debug/configuro/package/cfg/`core`_p`suffix`.rov.xs $(EXEC_DIR)/debug
+ @$(MKDIR) $(EXEC_DIR)/release
+ $(CP) bin/release/configuro/package/cfg/`core`_p`suffix`.rov.xs $(EXEC_DIR)/release
+
help:
@$(ECHO) "make # build executable"
@$(ECHO) "make clean # clean everything"
diff --git a/src/examples/templates/ex11_ping/host/makefile b/src/examples/templates/ex11_ping/host/makefile
index 4d1a042adcf3377b6f4173032f144a3e59fdca63..201984abe7673f72d7fff2743c5d22454c9eda7b 100644 (file)
@$(MKDIR) $(EXEC_DIR)/release
$(CP) bin/release/server_`lcCore`.x`suffix` $(EXEC_DIR)/release
+install_rov:
+ @$(ECHO) "#"
+ @$(ECHO) "# Making $@ ..."
+ @$(MKDIR) $(EXEC_DIR)/debug
+ $(CP) bin/debug/configuro/package/cfg/`core`_p`suffix`.rov.xs $(EXEC_DIR)/debug
+ @$(MKDIR) $(EXEC_DIR)/release
+ $(CP) bin/release/configuro/package/cfg/`core`_p`suffix`.rov.xs $(EXEC_DIR)/release
+
help:
@$(ECHO) "make # build executable"
@$(ECHO) "make clean # clean everything"
index 404f5817836a7796f716d2507c954867751ddaf3..8a6142abfa1aefeaa3e8df44bc9c562b5a7a6bbc 100644 (file)
@$(MKDIR) $(EXEC_DIR)/release
$(MAKE) -C $(subst _install,,$@) EXEC_DIR=$(EXEC_DIR) install
+install_rov: $(PROCLIST) $(addsuffix _install_rov,$(PROCLIST))
+$(addsuffix _install_rov,$(PROCLIST)):
+ @$(ECHO) "#"
+ @$(ECHO) "# Making $@ ..."
+ @$(MKDIR) $(EXEC_DIR)/debug
+ @$(MKDIR) $(EXEC_DIR)/release
+ $(MAKE) -C $(subst _install_rov,,$@) EXEC_DIR=$(EXEC_DIR) install_rov
+
clean: $(addsuffix _clean,$(PROCLIST))
$(RMDIR) install
diff --git a/src/examples/templates/ex11_ping/slave/makefile b/src/examples/templates/ex11_ping/slave/makefile
index fef4a90868b415f318410b40bf0ec7c2dff970e3..7f3fd273010bb96aae77a7b4794b72394eed8c72 100644 (file)
$(CP) ex11_ping_`lcCore`.gel $(EXEC_DIR)/release
% }
+install_rov:
+ @$(ECHO) "#"
+ @$(ECHO) "# Making $@ ..."
+ @$(MKDIR) $(EXEC_DIR)/debug
+ $(CP) bin/debug/configuro/package/cfg/`core`_p`suffix`.rov.xs $(EXEC_DIR)/debug
+ @$(MKDIR) $(EXEC_DIR)/release
+ $(CP) bin/release/configuro/package/cfg/`core`_p`suffix`.rov.xs $(EXEC_DIR)/release
+
help:
@$(ECHO) "make # build executable"
@$(ECHO) "make clean # clean everything"
diff --git a/src/examples/templates/ex13_notifypeer/host/makefile_bios b/src/examples/templates/ex13_notifypeer/host/makefile_bios
index 3bd6810a120d42e15d5ae47030e2d4788f783d42..8e165aeed5e1758f964b8c56c9c2a97258ab5272 100644 (file)
@$(MKDIR) $(EXEC_DIR)/release
$(CP) bin/release/app_host.x`suffix` $(EXEC_DIR)/release
+install_rov:
+ @$(ECHO) "#"
+ @$(ECHO) "# Making $@ ..."
+ @$(MKDIR) $(EXEC_DIR)/debug
+ $(CP) bin/debug/configuro/package/cfg/Host_p`suffix`.rov.xs $(EXEC_DIR)/debug
+ @$(MKDIR) $(EXEC_DIR)/release
+ $(CP) bin/release/configuro/package/cfg/Host_p`suffix`.rov.xs $(EXEC_DIR)/release
+
help:
@$(ECHO) "make # build executable"
@$(ECHO) "make clean # clean everything"
diff --git a/src/examples/templates/ex13_notifypeer/slave/makefile b/src/examples/templates/ex13_notifypeer/slave/makefile
index 82975b124e8eb320f3ef4b5d2e7228a58cf79020..edc9a08fcc018a84e14193a0fb8b999599af7b99 100644 (file)
@$(MKDIR) $(EXEC_DIR)/release
$(CP) bin/release/server_`lcCore`.x`suffix` $(EXEC_DIR)/release
+install_rov:
+ @$(ECHO) "#"
+ @$(ECHO) "# Making $@ ..."
+ @$(MKDIR) $(EXEC_DIR)/debug
+ $(CP) bin/debug/configuro/package/cfg/`core`_p`suffix`.rov.xs $(EXEC_DIR)/debug
+ @$(MKDIR) $(EXEC_DIR)/release
+ $(CP) bin/release/configuro/package/cfg/`core`_p`suffix`.rov.xs $(EXEC_DIR)/release
+
help:
@$(ECHO) "make # build executable"
@$(ECHO) "make clean # clean everything"