diff options
-rw-r--r-- | apps/ChangeLog.txt | 3 | ||||
-rw-r--r-- | apps/Makefile | 11 | ||||
-rw-r--r-- | apps/examples/elf/tests/errno/Makefile | 3 | ||||
-rw-r--r-- | apps/examples/elf/tests/hello/Makefile | 3 | ||||
-rw-r--r-- | apps/examples/elf/tests/helloxx/Makefile | 9 | ||||
-rw-r--r-- | apps/examples/elf/tests/longjmp/Makefile | 3 | ||||
-rw-r--r-- | apps/examples/elf/tests/mutex/Makefile | 3 | ||||
-rw-r--r-- | apps/examples/elf/tests/pthread/Makefile | 3 | ||||
-rw-r--r-- | apps/examples/elf/tests/signal/Makefile | 3 | ||||
-rw-r--r-- | apps/examples/elf/tests/struct/Makefile | 3 | ||||
-rw-r--r-- | apps/examples/elf/tests/task/Makefile | 3 | ||||
-rw-r--r-- | misc/tools/README.txt | 10 | ||||
-rw-r--r-- | nuttx/ChangeLog | 4 | ||||
-rw-r--r-- | nuttx/tools/Config.mk | 13 | ||||
-rw-r--r-- | nuttx/tools/Makefile.host | 6 |
15 files changed, 55 insertions, 25 deletions
diff --git a/apps/ChangeLog.txt b/apps/ChangeLog.txt index 1a88900be..c1c5189c4 100644 --- a/apps/ChangeLog.txt +++ b/apps/ChangeLog.txt @@ -419,3 +419,6 @@ by Freddie Chopin. * Makefile, */Makefile: Various fixes for Windows native build. Now uses make foreach loops instead of shell loops. + * apps/examples/elf/test/*/Makefile: OSX doesn't support install -D, use + mkdir -p then install without the -D. From Mike Smith. + diff --git a/apps/Makefile b/apps/Makefile index c172135ec..7e7d52a40 100644 --- a/apps/Makefile +++ b/apps/Makefile @@ -102,15 +102,9 @@ endif # Create the list of available applications (INSTALLED_APPS) -ifeq ($(CONFIG_WINDOWS_NATIVE),y) -define ADD_BUILTIN - INSTALLED_APPS += $(if $(wildcard $1\Makefile),$1,) -endef -else define ADD_BUILTIN - INSTALLED_APPS += $(if $(wildcard $1/Makefile),$1,) + INSTALLED_APPS += $(if $(wildcard $1$(DELIM)Makefile),$1,) endef -endif $(foreach BUILTIN, $(CONFIGURED_APPS), $(eval $(call ADD_BUILTIN,$(BUILTIN)))) @@ -119,7 +113,8 @@ $(foreach BUILTIN, $(CONFIGURED_APPS), $(eval $(call ADD_BUILTIN,$(BUILTIN)))) # provided by the user (possibly as a symbolic link) to add libraries and # applications to the standard build from the repository. -EXTERNAL_DIR := $(dir $(wildcard external/Makefile)) +EXTERNAL_DIR := $(dir $(wildcard external$(DELIM)Makefile)) + INSTALLED_APPS += $(EXTERNAL_DIR) SUBDIRS += $(EXTERNAL_DIR) diff --git a/apps/examples/elf/tests/errno/Makefile b/apps/examples/elf/tests/errno/Makefile index 92cff9e12..09d469f9b 100644 --- a/apps/examples/elf/tests/errno/Makefile +++ b/apps/examples/elf/tests/errno/Makefile @@ -55,5 +55,6 @@ clean: @rm -f $(BIN) *.o *~ .*.swp core install: - @install -D $(BIN) $(ROMFS_DIR)/$(BIN) + @mkdir -p $(ROMFS_DIR) + @install $(BIN) $(ROMFS_DIR)/$(BIN) diff --git a/apps/examples/elf/tests/hello/Makefile b/apps/examples/elf/tests/hello/Makefile index e1c396c3c..88770276b 100644 --- a/apps/examples/elf/tests/hello/Makefile +++ b/apps/examples/elf/tests/hello/Makefile @@ -55,4 +55,5 @@ clean: @rm -f $(BIN) *.o *~ .*.swp core install: - @install -D $(BIN) $(ROMFS_DIR)/$(BIN) + @mkdir -p $(ROMFS_DIR) + @install $(BIN) $(ROMFS_DIR)/$(BIN) diff --git a/apps/examples/elf/tests/helloxx/Makefile b/apps/examples/elf/tests/helloxx/Makefile index d115fbeaf..45b4b8868 100644 --- a/apps/examples/elf/tests/helloxx/Makefile +++ b/apps/examples/elf/tests/helloxx/Makefile @@ -109,12 +109,13 @@ clean: @rm -f $(ALL_BIN) *.o *~ .*.swp core install: $(ALL_BIN) - @install -D $(BIN1) $(ROMFS_DIR)/$(BIN1) - @install -D $(BIN2) $(ROMFS_DIR)/$(BIN2) + @mkdir -p $(ROMFS_DIR) + @install $(BIN1) $(ROMFS_DIR)/$(BIN1) + @install $(BIN2) $(ROMFS_DIR)/$(BIN2) ifeq ($(CONFIG_BINFMT_CONSTRUCTORS),y) - @install -D $(BIN3) $(ROMFS_DIR)/$(BIN3) + @install $(BIN3) $(ROMFS_DIR)/$(BIN3) endif -# @install -D $(BIN4) $(ROMFS_DIR)/$(BIN4) +# @install $(BIN4) $(ROMFS_DIR)/$(BIN4) diff --git a/apps/examples/elf/tests/longjmp/Makefile b/apps/examples/elf/tests/longjmp/Makefile index 0cafe05e3..04da6ee81 100644 --- a/apps/examples/elf/tests/longjmp/Makefile +++ b/apps/examples/elf/tests/longjmp/Makefile @@ -55,4 +55,5 @@ clean: @rm -f $(BIN) *.o *~ .*.swp core install: - @install -D $(BIN) $(ROMFS_DIR)/$(BIN) + @mkdir -p $(ROMFS_DIR) + @install $(BIN) $(ROMFS_DIR)/$(BIN) diff --git a/apps/examples/elf/tests/mutex/Makefile b/apps/examples/elf/tests/mutex/Makefile index efce216d8..756ada2c0 100644 --- a/apps/examples/elf/tests/mutex/Makefile +++ b/apps/examples/elf/tests/mutex/Makefile @@ -55,4 +55,5 @@ clean: @rm -f $(BIN) *.o *~ .*.swp core install: - @install -D $(BIN) $(ROMFS_DIR)/$(BIN) + @mkdir -p $(ROMFS_DIR) + @install $(BIN) $(ROMFS_DIR)/$(BIN) diff --git a/apps/examples/elf/tests/pthread/Makefile b/apps/examples/elf/tests/pthread/Makefile index 134fabe01..4bea4515b 100644 --- a/apps/examples/elf/tests/pthread/Makefile +++ b/apps/examples/elf/tests/pthread/Makefile @@ -55,4 +55,5 @@ clean: @rm -f $(BIN) *.o *~ .*.swp core install: - @install -D $(BIN) $(ROMFS_DIR)/$(BIN) + @mkdir -p $(ROMFS_DIR) + @install $(BIN) $(ROMFS_DIR)/$(BIN) diff --git a/apps/examples/elf/tests/signal/Makefile b/apps/examples/elf/tests/signal/Makefile index 08710aeaa..9eaaf8609 100644 --- a/apps/examples/elf/tests/signal/Makefile +++ b/apps/examples/elf/tests/signal/Makefile @@ -55,4 +55,5 @@ clean: @rm -f $(BIN) *.o *~ .*.swp core install: - @install -D $(BIN) $(ROMFS_DIR)/$(BIN) + @mkdir -p $(ROMFS_DIR) + @install $(BIN) $(ROMFS_DIR)/$(BIN) diff --git a/apps/examples/elf/tests/struct/Makefile b/apps/examples/elf/tests/struct/Makefile index 3aa0e4a57..2ddd80b89 100644 --- a/apps/examples/elf/tests/struct/Makefile +++ b/apps/examples/elf/tests/struct/Makefile @@ -56,4 +56,5 @@ clean: @rm -f $(BIN) *.o *~ .*.swp core install: - @install -D $(BIN) $(ROMFS_DIR)/$(BIN) + @mkdir -p $(ROMFS_DIR) + @install $(BIN) $(ROMFS_DIR)/$(BIN) diff --git a/apps/examples/elf/tests/task/Makefile b/apps/examples/elf/tests/task/Makefile index 63a2eb211..accac987f 100644 --- a/apps/examples/elf/tests/task/Makefile +++ b/apps/examples/elf/tests/task/Makefile @@ -55,4 +55,5 @@ clean: @rm -f $(BIN) *.o *~ .*.swp core install: - @install -D $(BIN) $(ROMFS_DIR)/$(BIN) + @mkdir -p $(ROMFS_DIR) + @install $(BIN) $(ROMFS_DIR)/$(BIN) diff --git a/misc/tools/README.txt b/misc/tools/README.txt index fff94cd3f..47c966921 100644 --- a/misc/tools/README.txt +++ b/misc/tools/README.txt @@ -50,11 +50,17 @@ kconfig-frontends-3.3.0-1-libintl.patch http://ymorin.is-a-geek.org/download/kconfig-frontends/ -kconfig-macos.path ------------------- +kconfig-macos.patch +------------------- This is a patch to make the kconfig-frontends-3.3.0 build on Mac OS X. + To build the conf and mconf frontends, use the following commands: + + ./configure --disable-shared --enable-static --disable-gconf --disable-qconf --disable-nconf --disable-utils + make + make install + kconfig-frontends for Windows ============================= diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog index 9c62db68f..72fab8a71 100644 --- a/nuttx/ChangeLog +++ b/nuttx/ChangeLog @@ -3632,5 +3632,7 @@ by Konstantin Dimitrov. * Fixed an uninitialized variable in the file system that can cause assertions if DEBUG on (contributed by Lorenz Meier). - + * Config.mk: Defined DELIM to be either / or \, depending upon + CONFIG_WINDOWS_NATIVE. This will allow me to eliminate a lot of + conditional logic elsewhere. diff --git a/nuttx/tools/Config.mk b/nuttx/tools/Config.mk index f05933f1a..4cdda113c 100644 --- a/nuttx/tools/Config.mk +++ b/nuttx/tools/Config.mk @@ -43,6 +43,19 @@ CONFIG_ARCH := $(patsubst "%",%,$(strip $(CONFIG_ARCH))) CONFIG_ARCH_CHIP := $(patsubst "%",%,$(strip $(CONFIG_ARCH_CHIP))) CONFIG_ARCH_BOARD := $(patsubst "%",%,$(strip $(CONFIG_ARCH_BOARD))) +# DELIM - Path segment delimiter character +# +# Depends on this settings defined in board-specific defconfig file installed +# at $(TOPDIR)/.config: +# +# CONFIG_WINDOWS_NATIVE - Defined for a Windows native build + +ifeq ($(CONFIG_WINDOWS_NATIVE),y) + DELIM = $(strip \) +else + DELIM = $(strip /) +endif + # INCDIR - Convert a list of directory paths to a list of compiler include # directirves # Example: CFFLAGS += ${shell $(INCDIR) [options] "compiler" "dir1" "dir2" "dir2" ...} diff --git a/nuttx/tools/Makefile.host b/nuttx/tools/Makefile.host index 478625008..16975a42a 100644 --- a/nuttx/tools/Makefile.host +++ b/nuttx/tools/Makefile.host @@ -123,5 +123,7 @@ endif clean: $(Q) rm -f *.o *.a *~ .*.swp - $(Q) rm -f mkconfig mksyscall mkversion bdf-converter - $(Q) rm -f mkconfig.exe mksyscall.exe mkversion.exe bdf-converter.exe + $(Q) rm -f mkdeps mkconfig mksyscall mkversion bdf-converter + $(Q) rm -f mkdeps.exe mkconfig.exe mksyscall.exe mkversion.exe bdf-converter.exe + $(Q) rm -rf *.dSYM + |