From a482c589f5345dac068a9a8ff816a06fd2a1866f Mon Sep 17 00:00:00 2001 From: Arun Prakash Jana Date: Tue, 7 Jan 2020 18:47:27 +0530 Subject: [PATCH] Prepare for release v2.2 --- .travis.yml | 2 +- CHANGELOG | 13 ++++++++++++ README.md | 4 ++-- bcal.1 | 4 ++-- packagecore.yaml | 53 ++++++++---------------------------------------- src/bcal.c | 2 +- 6 files changed, 28 insertions(+), 50 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2157f56..f99c3a7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -62,7 +62,7 @@ before_deploy: deploy: provider: releases api-key: - secure: ZtMbo/H21MoodNvw7+tvPId97meS4Xs2beUzqOhI166iuaLSWtjXxQgeC7vdYTWgPNacN6gxwhnXTLMXpt81a7g0NWxjRQ72/Rwh7aCdgQkJI/Y+0c7RNNVdLOtAWBM8csPoJy0jFdI34yHRj053tm9x65V4fMEKC9ArRm7pbTjNNovYXbW2KmRh6kr3dJdB/7tpoCpiMov6l4uHyWIcniFx97P+3dGnGqBd8SpR3IxeEypm8fzIGiX7NIJqwyG5MbLaWoyloBu21ilwh07dDifF6MI4mrkxtGY0yQ9GtHVp5cr7qyMgCt60hUGtrKhTtPQWwpzK0GSZ5eeYiLt6I/kkcj8FkWP+OazRLy/MydjGtG7q8tnbgNcmGqsbv+g1jJMEfZsnTfozeGOPPsYlhB/7kCi2BVqguXlKMRmpNPMZsc4HYK9yjV4HNsEkmwJcXgD350XS5iFu/koIGiT2PJ+/msdwPir74JpgRn00iGC0fD25V8M2TRnKn43g6jNRAZYMITaYDx+ML0SkdWIjksalW0759BgLfQopNbs9a9PbsKiNbfRRRF3xA8j2fQI6my7hXx0TzRwWTC7aMAuJkdjKn5UYOrMAZ+VXhHSOcX5LPiefwgtoU0YGjgWQdgTkQ7aR13rKuDSKepGonnkyiHWnM9gGftnNbNFi7WZRk5w= + secure: u83OMgj7hh+PWsBKE95FVB9eXionEu6W9drx6xWAhqJgqAlCtPFBb0MLimJCXBN0cStAfSHPGp4ovd+3oiimvzBoVH6Kx/ySWQ0vMU6L/1lNMVuE+Z/mxI98eQFR5fC/TMYWHD4+KyTs9CIN/DMZ+CZVbuAtr9neMmjx3fWfqSNQw7VUhP/IVQOFze0FJAdeqp0tPjXPnsA2eRLhmypR+1kHx2v7iy2NmC5Gk/qzpsuihW+U6Eg6e2SFBxEzLSylqJHC9/nPItqFSrhghUasK6ofJ72A5CaAZ5J0KWug1lJDrx6bNUmR4J1bBYR+vp2es73I7eKTBQ0FFWJrSvIJ62DowL2wxhr6xeyaILADykchxaawXNNxyapOr7feGLjPMb0Cxh5w9dfNXIWoRGSQGrERr+TDLgIXZENqYVjNklQg3HK9J5gD9EWn2qmm9NPZ1c3JUOCW/4kf7FLLlbSDUO3VGdQXVyYKpo5vgoZr7MG9zFb7aFWeDeQJRDd+c4TaSuqgt4l1Krn2Pfg9zjv2dDQHS3ZlumvwHJtebLpzOKfmNCmeKFIROCXVT6ml4QxTj3mjy6ddWlulL9mxF79z8bgGYQ9f/gplfQ0shEOnmoJnSsvmw7nPFBsNRSAfyDJQ2TaJ1wgMOu6IfN9yNIo93AaUFKGTKzYk0g/Skg2Avy8= file_glob: true file: - dist/* diff --git a/CHANGELOG b/CHANGELOG index 129e5c8..37bcb96 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,16 @@ +bcal v2.2 +2020-01-07 + +What's in? +- Support [`calc`](http://www.isthe.com/chongo/tech/comp/calc/) for multi-base expressions +- To use `calc`, `export BCAL_USE_CALC=1` +- Fix lint issues +- Fix issue #30 +- Updated auto-generated packages +- More portable Makefile + +------------------------------------------------------------------------------- + bcal v2.1 2018-12-11 diff --git a/README.md b/README.md index f4f12b5..3c10d5f 100644 --- a/README.md +++ b/README.md @@ -44,7 +44,7 @@ It has a [`bc`](https://www.gnu.org/software/bc/manual/html_mono/bc.html) mode f - REPL and single execution modes - evaluate arithmetic expressions involving storage units -- perform general purpose calculations (using bc) +- perform general purpose calculations (using bc or calc) - convert to IEC/SI standard data storage units - interactive mode with the last valid result stored for reuse - show the address in bytes @@ -86,7 +86,7 @@ If you have git installed, clone this repository. Otherwise, download the [lates Install to default location (`/usr/local`): $ make - $ sudo make install + $ sudo make strip install To uninstall, run: $ sudo make uninstall diff --git a/bcal.1 b/bcal.1 index dafc9e0..5e2b003 100644 --- a/bcal.1 +++ b/bcal.1 @@ -1,4 +1,4 @@ -.TH "BCAL" "1" "11 Dec 2018" "Version 2.1" "User Commands" +.TH "BCAL" "1" "07 Jan 2020" "Version 2.2" "User Commands" .SH NAME bcal \- Storage expression calculator. .SH SYNOPSIS @@ -20,7 +20,7 @@ It invokes GNU \fBbc\fR for non-storage expressions. Alternatively, it can also .SH FEATURES .PP * evaluate arithmetic expressions involving storage units - * perform general purpose calculations (using bc) + * perform general purpose calculations (using bc or calc) * convert to IEC/SI standard data storage units * interactive mode with the last valid result stored for reuse * show the address in bytes diff --git a/packagecore.yaml b/packagecore.yaml index eb0759d..ba9e432 100644 --- a/packagecore.yaml +++ b/packagecore.yaml @@ -14,28 +14,21 @@ packages: deps: - readline container: "archlinux/base" - centos7.1: + centos7.5: builddeps: - make - gcc - readline-devel deps: - readline - centos7.2: + centos7.6: builddeps: - make - gcc - readline-devel deps: - readline - centos7.3: - builddeps: - - make - - gcc - - readline-devel - deps: - - readline - centos7.4: + centos8.0: builddeps: - make - gcc @@ -49,34 +42,13 @@ packages: - libreadline-dev deps: - readline-common - fedora25: - builddeps: - - make - - gcc - - readline-devel - deps: - - readline - fedora26: - builddeps: - - make - - gcc - - readline-devel - deps: - - readline - fedora27: + debian10: builddeps: - make - gcc - - readline-devel - deps: - - readline - fedora28: - builddeps: - - make - - gcc - - readline-devel + - libreadline-dev deps: - - readline + - readline-common fedora29: builddeps: - make @@ -84,34 +56,27 @@ packages: - readline-devel deps: - readline - opensuse42.1: + fedora30: builddeps: - make - gcc - readline-devel deps: - readline - opensuse42.2: + fedora31: builddeps: - make - gcc - readline-devel deps: - readline - opensuse42.3: + opensuse15.1: builddeps: - make - gcc - readline-devel deps: - readline - ubuntu14.04: - builddeps: - - make - - gcc - - libreadline6-dev - deps: - - libreadline6 ubuntu16.04: builddeps: - make diff --git a/src/bcal.c b/src/bcal.c index 15b6086..576e99c 100644 --- a/src/bcal.c +++ b/src/bcal.c @@ -71,7 +71,7 @@ typedef struct { uchar loglvl : 2; } settings; -static char *VERSION = "2.1"; +static char *VERSION = "2.2"; static char *units[] = {"b", "kib", "mib", "gib", "tib", "kb", "mb", "gb", "tb"}; static char *logarr[] = {"ERROR", "WARNING", "INFO", "DEBUG"};