sergiotarxz/nuttx-apps
sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

examples/nxflat: update Makefile etc to fix build break

Browse Source 
Signed-off-by: liuhaitao <liuhaitao@xiaomi.com>
This commit is contained in:
liuhaitao 2020-06-04 17:15:04 +08:00 committed by Xiang Xiao
parent 3f6343d3e7
commit 2c924f657f
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
examples/nxflat/Makefile
View File

@ -47,6 +47,10 @@ PRIORITY = SCHED_PRIORITY_DEFAULT
STACKSIZE = $(CONFIG_DEFAULT_TASK_STACKSIZE) STACKSIZE = $(CONFIG_DEFAULT_TASK_STACKSIZE)
MODULE = $(CONFIG_EXAMPLES_NXFLAT) MODULE = $(CONFIG_EXAMPLES_NXFLAT)
ROOTDEPPATH := --dep-path tests
VPATH += :tests
tests/romfs.c: build tests/romfs.c: build
tests/dirlist.c: build tests/dirlist.c: build
tests/symtab.c: build tests/symtab.c: build

8
examples/nxflat/tests/Makefile
View File

@ -33,6 +33,8 @@
# #
############################################################################ ############################################################################
include $(TOPDIR)/Make.defs
# Most of these do no build yet # Most of these do no build yet
#SUBDIRS = errno hello hello++ longjmp mutex pthread signal task struct #SUBDIRS = errno hello hello++ longjmp mutex pthread signal task struct
SUBDIRS = errno hello struct SUBDIRS = errno hello struct
@ -50,7 +52,7 @@ TESTS_DIR = $(NXFLAT_DIR)/tests
ROMFS_DIR = $(TESTS_DIR)/romfs ROMFS_DIR = $(TESTS_DIR)/romfs
ROMFS_IMG = $(TESTS_DIR)/romfs.img ROMFS_IMG = $(TESTS_DIR)/romfs.img
ROMFS_SRC = $(TESTS_DIR)/romfs.c ROMFS_SRC = $(TESTS_DIR)/romfs.c
DIRLIST_SRC = $(TESTS_DIR)/dirlist.h DIRLIST_SRC = $(TESTS_DIR)/dirlist.c
SYMTAB_SRC = $(TESTS_DIR)/symtab.c SYMTAB_SRC = $(TESTS_DIR)/symtab.c
define DIR_template define DIR_template
@ -79,7 +81,7 @@ $(ROMFS_IMG): install
$(ROMFS_SRC): $(ROMFS_IMG) $(ROMFS_SRC): $(ROMFS_IMG)
$(Q) (cd $(TESTS_DIR); xxd -i romfs.img | sed -e "s/^unsigned/const unsigned/g" >$@) $(Q) (cd $(TESTS_DIR); xxd -i romfs.img | sed -e "s/^unsigned/const unsigned/g" >$@)
# Create the dirlist.h header file from the romfs directory # Create the dirlist.c file from the romfs directory
$(DIRLIST_SRC): install $(DIRLIST_SRC): install
$(Q) $(TESTS_DIR)/mkdirlist.sh $(ROMFS_DIR) >$@.tmp $(Q) $(TESTS_DIR)/mkdirlist.sh $(ROMFS_DIR) >$@.tmp
@ -88,7 +90,7 @@ $(DIRLIST_SRC): install
# Create the exported symbol table list from the derived *-thunk.S files # Create the exported symbol table list from the derived *-thunk.S files
$(SYMTAB_SRC): install $(SYMTAB_SRC): install
$(Q) $(APPDIR)$(DELIM)tools$(DELIM)mksymtab.sh $(ROMFS_DIR) g_nxflat >$@.tmp $(Q) $(APPDIR)/tools/mksymtab.sh $(ROMFS_DIR) g_nxflat >$@.tmp
$(Q) $(call TESTANDREPLACEFILE, $@.tmp, $@) $(Q) $(call TESTANDREPLACEFILE, $@.tmp, $@)
# Clean each subdirectory # Clean each subdirectory

2
examples/nxflat/tests/mkdirlist.sh
View File

@ -19,7 +19,7 @@ fi
echo "#include <stddef.h>" echo "#include <stddef.h>"
echo "" echo ""
echo "static const char *dirlist[] =" echo "const char *dirlist[] ="
echo "{" echo "{"
for file in `ls $dir`; do for file in `ls $dir`; do