From 8af0b351ae9a9b2cfceb3bdd8b4ed1446791a4de Mon Sep 17 00:00:00 2001 From: Landon Curt Noll Date: Mon, 15 Feb 2021 22:21:02 -0800 Subject: [PATCH] Release 2.12.8.1 Fixed how the *.tar.bz2 are formed. The calc-2.12.8.0.tar.bz2 file that was formed for calc version 2.12.8.0 was missing most files. Expanded 'make chk' to also verify that 'make distchk' and 'make distlist' execute successfully. This will help check a regression of the bug that produced the bogus calc-2.12.8.0.tar.bz2 file. Added additional regression tests related 0^(zero_expression)==1. --- CHANGES | 9 +++++++++ Makefile.ship | 7 +++++-- cal/regress.cal | 11 ++++++++++- custom/Makefile | 2 +- custom/Makefile.head | 2 +- version.c | 2 +- 6 files changed, 27 insertions(+), 6 deletions(-) diff --git a/CHANGES b/CHANGES index 0787236..1117dd4 100644 --- a/CHANGES +++ b/CHANGES @@ -54,6 +54,15 @@ The following are the changes from calc version 2.12.8.0 to date: http://www.isthe.com/chongo/tech/comp/calc/calc-question.html + Fixed how the *.tar.bz2 are formed. The calc-2.12.8.0.tar.bz2 file + that was formed for calc version 2.12.8.0 was missing most files. + + Expanded 'make chk' to also verify that 'make distchk' and 'make + distlist' execute successfully. This will help check a regression + of the bug that produced the bogus calc-2.12.8.0.tar.bz2 file. + + Added additional regression tests related 0^(zero_expression)==1. + The following are the changes from calc version 2.12.7.1 to 2.12.7.5: diff --git a/Makefile.ship b/Makefile.ship index 5065f7f..fda2af6 100644 --- a/Makefile.ship +++ b/Makefile.ship @@ -1053,7 +1053,7 @@ EXT= # The default calc versions # -VERSION= 2.12.8.0 +VERSION= 2.12.8.1 # Names of shared libraries with versions # @@ -2088,7 +2088,7 @@ LICENSE= COPYING COPYING-LGPL # DISTLIST= ${C_SRC} ${H_SRC} ${MAKE_FILE} BUGS CHANGES LIBRARY README.FIRST \ README.WINDOWS calc.man HOWTO.INSTALL ${UTIL_MISC_SRC} ${LICENSE} \ - sample.README calc.spec.in rpm.mk README.md QUESTION CONTRIB-CODE + sample.README calc.spec.in rpm.mk README.md QUESTIONS CONTRIB-CODE # These files are used to make (but not build) a calc .a link library # @@ -4032,6 +4032,9 @@ check: all ./cal/regress.cal chk: ./cal/regress.cal ${V} echo '=-=-=-=-= ${MAKE_FILE} start of $@ rule =-=-=-=-=' ${CALC_ENV} ./calc${EXT} -d -q read regress 2>&1 | ${AWK} -f check.awk + @${MAKE} -f Makefile Q= V=@ distdir >/dev/null 2>&1 + @${MAKE} -f Makefile Q= V=@ distlist >/dev/null 2>&1 + ${Q} echo 'chk OK' ${V} echo '=-=-=-=-= ${MAKE_FILE} end of $@ rule =-=-=-=-=' ### diff --git a/cal/regress.cal b/cal/regress.cal index a0d0043..dc94544 100644 --- a/cal/regress.cal +++ b/cal/regress.cal @@ -356,8 +356,17 @@ define test_arithmetic() vrfy(-16^-2 == -1/256, '447: -16^-2 == -1/256'); vrfy(-7^2 == -49, '448: -7^2 == -49'); vrfy(-3! == -6, '449: -3! == -6'); + vrfy(0^(0-0) == 1, '450: 0^(0-0) == 1'); + vrfy(0^(2-2) == 1, '451: 0^(2-2) == 1'); + vrfy(2^0 == 1, '452: 2^0 == 1'); + vrfy(2^(0-0) == 1, '453: 2^(0-0) == 1'); + vrfy(2^(2-2) == 1, '454: 2^(2-2) == 1'); + vrfy((2^23209-1)^0 == 1, '455: (2^23209-1)^0 == 1'); + vrfy((2^23209-1)^(0-0) == 1, '456: (2^23209-1)^(0-0) == 1'); + vrfy((2^23209-1)^(2-2) == 1, '457: (2^23209-1)^(2-2) == 1'); + vrfy((2^23209-1)^((2^23209-1)-(2^23209-1)) == 1, '458: (2^23209-1)^((2^23209-1)-(2^23209-1)) == 1'); - print '450: Ending test_arithmetic'; + print '459: Ending test_arithmetic'; } print '009: parsed test_arithmetic()'; diff --git a/custom/Makefile b/custom/Makefile index f1b74aa..10c8039 100644 --- a/custom/Makefile +++ b/custom/Makefile @@ -348,7 +348,7 @@ EXT= # The default calc versions # -VERSION= 2.12.8.0 +VERSION= 2.12.8.1 # Names of shared libraries with versions # diff --git a/custom/Makefile.head b/custom/Makefile.head index 6760bf2..de105c4 100644 --- a/custom/Makefile.head +++ b/custom/Makefile.head @@ -348,7 +348,7 @@ EXT= # The default calc versions # -VERSION= 2.12.8.0 +VERSION= 2.12.8.1 # Names of shared libraries with versions # diff --git a/version.c b/version.c index a204206..ce985bd 100644 --- a/version.c +++ b/version.c @@ -45,7 +45,7 @@ static char *program; #define MAJOR_VER 2 /* major library version */ #define MINOR_VER 12 /* minor library version */ #define MAJOR_PATCH 8 /* major software version level */ -#define MINOR_PATCH 0 /* minor software version level */ +#define MINOR_PATCH 1 /* minor software version level */ /*