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

tools/Makefile.unix and .win: Back out part of 1c91aec6ae77b49608741e5aa30b8b6876017934 (tools/ and fs/procfs: Simplify .version file generation). That change breaks the build if not in a git clone. noted by Nathan Hartman.

Browse Source
This commit is contained in:
Gregory Nutt 2019-12-13 12:34:17 -06:00
parent 3840889b11
commit 3e4450e237
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tools/Makefile.unix
View File

@ -36,9 +36,15 @@
TOPDIR := ${shell echo $(CURDIR) | sed -e 's/ /\\ /g'} TOPDIR := ${shell echo $(CURDIR) | sed -e 's/ /\\ /g'}
-include $(TOPDIR)/.config -include $(TOPDIR)/.config
-include $(TOPDIR)/.version
include $(TOPDIR)/tools/Config.mk include $(TOPDIR)/tools/Config.mk
-include $(TOPDIR)/Make.defs -include $(TOPDIR)/Make.defs
# In case .version file does not exist
CONFIG_VERSION_STRING ?= "0.0"
CONFIG_VERSION_BUILD ?= "0"
# Control build verbosity # Control build verbosity
# #
# V=1,2: Enable echo of commands # V=1,2: Enable echo of commands
@ -263,7 +269,7 @@ tools/mkversion$(HOSTEXEEXT):
$(TOPDIR)/.version: $(TOPDIR)/.version:
$(Q) echo "Create .version" $(Q) echo "Create .version"
$(Q) tools/version.sh .version $(Q) tools/version.sh -v $(CONFIG_VERSION_STRING) -b $(CONFIG_VERSION_BUILD) .version
$(Q) chmod 755 .version $(Q) chmod 755 .version
include/nuttx/version.h: $(TOPDIR)/.version tools/mkversion$(HOSTEXEEXT) include/nuttx/version.h: $(TOPDIR)/.version tools/mkversion$(HOSTEXEEXT)

8
tools/Makefile.win
View File

@ -37,9 +37,17 @@ export SHELL=cmd
TOPDIR := ${shell echo %CD%} TOPDIR := ${shell echo %CD%}
-include $(TOPDIR)\.config -include $(TOPDIR)\.config
-include $(TOPDIR)/.version
-include $(TOPDIR)\tools\Config.mk -include $(TOPDIR)\tools\Config.mk
-include $(TOPDIR)\Make.defs -include $(TOPDIR)\Make.defs
# In case .version file does not exist
CONFIG_VERSION_STRING ?= "Unversioned"
CONFIG_VERSION_MAJOR ?= 0
CONFIG_VERSION_MINOR ?= 0
CONFIG_VERSION_BUILD ?= "0"
# Control build verbosity # Control build verbosity
# #
# V=1,2: Enable echo of commands # V=1,2: Enable echo of commands