You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by gn...@apache.org on 2020/03/23 18:23:33 UTC
[incubator-nuttx] branch master updated (1848e83 -> e1385b1)
This is an automated email from the ASF dual-hosted git repository.
gnutt pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git.
from 1848e83 Added S32K1XX FlexTimer register definitions
new aaa3215 tools/Config.mk: implement a simple version of TESTANDREPLACEFILE for Windows
new e1385b1 tools/Config.mk: CATFILE clear the existing file
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
tools/Config.mk | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
[incubator-nuttx] 02/02: tools/Config.mk: CATFILE clear the
existing file
Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gnutt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit e1385b1074ae538403d0ec68e86e2aba176cea43
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Mon Mar 23 17:08:14 2020 +0800
tools/Config.mk: CATFILE clear the existing file
To simplify the caller usage
---
tools/Config.mk | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/tools/Config.mk b/tools/Config.mk
index 32ba80d..04cd151 100644
--- a/tools/Config.mk
+++ b/tools/Config.mk
@@ -296,17 +296,17 @@ define COPYFILE
endef
endif
-# CATFILE - Cat and append a list of files
+# CATFILE - Cat a list of files
#
# USAGE: $(call CATFILE,dest,src1,src2,src3,...)
ifeq ($(CONFIG_WINDOWS_NATIVE),y)
define CATFILE
- $(Q) type $(2) >> $1
+ $(Q) type $(2) > $1
endef
else
define CATFILE
- $(Q) cat $(2) >> $1
+ $(Q) cat $(2) > $1
endef
endif
[incubator-nuttx] 01/02: tools/Config.mk: implement a simple
version of TESTANDREPLACEFILE for Windows
Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gnutt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit aaa32156dfb4e377547b39004403886fd9afd2c8
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Mon Mar 23 17:34:01 2020 +0800
tools/Config.mk: implement a simple version of TESTANDREPLACEFILE for Windows
---
tools/Config.mk | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/tools/Config.mk b/tools/Config.mk
index 1b3f826..32ba80d 100644
--- a/tools/Config.mk
+++ b/tools/Config.mk
@@ -346,7 +346,11 @@ endif
# args: $1 - newfile: Temporary file to test
# $2 - oldfile: File to replace
-ifneq ($(CONFIG_WINDOWS_NATIVE),y)
+ifeq ($(CONFIG_WINDOWS_NATIVE),y)
+define TESTANDREPLACEFILE
+ $(Q) move /Y $1 $2
+endef
+else
define TESTANDREPLACEFILE
if [ -f $2 ]; then \
if cmp $1 $2; then \