From eaec46982d8c1830b7e76f20cc76c301913bc7da Mon Sep 17 00:00:00 2001 From: Landon Curt Noll Date: Fri, 26 Mar 2021 09:31:36 -0700 Subject: [PATCH] Release v2.12.9.1 The following are the changes in this release: Fixed a typo typo in help/Makefile that caused the build of 2.12.9.0 to fail in a number of cases. Thanks to a report by . Pass form Makefile variables ${Q}, ${S}, ${E}, ${H} and ${V} down to all sub-directory Makefiles from the top level Makefile. --- CHANGES | 5 ++++- Makefile.ship | 18 ++++++++++++++---- cal/Makefile | 28 ++++++++++++++++++++++++++-- cscript/Makefile | 28 ++++++++++++++++++++++++++-- custom/Makefile | 32 ++++++++++++++++++++++++++++---- custom/Makefile.head | 32 ++++++++++++++++++++++++++++---- help/Makefile | 32 ++++++++++++++++++++++++++++---- version.c | 2 +- 8 files changed, 155 insertions(+), 22 deletions(-) diff --git a/CHANGES b/CHANGES index f8e2aa8..19385ca 100644 --- a/CHANGES +++ b/CHANGES @@ -4,6 +4,9 @@ The following are the changes from calc version 2.12.9.1 to date: 2.12.9.0 to fail in a number of cases. Thanks to a report by . + Pass form Makefile variables ${Q}, ${S}, ${E}, ${H} and ${V} down + to all sub-directory Makefiles from the top level Makefile. + The following are the changes from calc version 2.12.8.2 to 2.12.9.0: @@ -37,7 +40,7 @@ The following are the changes from calc version 2.12.8.2 to 2.12.9.0: Changed the UNUSED define in have_unused.h to be a macro with a parameter. Changed all use of UNUSED in *.c to be UNUSED(x). - Removed need for HAVE_UNUSED in building the have_unused.h file. + Removed the need for HAVE_UNUSED in building the have_unused.h file. CCBAN is given to ${CC} in order to control if banned.h is in effect. diff --git a/Makefile.ship b/Makefile.ship index 7a40b85..113830b 100644 --- a/Makefile.ship +++ b/Makefile.ship @@ -1149,7 +1149,7 @@ EXT= # The default calc versions # -VERSION= 2.12.9.0 +VERSION= 2.12.9.1 # Names of shared libraries with versions # @@ -2106,6 +2106,7 @@ CUSTOM_PASSDOWN= \ TOP_MAKE_FILE=${MAKE_FILE} \ TOUCH=${TOUCH} \ TRUE=${TRUE} \ + V=${V} \ VERSION=${VERSION} \ WNO_IMPLICT=${WNO_IMPLICT} \ WNO_ERROR_LONG_LONG=${WNO_ERROR_LONG_LONG} \ @@ -2128,6 +2129,7 @@ HELP_PASSDOWN= \ COMMON_CFLAGS="${COMMON_CFLAGS}" \ COMMON_LDFLAGS="${COMMON_LDFLAGS}" \ CP=${CP} \ + E="${E}" \ EXT=${EXT} \ FMT=${FMT} \ GREP=${GREP} \ @@ -2145,13 +2147,15 @@ HELP_PASSDOWN= \ Q="${Q}" \ RM=${RM} \ RMDIR=${RMDIR} \ + S="${S}" \ SCRIPTDIR="${SCRIPTDIR}" \ SED=${SED} \ SHELL=${SHELL} \ T=${T} \ TOP_MAKE_FILE=${MAKE_FILE} \ TOUCH=${TOUCH} \ - TRUE=${TRUE} + TRUE=${TRUE} \ + V=${V} # The complete list of Makefile vars passed down to cal/Makefile. # @@ -2165,6 +2169,7 @@ CAL_PASSDOWN= \ CMP=${CMP} \ CO=${CO} \ CP=${CP} \ + E="${E}" \ H="${H}" \ HELPDIR="${HELPDIR}" \ INCDIR="${INCDIR}" \ @@ -2176,12 +2181,14 @@ CAL_PASSDOWN= \ Q="${Q}" \ RM=${RM} \ RMDIR=${RMDIR} \ + S="${S}" \ SCRIPTDIR="${SCRIPTDIR}" \ SHELL=${SHELL} \ T=${T} \ TOP_MAKE_FILE=${MAKE_FILE} \ TOUCH=${TOUCH} \ - TRUE=${TRUE} + TRUE=${TRUE} \ + V=${V} # The complete list of Makefile vars passed down to cscript/Makefile. # @@ -2195,6 +2202,7 @@ CSCRIPT_PASSDOWN= \ CMP=${CMP} \ CO=${CO} \ CP=${CP} \ + E="${E}" \ ECHON="${ECHON}" \ FMT=${FMT} \ H="${H}" \ @@ -2208,6 +2216,7 @@ CSCRIPT_PASSDOWN= \ Q="${Q}" \ RM=${RM} \ RMDIR=${RMDIR} \ + S="${S}" \ SCRIPTDIR="${SCRIPTDIR}" \ SED=${SED} \ SHELL=${SHELL} \ @@ -2215,7 +2224,8 @@ CSCRIPT_PASSDOWN= \ T=${T} \ TOP_MAKE_FILE=${MAKE_FILE} \ TOUCH=${TOUCH} \ - TRUE=${TRUE} + TRUE=${TRUE} \ + V=${V} # complete list of .h files found (but not built) in the distribution # diff --git a/cal/Makefile b/cal/Makefile index a8da990..47b3793 100644 --- a/cal/Makefile +++ b/cal/Makefile @@ -176,11 +176,35 @@ T= # Makefile debug # -# Q=@ do not echo internal makefile actions (quiet mode) -# Q= echo internal makefile actions (debug / verbose mode) +# Q=@ do not echo internal Makefile actions (quiet mode) +# Q= echo internal Makefile actions (debug / verbose mode) +# +# H=@: do not report hsrc file formation progress +# H=@ do echo hsrc file formation progress +# +# S= >/dev/null 2>&1 slience ${CC} output during hsrc file formation +# S= full ${CC} output during hsrc file formation +# +# E= 2>/dev/null slience command stderr during hsrc file formation +# E= full command stderr during hsrc file formation +# +# V=@: do not echo debug statements (quiet mode) +# V=@ do echo debug statements (debug / verbose mode) # #Q= Q=@ +# +S= >/dev/null 2>&1 +#S= +# +E= 2>/dev/null +#E= +# +#H=@: +H=@ +# +V=@: +#V=@ # standard tools # diff --git a/cscript/Makefile b/cscript/Makefile index cee50ce..1347f06 100644 --- a/cscript/Makefile +++ b/cscript/Makefile @@ -175,11 +175,35 @@ T= # Makefile debug # -# Q=@ do not echo internal makefile actions (quiet mode) -# Q= echo internal makefile actions (debug / verbose mode) +# Q=@ do not echo internal Makefile actions (quiet mode) +# Q= echo internal Makefile actions (debug / verbose mode) +# +# H=@: do not report hsrc file formation progress +# H=@ do echo hsrc file formation progress +# +# S= >/dev/null 2>&1 slience ${CC} output during hsrc file formation +# S= full ${CC} output during hsrc file formation +# +# E= 2>/dev/null slience command stderr during hsrc file formation +# E= full command stderr during hsrc file formation +# +# V=@: do not echo debug statements (quiet mode) +# V=@ do echo debug statements (debug / verbose mode) # #Q= Q=@ +# +S= >/dev/null 2>&1 +#S= +# +E= 2>/dev/null +#E= +# +#H=@: +H=@ +# +V=@: +#V=@ # standard tools # diff --git a/custom/Makefile b/custom/Makefile index cc28372..04d2120 100644 --- a/custom/Makefile +++ b/custom/Makefile @@ -155,14 +155,38 @@ CUSTOM_OBJ= c_argv.o c_devnull.o c_help.o c_sysinfo.o c_pzasusb8.o \ # Normally, the upper level makefile will set these values. We provide # a default here just in case you want to build from this directory. -# + # Makefile debug # -# Q=@ do not echo internal makefile actions (quiet mode) -# Q= echo internal makefile actions (debug / verbose mode) +# Q=@ do not echo internal Makefile actions (quiet mode) +# Q= echo internal Makefile actions (debug / verbose mode) +# +# H=@: do not report hsrc file formation progress +# H=@ do echo hsrc file formation progress +# +# S= >/dev/null 2>&1 slience ${CC} output during hsrc file formation +# S= full ${CC} output during hsrc file formation +# +# E= 2>/dev/null slience command stderr during hsrc file formation +# E= full command stderr during hsrc file formation +# +# V=@: do not echo debug statements (quiet mode) +# V=@ do echo debug statements (debug / verbose mode) # #Q= Q=@ +# +S= >/dev/null 2>&1 +#S= +# +E= 2>/dev/null +#E= +# +#H=@: +H=@ +# +V=@: +#V=@ #### # Normally, the upper level makefile will set these values. We provide @@ -407,7 +431,7 @@ EXT= # The default calc versions # -VERSION= 2.12.9.0 +VERSION= 2.12.9.1 # Names of shared libraries with versions # diff --git a/custom/Makefile.head b/custom/Makefile.head index a87a62f..b9373ba 100644 --- a/custom/Makefile.head +++ b/custom/Makefile.head @@ -155,14 +155,38 @@ CUSTOM_OBJ= c_argv.o c_devnull.o c_help.o c_sysinfo.o c_pzasusb8.o \ # Normally, the upper level makefile will set these values. We provide # a default here just in case you want to build from this directory. -# + # Makefile debug # -# Q=@ do not echo internal makefile actions (quiet mode) -# Q= echo internal makefile actions (debug / verbose mode) +# Q=@ do not echo internal Makefile actions (quiet mode) +# Q= echo internal Makefile actions (debug / verbose mode) +# +# H=@: do not report hsrc file formation progress +# H=@ do echo hsrc file formation progress +# +# S= >/dev/null 2>&1 slience ${CC} output during hsrc file formation +# S= full ${CC} output during hsrc file formation +# +# E= 2>/dev/null slience command stderr during hsrc file formation +# E= full command stderr during hsrc file formation +# +# V=@: do not echo debug statements (quiet mode) +# V=@ do echo debug statements (debug / verbose mode) # #Q= Q=@ +# +S= >/dev/null 2>&1 +#S= +# +E= 2>/dev/null +#E= +# +#H=@: +H=@ +# +V=@: +#V=@ #### # Normally, the upper level makefile will set these values. We provide @@ -407,7 +431,7 @@ EXT= # The default calc versions # -VERSION= 2.12.9.0 +VERSION= 2.12.9.1 # Names of shared libraries with versions # diff --git a/help/Makefile b/help/Makefile index c40bf3d..8ec3baf 100644 --- a/help/Makefile +++ b/help/Makefile @@ -176,11 +176,35 @@ T= # Makefile debug # -# Q=@ do not echo internal makefile actions (quiet mode) -# Q= echo internal makefile actions (debug / verbose mode) +# Q=@ do not echo internal Makefile actions (quiet mode) +# Q= echo internal Makefile actions (debug / verbose mode) +# +# H=@: do not report hsrc file formation progress +# H=@ do echo hsrc file formation progress +# +# S= >/dev/null 2>&1 slience ${CC} output during hsrc file formation +# S= full ${CC} output during hsrc file formation +# +# E= 2>/dev/null slience command stderr during hsrc file formation +# E= full command stderr during hsrc file formation +# +# V=@: do not echo debug statements (quiet mode) +# V=@ do echo debug statements (debug / verbose mode) # #Q= Q=@ +# +S= >/dev/null 2>&1 +#S= +# +E= 2>/dev/null +#E= +# +#H=@: +H=@ +# +V=@: +#V=@ # standard tools # @@ -637,8 +661,8 @@ builtin: builtin.top builtin.end ../func.c funclist.sed ${Q} ${SED} -n -f funclist.sed ../func.c > funclist.c ${Q} ${RM} -f funclist.o funclist${EXT} ${Q} ${LCC} ${ICFLAGS} -DFUNCLIST -I/usr/include \ - -I.. funclist.c -c 2>/dev/null - ${Q} ${LCC} ${ILDFLAGS} funclist.o -o funclist${EXT} + -I.. funclist.c -c ${S} + ${Q} ${LCC} ${ILDFLAGS} funclist.o -o funclist${EXT} ${S} ${Q} ${RM} -f builtin ${Q} ${GREP} -v '^#' builtin.top > builtin ${Q} ./funclist${EXT} | \ diff --git a/version.c b/version.c index 43b9f5f..613fcaa 100644 --- a/version.c +++ b/version.c @@ -54,7 +54,7 @@ static char *program; #define MAJOR_VER 2 /* major library version */ #define MINOR_VER 12 /* minor library version */ #define MAJOR_PATCH 9 /* major software version level */ -#define MINOR_PATCH 0 /* minor software version level */ +#define MINOR_PATCH 1 /* minor software version level */ /*