Move a copy of define.bat and sh from nuttx/tools to apps/tools so that they will be availalbe for the import build.
This commit is contained in:
Gregory Nutt
parent
2f982e9c77
commit
0bdb179160
49
Make.defs
49
Make.defs
@ -43,46 +43,23 @@ DEPCONFIG = $(TOPDIR)$(DELIM).config
|
||||
ifeq ($(CONFIG_WINDOWS_NATIVE),y)
|
||||
define REGISTER
|
||||
$(Q) echo Register: $1
|
||||
$(Q) echo { "$1", $2, $3, $4 }, > "$(BUILTIN_REGISTRY)$(DELIM)$4.bdat"
|
||||
$(Q) echo int $4(int argc, char *argv[]); > "$(BUILTIN_REGISTRY)$(DELIM)$4.pdat"
|
||||
$(Q) echo { "$1", $2, $3, $4 }, > "$(BUILTIN_REGISTRY)$(DELIM)$1.bdat"
|
||||
$(Q) if [ ! -z $4 ]; then \
|
||||
echo "int $4(int argc, char *argv[]);" > "$(BUILTIN_REGISTRY)$(DELIM)$1.pdat"; \
|
||||
fi;
|
||||
$(Q) touch $(BUILTIN_REGISTRY)$(DELIM).updated"
|
||||
endef
|
||||
else
|
||||
define REGISTER
|
||||
$(Q) echo "Register: $1"
|
||||
$(Q) echo "{ \"$1\", $2, $3, $4 }," > "$(BUILTIN_REGISTRY)$(DELIM)$4.bdat"
|
||||
$(Q) echo "int $4(int argc, char *argv[]);" > "$(BUILTIN_REGISTRY)$(DELIM)$4.pdat"
|
||||
$(Q) echo "Register: $1 $4"
|
||||
$(Q) echo "{ \"$1\", $2, $3, $4 }," > "$(BUILTIN_REGISTRY)$(DELIM)$1.bdat"
|
||||
$(Q) if [ ! -z $4 ]; then \
|
||||
echo "int $4(int argc, char *argv[]);" > "$(BUILTIN_REGISTRY)$(DELIM)$1.pdat"; \
|
||||
fi;
|
||||
$(Q) touch "$(BUILTIN_REGISTRY)$(DELIM).updated"
|
||||
endef
|
||||
endif
|
||||
|
||||
# COMPILE - a macro to compile a loadable app in C
|
||||
|
||||
ifeq ($(LOADABLE),y)
|
||||
define COMPILE
|
||||
@echo "CC) $1"
|
||||
$(Q) $(CC) -c $(CELFFLAGS) -DLOADABLE_APP $1 -o $2
|
||||
endef
|
||||
endif
|
||||
|
||||
# COMPILEXX - a macro to compile a loadable app in C++
|
||||
|
||||
ifeq ($(LOADABLE),y)
|
||||
define COMPILEXX
|
||||
@echo "CXX: $1"
|
||||
$(Q) $(CXX) -c $(CXXELFFLAGS) -DLOADABLE_APP $1 -o $2
|
||||
endef
|
||||
endif
|
||||
|
||||
# ELFLD - a macro to link loadable app
|
||||
# Example: $(call ELFLD, entry point, in-file(s), out-file)
|
||||
|
||||
define ELFLD
|
||||
@echo "LD: $3"
|
||||
$(Q) $(LD) $(LDELFFLAGS) $2 -o $3
|
||||
$(Q) chmod +x $3
|
||||
endef
|
||||
|
||||
# Tools
|
||||
#
|
||||
# In a normal build, tools will reside in the nuttx/tools sub-directory and
|
||||
@ -129,6 +106,14 @@ else
|
||||
endif
|
||||
endif
|
||||
|
||||
ifeq ($(DEFINE),)
|
||||
ifeq ($(CONFIG_WINDOWS_NATIVE),y)
|
||||
DEFINE = $(APPDIR)$(DELIM)tools$(DELIM)define.bat
|
||||
else
|
||||
DEFINE = $(APPDIR)$(DELIM)tools$(DELIM)define.sh
|
||||
endif
|
||||
endif
|
||||
|
||||
ifeq ($(WINTOOL),y)
|
||||
INCDIROPT = -w
|
||||
endif
|
||||
|
||||
178
tools/define.bat
Normal file
178
tools/define.bat
Normal file
@ -0,0 +1,178 @@
|
||||
@echo off
|
||||
|
||||
rem apps/tools/define.bat
|
||||
rem
|
||||
rem Copyright (C) 2018 Gregory Nutt. All rights reserved.
|
||||
rem Author: Gregory Nutt <gnutt@nuttx.org>
|
||||
rem
|
||||
rem Redistribution and use in source and binary forms, with or without
|
||||
rem modification, are permitted provided that the following conditions
|
||||
rem are met:
|
||||
rem
|
||||
rem 1. Redistributions of source code must retain the above copyright
|
||||
rem notice, this list of conditions and the following disclaimer.
|
||||
rem 2. Redistributions in binary form must reproduce the above copyright
|
||||
rem notice, this list of conditions and the following disclaimer in
|
||||
rem the documentation and/or other materials provided with the
|
||||
rem distribution.
|
||||
rem 3. Neither the name NuttX nor the names of its contributors may be
|
||||
rem used to endorse or promote products derived from this software
|
||||
rem without specific prior written permission.
|
||||
rem
|
||||
rem THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||
rem "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||
rem LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
|
||||
rem FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
|
||||
rem COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
|
||||
rem INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
|
||||
rem BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
|
||||
rem OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
|
||||
rem AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
||||
rem LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
|
||||
rem ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
||||
rem POSSIBILITY OF SUCH DAMAGE.
|
||||
|
||||
rem Handle command line options
|
||||
rem [-h] <compiler-path> <def1> [-val <val1>] [<def2> [-val <val2>] [<def3> [-val <val3>] ...]]
|
||||
rem [-w] [-d] ignored for compatibility with define.sh
|
||||
|
||||
set progname=%0
|
||||
|
||||
:ArgLoop
|
||||
if "%1"=="-d" goto :NextArg
|
||||
if "%1"=="-w" goto :NextArg
|
||||
if "%1"=="-h" goto :ShowUsage
|
||||
|
||||
goto :CheckCompilerPath
|
||||
|
||||
:NextArg
|
||||
shift
|
||||
goto :ArgLoop
|
||||
|
||||
:CheckCompilerPath
|
||||
|
||||
if "%1"=="" (
|
||||
echo Missing compiler path
|
||||
goto :ShowUsage
|
||||
)
|
||||
|
||||
set ccpath=%1
|
||||
shift
|
||||
|
||||
set compiler=
|
||||
for /F %%i in ("%ccpath%") do set compiler=%%~ni
|
||||
|
||||
if "%1"=="" (
|
||||
echo Missing definition list
|
||||
goto :ShowUsage
|
||||
)
|
||||
|
||||
rem Check for some well known, non-GCC Windows native tools that require
|
||||
rem a special output format as well as special paths
|
||||
|
||||
:GetFormat
|
||||
set fmt=std
|
||||
if "%compiler%"=="ez8cc" goto :SetZdsFormt
|
||||
if "%compiler%"=="zneocc" goto :SetZdsFormt
|
||||
if "%compiler%"=="ez80cc" goto :SetZdsFormt
|
||||
goto :ProcessDefinitions
|
||||
|
||||
:SetZdsFormt
|
||||
set fmt=zds
|
||||
|
||||
rem Now process each directory in the directory list
|
||||
|
||||
:ProcessDefinitions
|
||||
set response=
|
||||
|
||||
:DefinitionLoop
|
||||
if "%1"=="" goto :Done
|
||||
|
||||
set varname=%1
|
||||
shift
|
||||
|
||||
rem Handle the output depending on if there is a value for the variable or not
|
||||
|
||||
if "%1"=="-val" goto :GetValue
|
||||
|
||||
rem Handle the output using the selected format
|
||||
|
||||
:NoValue
|
||||
if "%fmt%"=="zds" goto :NoValueZDS
|
||||
|
||||
:NoValueStandard
|
||||
rem Treat the first definition differently
|
||||
|
||||
if "%response%"=="" (
|
||||
set response=-D%varname%
|
||||
goto :DefinitionLoop
|
||||
)
|
||||
|
||||
set response=%response% -D%varname%
|
||||
goto :DefinitionLoop
|
||||
|
||||
:NoValueZDS
|
||||
rem Treat the first definition differently
|
||||
|
||||
if "%response%"=="" (
|
||||
set response=-define:%varname%
|
||||
goto :DefinitionLoop
|
||||
)
|
||||
|
||||
set response=%response% -define:%varname%
|
||||
goto :DefinitionLoop
|
||||
|
||||
rem Get value following the variable name
|
||||
|
||||
:GetValue
|
||||
shift
|
||||
set varvalue=%1
|
||||
shift
|
||||
|
||||
rem Handle the output using the selected format
|
||||
|
||||
if "%fmt%"=="zds" goto :ValueZDS
|
||||
|
||||
:ValueStandard
|
||||
rem Treat the first definition differently
|
||||
|
||||
if "%response%"=="" (
|
||||
set response=-D%varname%=%varvalue%
|
||||
goto :DefinitionLoop
|
||||
)
|
||||
|
||||
set response=%response% -D%varname%=%varvalue%
|
||||
goto :DefinitionLoop
|
||||
|
||||
:ValueZds
|
||||
rem Treat the first definition differently
|
||||
|
||||
if "%response%"=="" (
|
||||
set response=-define:%varname%=%varvalue%
|
||||
goto :DefinitionLoop
|
||||
)
|
||||
|
||||
set response=%response% -define:%varname%=%varvalue%
|
||||
goto :DefinitionLoop
|
||||
|
||||
:Done
|
||||
echo %response%
|
||||
goto :End
|
||||
|
||||
:ShowUsage
|
||||
echo %progname% is a tool for flexible generation of command line pre-processor
|
||||
echo definitions arguments for a variety of diffent ccpaths in a variety of
|
||||
echo compilation environments"
|
||||
echo USAGE:%progname% [-h] ^<compiler-path^> [-val ^<^val1^>] [^<def2^> [-val ^<val2^>] [^<def3^> [-val ^<val3^>] ...]]
|
||||
echo Where:"
|
||||
echo ^<compiler-path^>
|
||||
echo The full path to your ccpath
|
||||
echo ^<def1^> ^<def2^> ^<def3^> ...
|
||||
echo A list of pre-preprocesser variable names to be defined.
|
||||
echo [-val ^<val1^>] [-val ^<val2^>] [-val ^<val3^>] ...
|
||||
echo optional values to be assigned to each pre-processor variable.
|
||||
echo If not supplied, the variable will be defined with no explicit value.
|
||||
echo -h
|
||||
echo Show this text and exit
|
||||
|
||||
:End
|
||||
228
tools/define.sh
Normal file
228
tools/define.sh
Normal file
@ -0,0 +1,228 @@
|
||||
#!/bin/bash
|
||||
# apps/tools/define.sh
|
||||
#
|
||||
# Copyright (C) 2018 Gregory Nutt. All rights reserved.
|
||||
# Author: Gregory Nutt <gnutt@nuttx.org>
|
||||
#
|
||||
# Redistribution and use in source and binary forms, with or without
|
||||
# modification, are permitted provided that the following conditions
|
||||
# are met:
|
||||
#
|
||||
# 1. Redistributions of source code must retain the above copyright
|
||||
# notice, this list of conditions and the following disclaimer.
|
||||
# 2. Redistributions in binary form must reproduce the above copyright
|
||||
# notice, this list of conditions and the following disclaimer in
|
||||
# the documentation and/or other materials provided with the
|
||||
# distribution.
|
||||
# 3. Neither the name NuttX nor the names of its contributors may be
|
||||
# used to endorse or promote products derived from this software
|
||||
# without specific prior written permission.
|
||||
#
|
||||
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
|
||||
# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
|
||||
# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
|
||||
# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
|
||||
# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
|
||||
# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
|
||||
# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
||||
# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
|
||||
# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
||||
# POSSIBILITY OF SUCH DAMAGE.
|
||||
#
|
||||
|
||||
#
|
||||
# Handle command line options
|
||||
#
|
||||
|
||||
progname=$0
|
||||
wintool=n
|
||||
usage="USAGE: $progname [-w] [-d] [-h] <compiler-path> <def1>[=val1] [<def2>[=val2] [<def3>[=val3] ...]]"
|
||||
advice="Try '$progname -h' for more information"
|
||||
|
||||
while [ ! -z "$1" ]; do
|
||||
case $1 in
|
||||
-d )
|
||||
set -x
|
||||
;;
|
||||
-w )
|
||||
wintool=y
|
||||
;;
|
||||
-h )
|
||||
echo "$progname is a tool for flexible generation of command line pre-processor"
|
||||
echo "definitions arguments for a variety of diffent compilers in a variety of"
|
||||
echo "compilation environments"
|
||||
echo ""
|
||||
echo $usage
|
||||
echo ""
|
||||
echo "Where:"
|
||||
echo " <compiler-path>"
|
||||
echo " The full path to your compiler"
|
||||
echo " <def1> <def2> [<def3> ..."
|
||||
echo " A list of pre-preprocesser variable names to be defined."
|
||||
echo " [=val1] [=val2] [=val3]"
|
||||
echo " optional values to be assigned to each pre-processor variable."
|
||||
echo " If not supplied, the variable will be defined with no explicit value."
|
||||
echo " -w"
|
||||
echo " The compiler is a Windows native tool and requires Windows"
|
||||
echo " style pathnames like C:\\Program Files"
|
||||
echo " -d"
|
||||
echo " Enable script debug"
|
||||
;;
|
||||
* )
|
||||
break;
|
||||
;;
|
||||
esac
|
||||
shift
|
||||
done
|
||||
|
||||
ccpath=$1
|
||||
shift
|
||||
varlist=$@
|
||||
|
||||
if [ -z "$ccpath" ]; then
|
||||
echo "Missing compiler path"
|
||||
echo $usage
|
||||
echo $advice
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [ -z "$varlist" ]; then
|
||||
echo "Missing definition list"
|
||||
echo $usage
|
||||
echo $advice
|
||||
exit 1
|
||||
fi
|
||||
|
||||
#
|
||||
# Most compilers support CFLAG options like '-D<defn>' to add pre-processor
|
||||
# variable defintions. Some (like the Zilog tools), do not. This script
|
||||
# makes the selection of pre-processor definitions compiler independent.
|
||||
#
|
||||
# Below are all known compiler names (as found in the config/*/*/Make.defs
|
||||
# files). If a new compiler is used that has some unusual syntax, then
|
||||
# additional logic needs to be added to this file.
|
||||
#
|
||||
# NAME Syntax
|
||||
# $(CROSSDEV)gcc -D<def1> -D<def2> -D<def3> ...
|
||||
# sdcc -D<def2> -D<def2> -D<def3> ...
|
||||
# $(ZDSBINDIR)/ez8cc.exe -define:<def1> -define:<def2> -define:<def3> ...
|
||||
# $(ZDSBINDIR)/zneocc.exe -define:<def1> -define:<def2> -define:<def3> ...
|
||||
# $(ZDSBINDIR)/ez80cc.exe -define:<def1> -define:<def2> -define:<def3> ...
|
||||
#
|
||||
os=`uname -o 2>/dev/null || echo "Other"`
|
||||
|
||||
#
|
||||
# Let's assume that all GCC compiler paths contain the string gcc and
|
||||
# no non-GCC compiler pathes include this substring
|
||||
#
|
||||
gcc=`echo $ccpath | grep gcc`
|
||||
sdcc=`echo $ccpath | grep sdcc`
|
||||
|
||||
if [ "X$os" = "XCygwin" ]; then
|
||||
#
|
||||
# We can treat Cygwin native toolchains just like Linux native
|
||||
# toolchains in the Linux. Let's assume:
|
||||
# 1. GCC or SDCC are the only possible Cygwin native compilers
|
||||
# 2. If this is a Window native GCC version, then -w provided
|
||||
# on the command line (wintool=y)
|
||||
|
||||
if [ -z "$gcc" -a -z "$sdcc" ]; then
|
||||
#
|
||||
# Not GCC or SDCC, must be Windows native
|
||||
#
|
||||
compiler=`cygpath -u "$ccpath"`
|
||||
else
|
||||
if [ "X$wintool" == "Xy" ]; then
|
||||
#
|
||||
# It is a native GCC or SDCC compiler
|
||||
#
|
||||
compiler=`cygpath -u "$ccpath"`
|
||||
else
|
||||
#
|
||||
# GCC or SDCC and not for Windows
|
||||
#
|
||||
compiler="$ccpath"
|
||||
fi
|
||||
fi
|
||||
else
|
||||
#
|
||||
# Otherwise, we must be in a Linux environment where there are
|
||||
# only Linux native toolchains
|
||||
#
|
||||
compiler="$ccpath"
|
||||
fi
|
||||
exefile=`basename "$compiler"`
|
||||
|
||||
# Check for some well known, non-GCC Windows native tools that require
|
||||
# a special output format as well as special paths
|
||||
|
||||
if [ "X$exefile" = "Xez8cc.exe" -o "X$exefile" = "Xzneocc.exe" -o "X$exefile" = "Xez80cc.exe" ]; then
|
||||
fmt=define
|
||||
else
|
||||
fmt=std
|
||||
fi
|
||||
|
||||
# Now process each definition in the definition list
|
||||
|
||||
unset response
|
||||
for vardef in $varlist; do
|
||||
|
||||
varname=`echo $vardef | cut -d'=' -f1`
|
||||
if [ "X$varname" != "X$vardef" ]; then
|
||||
varvalue=`echo $vardef | cut -d'=' -f2`
|
||||
else
|
||||
unset varvalue
|
||||
fi
|
||||
|
||||
# Handle the output depending on if there is a value for the variable or not
|
||||
|
||||
if [ -z "$varvalue" ]; then
|
||||
|
||||
# Handle the output using the selected format
|
||||
|
||||
if [ "X$fmt" = "Xdefine" ]; then
|
||||
# Treat the first definition differently
|
||||
|
||||
if [ -z "$response" ]; then
|
||||
response="-define:"$varname
|
||||
else
|
||||
response=$response" -define:$varname"
|
||||
fi
|
||||
else
|
||||
# Treat the first definition differently
|
||||
|
||||
if [ -z "$response" ]; then
|
||||
response=-D$varname
|
||||
else
|
||||
response=$response" -D$varname"
|
||||
fi
|
||||
fi
|
||||
else
|
||||
|
||||
# Handle the output using the selected format
|
||||
|
||||
if [ "X$fmt" = "Xdefine" ]; then
|
||||
# Treat the first definition differently
|
||||
|
||||
if [ -z "$response" ]; then
|
||||
response="-define:"$varname=$varvalue
|
||||
else
|
||||
response=$response" -define:$varname=$varvalue"
|
||||
fi
|
||||
else
|
||||
# Treat the first definition differently
|
||||
|
||||
if [ -z "$response" ]; then
|
||||
response=-D$varname=$varvalue
|
||||
else
|
||||
response=$response" -D$varname=$varvalue"
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
done
|
||||
|
||||
echo $response
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user