From 1ea579d929bebbdd3fce55bbc378965d6454a3c4 Mon Sep 17 00:00:00 2001 From: Landon Curt Noll Date: Fri, 17 Dec 1999 03:35:28 -0800 Subject: [PATCH] Release calc version 2.11.1t2.2 --- CHANGES | 7 ++++-- cscript/Makefile | 6 ++--- cscript/README | 64 ++++++++++++++++++++++++++++++++++++++++++++++++ help/Makefile | 25 ++++++++++++++++--- help/help | 5 ++-- help/script | 6 +++-- version.c | 6 ++--- 7 files changed, 104 insertions(+), 15 deletions(-) create mode 100644 cscript/README diff --git a/CHANGES b/CHANGES index 109f62d..ea7bfb3 100644 --- a/CHANGES +++ b/CHANGES @@ -50,6 +50,9 @@ The following are the changes from calc version 2.11.1 to date: Added ./.calcinit to the default calcrc. + Added cscript/README and help cscript to document the calc shell + script supplied with calc. + The following are the changes from calc version 2.11.0t10 to 2.11.0t11: @@ -4715,8 +4718,8 @@ Following is a list of visible changes to calc from version 1.24.7 to 1.26.1: ## received a copy with calc; if not, write to Free Software Foundation, Inc. ## 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. ## -## @(#) $Revision: 29.4 $ -## @(#) $Id: CHANGES,v 29.4 1999/12/17 10:06:46 chongo Exp $ +## @(#) $Revision: 29.5 $ +## @(#) $Id: CHANGES,v 29.5 1999/12/17 10:36:02 chongo Exp $ ## @(#) $Source: /usr/local/src/cmd/calc/RCS/CHANGES,v $ ## ## Under source code control: 1993/06/02 18:12:57 diff --git a/cscript/Makefile b/cscript/Makefile index d68a0aa..e3bc0d8 100644 --- a/cscript/Makefile +++ b/cscript/Makefile @@ -17,8 +17,8 @@ # received a copy with calc; if not, write to Free Software Foundation, Inc. # 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. # -# @(#) $Revision: 29.3 $ -# @(#) $Id: Makefile,v 29.3 1999/12/14 19:30:19 chongo Exp $ +# @(#) $Revision: 29.4 $ +# @(#) $Id: Makefile,v 29.4 1999/12/17 11:30:35 chongo Exp $ # @(#) $Source: /usr/local/src/cmd/calc/cscript/RCS/Makefile,v $ # # Under source code control: 1999/11/29 11:10:26 @@ -82,7 +82,7 @@ SCRIPT_SRC= mersenne.calc piforever.calc plus.calc simple.calc # These files are found (but not built) in the distribution # -DISTLIST= ${SCRIPT_SRC} ${MAKE_FILE} +DISTLIST= ${SCRIPT_SRC} ${MAKE_FILE} README # These files are used to make (but not built) a calc .a library # diff --git a/cscript/README b/cscript/README new file mode 100644 index 0000000..8cd9223 --- /dev/null +++ b/cscript/README @@ -0,0 +1,64 @@ +calc shell script examples +-------------------------- + +These calc shell scripts are provided because they serve as examples of +how use the calc language, and/or because the authors thought them to +be useful! + +If you write something that you think is useful, please send it to: + + calc-tester at postofc dot corp dot sgi dot com + + [[ Replace 'at' with @, 'dot' is with . and remove the spaces ]] + +For more info, see: + + help script + help cscript + +=-= + +mersenne exp + + Print the value of 2^exp-1. + + +piforever + + Print the value of pi forever, or as long as you cpu / memory allows. + + +plus arg ... + + Print the sum of 1 or more arguments. + + +simple + + A trivial example of a calc shell script. + +## Copyright (C) 1999 Landon Curt Noll +## +## Calc is open software; you can redistribute it and/or modify it under +## the terms of the version 2.1 of the GNU Lesser General Public License +## as published by the Free Software Foundation. +## +## Calc is distributed in the hope that it will be useful, but WITHOUT +## ANY WARRANTY; without even the implied warranty of MERCHANTABILITY +## or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General +## Public License for more details. +## +## A copy of version 2.1 of the GNU Lesser General Public License is +## distributed with calc under the filename COPYING-LGPL. You should have +## received a copy with calc; if not, write to Free Software Foundation, Inc. +## 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. +## +## @(#) $Revision: 29.3 $ +## @(#) $Id: README,v 29.3 1999/12/17 10:34:54 chongo Exp $ +## @(#) $Source: /usr/local/src/cmd/calc/cscript/RCS/README,v $ +## +## Under source code control: 1999/12/17 10:23:40 +## File existed as early as: 1999 +## +## chongo /\oo/\ http://reality.sgi.com/chongo/ +## Share and enjoy! :-) http://reality.sgi.com/chongo/tech/comp/calc/ diff --git a/help/Makefile b/help/Makefile index 098d2ce..0660b24 100644 --- a/help/Makefile +++ b/help/Makefile @@ -18,8 +18,8 @@ # received a copy with calc; if not, write to Free Software Foundation, Inc. # 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. # -# @(#) $Revision: 29.1 $ -# @(#) $Id: Makefile,v 29.1 1999/12/14 09:16:34 chongo Exp $ +# @(#) $Revision: 29.2 $ +# @(#) $Id: Makefile,v 29.2 1999/12/17 10:33:00 chongo Exp $ # @(#) $Source: /usr/local/src/cmd/calc/help/RCS/Makefile,v $ # # Under source code control: 1991/07/23 06:47:57 @@ -87,7 +87,11 @@ STD_HELP_FILES_8= operator statement BLT_HELP_FILES_9= resource -STD_HELP_FILES_10= types usage script unexpected variable +STD_HELP_FILES_10= types usage script + +BLT_HELP_FILES_10a= cscript + +STD_HELP_FILES_10b= unexpected variable BLT_HELP_FILES_11= bindings custom_cal libcalc new_custom resource @@ -108,6 +112,7 @@ FULL_HELP_FILES= ${STD_HELP_FILES_1} ${STD_HELP_FILES_2} \ ${BLT_HELP_FILES_5} ${STD_HELP_FILES_6} \ ${SPECIAL_HELP_7} ${STD_HELP_FILES_8} \ ${BLT_HELP_FILES_9} ${STD_HELP_FILES_10} \ + ${BLT_HELP_FILES_10a} ${STD_HELP_FILES_10b} \ ${BLT_HELP_FILES_11} ${STD_HELP_FILES_12} \ ${BLT_HELP_FILES_13} ${STD_HELP_FILES_14} \ ${BLT_HELP_FILES_14} ${STD_HELP_FILES_15} @@ -117,6 +122,7 @@ FULL_HELP_FILES= ${STD_HELP_FILES_1} ${STD_HELP_FILES_2} \ STD_HELP_FILES= ${STD_HELP_FILES_1} ${STD_HELP_FILES_2} \ ${STD_HELP_FILES_4} ${STD_HELP_FILES_6} \ ${STD_HELP_FILES_8} ${STD_HELP_FILES_10} \ + ${STD_HELP_FILES_10b} \ ${STD_HELP_FILES_12} ${STD_HELP_FILES_14} \ ${STD_HELP_FILES_15} @@ -127,6 +133,7 @@ STD_HELP_FILES= ${STD_HELP_FILES_1} ${STD_HELP_FILES_2} \ # BLT_HELP_FILES= ${BLT_HELP_FILES_3} ${BLT_HELP_FILES_5} \ ${BLT_HELP_FILES_9} \ + ${BLT_HELP_FILES_10a} \ ${BLT_HELP_FILES_11} ${BLT_HELP_FILES_13} \ ${BLT_HELP_FILES_14} @@ -337,6 +344,18 @@ COPYING-LGPL: ../COPYING-LGPL true; \ fi +cscript: ../cscript/README + rm -f $@ + cp ../cscript/README $@ + ${CHMOD} 0444 $@ + -@if [ -z "${Q}" ]; then \ + echo ''; \ + echo '=-=-= skipping the cat of help/$@ =-=-='; \ + echo ''; \ + else \ + true; \ + fi + full: ${FULL_HELP_FILES} ${MAKE_FILE} ${Q}echo "forming full" -${Q}rm -f $@ diff --git a/help/help b/help/help index 5bbc1af..a7bae2c 100644 --- a/help/help +++ b/help/help @@ -35,6 +35,7 @@ following topics: new_custom information about how to add new custom functions resource standard calc resource files script using calc shell scripts + cscript info on the calc shell scripts supplied with calc archive where to get the latest versions of calc bugs known bugs and mis-features @@ -118,8 +119,8 @@ as the same effect as: ## received a copy with calc; if not, write to Free Software Foundation, Inc. ## 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. ## -## @(#) $Revision: 29.1 $ -## @(#) $Id: help,v 29.1 1999/12/14 09:15:52 chongo Exp $ +## @(#) $Revision: 29.2 $ +## @(#) $Id: help,v 29.2 1999/12/17 10:33:00 chongo Exp $ ## @(#) $Source: /usr/local/src/cmd/calc/help/RCS/help,v $ ## ## Under source code control: 1991/07/21 04:37:20 diff --git a/help/script b/help/script index e050d81..14e6d58 100644 --- a/help/script +++ b/help/script @@ -1,4 +1,5 @@ Calc shell scripts +------------------ If an executable file begins with: @@ -62,6 +63,7 @@ For more information use the following calc commands: help usage help argv help config + help cscript ## Copyright (C) 1999 Landon Curt Noll ## @@ -79,8 +81,8 @@ For more information use the following calc commands: ## received a copy with calc; if not, write to Free Software Foundation, Inc. ## 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. ## -## @(#) $Revision: 29.1 $ -## @(#) $Id: script,v 29.1 1999/12/14 09:16:06 chongo Exp $ +## @(#) $Revision: 29.2 $ +## @(#) $Id: script,v 29.2 1999/12/17 10:33:00 chongo Exp $ ## @(#) $Source: /usr/local/src/cmd/calc/help/RCS/script,v $ ## ## Under source code control: 1999/11/30 05:29:48 diff --git a/version.c b/version.c index 405b49e..d0b8f70 100644 --- a/version.c +++ b/version.c @@ -19,8 +19,8 @@ * received a copy with calc; if not, write to Free Software Foundation, Inc. * 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. * - * @(#) $Revision: 29.4 $ - * @(#) $Id: version.c,v 29.4 1999/12/17 10:06:46 chongo Exp $ + * @(#) $Revision: 29.6 $ + * @(#) $Id: version.c,v 29.6 1999/12/17 10:41:18 chongo Exp $ * @(#) $Source: /usr/local/src/cmd/calc/RCS/version.c,v $ * * Under source code control: 1990/05/22 11:00:58 @@ -43,7 +43,7 @@ static char *program; #define MAJOR_VER 2 /* major version */ #define MINOR_VER 11 /* minor version */ #define MAJOR_PATCH 1 /* patch level or 0 if no patch */ -#define MINOR_PATCH "2" /* test number or empty string if no patch */ +#define MINOR_PATCH "2.2" /* test number or empty string if no patch */ /* * calc version constants