[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnuastro-commits] (no subject)
|
From: |
Mohammad Akhlaghi |
|
Subject: |
[gnuastro-commits] (no subject) |
|
Date: |
Sun, 22 May 2016 05:33:24 +0000 (UTC) |
branch: master
commit af7008e14acd3337ca74b0ee4af2608635ad4bb6
Author: Mohammad Akhlaghi <address@hidden>
Date: Sun May 22 14:09:26 2016 +0900
Utilities no longer have an independent version number
Until now the utilities had an independent version number for
themselves. In some releases, some utilities might not have undergone any
change, so their version number would remain unchanged while the overall
Gnuastro version number would increase. This was meaningful for a manual
version number (on an official releases).
However, after adopting Gnulib's git-version-gen to automatically generate
a version number from the Git history (task #13991), the independent
version numbers for each package could cause great confusion. So they are
now removed. Any noteworthy change in a utility for each release is
described in the NEWS file along with the utility name, so an interested
user in a particular utility can easily search NEWS to see if anything
relevant to their usage has changed in an official release.
This finishes task #14000.
---
.gitignore | 1 -
configure.ac | 2 +-
doc/Makefile.am | 10 ++------
doc/findversions.sh | 62 ------------------------------------------------
doc/gnuastro.texi | 54 +++++++++++++++++------------------------
include/configfiles.h | 29 +++++++++++-----------
src/arithmetic/main.h | 3 +--
src/convertt/main.h | 3 +--
src/convolve/main.h | 3 +--
src/cosmiccal/main.h | 3 +--
src/header/main.h | 3 +--
src/imgcrop/main.h | 3 +--
src/imgstat/main.h | 3 +--
src/imgwarp/main.h | 3 +--
src/mkcatalog/main.h | 3 +--
src/mknoise/main.h | 3 +--
src/mkprof/main.h | 3 +--
src/noisechisel/main.h | 3 +--
src/subtractsky/main.h | 3 +--
19 files changed, 52 insertions(+), 145 deletions(-)
diff --git a/.gitignore b/.gitignore
index aebdb02..2115241 100644
--- a/.gitignore
+++ b/.gitignore
@@ -104,7 +104,6 @@ astsubtractsky
autom4te.cache
doc/gnuastro.cps
doc/gnuastro.vrs
-utilityversions.texi
diff --git a/configure.ac b/configure.ac
index cbc0082..feadadb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-i# Process this file with autoconf to produce a configure script.
+# Process this file with autoconf to produce a configure script.
#
# Hand written file: used as input into GNU Autotools (autoconf).
# This is part of GNU Astronomy Utilities (gnuastro) package.
diff --git a/doc/Makefile.am b/doc/Makefile.am
index dd1fa3a..97ce522 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -33,12 +33,12 @@ SHELL=/bin/bash
## Commands to make the texinfo tools:
info_TEXINFOS = gnuastro.texi
-gnuastro_TEXINFOS = fdl.texi authors.texi utilityversions.texi formath.texi
+gnuastro_TEXINFOS = fdl.texi authors.texi formath.texi
## Files not predefined by Automake, and not in dependencies that must
## be included in the final tar-ball distribution.
-EXTRA_DIST = findversions.sh genauthors README
+EXTRA_DIST = genauthors README
## We want to build the authors.texi file only when we are building in the
@@ -49,12 +49,6 @@ authors.texi: $(top_srcdir)/configure
$(top_srcdir)/doc/genauthors
-# Find the version of each utility:
-headers=$(top_srcdir)/src/*/main.h
-utilityversions.texi: $(headers)
- $(top_srcdir)/doc/findversions.sh $(headers)
-
-
## Images:
infognuastrodir=$(infodir)/gnuastro-figures/
dist_infognuastro_DATA = $(top_srcdir)/doc/gnuastro-figures/*
diff --git a/doc/findversions.sh b/doc/findversions.sh
deleted file mode 100755
index 01dbaa5..0000000
--- a/doc/findversions.sh
+++ /dev/null
@@ -1,62 +0,0 @@
-#! /bin/bash
-# Read the version numbers of all the sub packages.
-#
-# Copying and distribution of this file, with or without modification,
-# are permitted in any medium without royalty provided the copyright
-# notice and this notice are preserved. This file is offered as-is,
-# without any warranty.
-#
-# All the file names containing the version numbers are input as
-# command line arguments. The directory part of all the names should
-# be given ast the first argument:
-#
-# findversions.sh DIRname FILEname(s)...
-#
-# We want the final file ($output) to remain intact until the versions
-# of all the subpackages have been found and written. So we will first
-# create a blank temporary file to save the one-by-one outputs, then
-# in the end (after it has successfully finished), copy that temporary
-# file into the output file.
-output="utilityversions.texi"
-tmp="tmp.texi"
-
-
-
-# Remove the temporary file if it exists. It is very important that it
-# be newly made in the next loop, because all the outputs will be
-# appended to the file. We don't want anything remaining.
-if [ -f $tmp ]; then
- rm $tmp
-fi
-
-
-
-echo
-echo Current GNU Astronomy Utilities versions are:
-
-#Read the subpackage version for each program:
-for filename in $@
-do
- # Save the output of grep (a line) as an array:
- a=($(grep "define SPACK_VERSION" $filename))
- b=${a[2]} # Save the second token (word):
- c=${b#\"} # Remove the initial "
- progversion=${c%\"} # Remove the final "
-
- #Find the program name:
- a=($(grep "define SPACK " $filename))
- b=${a[2]} # Save the second token (word):
- c=${b#\"} # Remove the initial "
- d=${c%\"} # Remove the final "
- progname=${d#ast} # Remove the initial "ast"
-
- echo ast$progname $progversion
-
- # Save the result to a file:
- echo @set ${progname^^}_VERSION $progversion >> $tmp
-done
-
-echo
-
-#Replace the final file with the temporary file:
-mv $tmp $output
diff --git a/doc/gnuastro.texi b/doc/gnuastro.texi
index 45384ab..3b18d74 100644
--- a/doc/gnuastro.texi
+++ b/doc/gnuastro.texi
@@ -9,7 +9,6 @@
@c %**end of header
@include version.texi
@include formath.texi
address@hidden utilityversions.texi
@c So dashes and underscores can be used in HTMLs
@allowcodebreaks true
@@ -920,16 +919,15 @@ introduction. This section is not just for developers and
is very
streightforward, so please have a look if you are interested in the
cutting-edge. This unofficial version number is a meaningful and easy to
read string of characters, unique to that particular point of history. With
-this feature, users can easily stay up to date with the cutting edge bug
+this feature, users can easily stay up to date with the most recent bug
fixes and additions that are committed between official relases.
The unofficial version number is formatted like: @file{A.B.C-D}. @file{A}
-and @file{B} are the same as the official version number. @file{C} is the
-number of commits that have been made after the most recent official
-release. @file{D} is the first 4 characters of the commit hash
address@hidden point in Gnuastro's history is uniquely identified
-with a 40 character long hash which is created from its contents and
-previous history for example:
+and @file{B} are the most recent official version number. @file{C} is the
+number of commits that have been made after version @file{A.B}. @file{D} is
+the first 4 or 5 characters of the commit hash address@hidden point
+in Gnuastro's history is uniquely identified with a 40 character long hash
+which is created from its contents and previous history for example:
@code{5b17501d8f29ba3cd610673261e6e2229c846d35}. So the string @file{D} in
the version for this commit would be @file{5b17}}. Therefore, the
unofficial version number address@hidden', corresponds to the 8th
@@ -942,14 +940,6 @@ making it more stable), so if an official release is
announced prior to
your publication's final review, please consider updating to the official
release.
-All the utilities also have a version number to signify a change in that
-utility. Therefore if no change was made in a utility between two Gnuastro
-official releases, its version number will not change. Gnuastro and all
-programs within it started with a version number @file{0.0}. The minor
-version number is increased by 1 with any few bug fixes or small
-improvements compared to the previous release. The @file{NEWS} file will
-list all the relevant changes.
-
The major version number is set by a major goal which is defined by the
developers and user community of Gnuastro and individual utilities before
hand, see @ref{GNU Astronomy Utilities 1.0} for example. The incremental
@@ -5252,7 +5242,7 @@ continue with the rest of actions.
@cindex Converting data formats
@cindex Image format conversion
@cindex Converting image formats
address@hidden @r{ConvertType @value{CONVERTT_VERSION} (address@hidden)}
address@hidden @r{ConvertType (address@hidden)}
The formats of astronomical data were defined mainly for archiving and
processing. In other situations, the data might be useful in other
formats. For example, when you are writing a paper or report or if you
@@ -5779,7 +5769,7 @@ given kernel or applying a transformation to it.
@cindex Crop part of image
@cindex Postage stamp images
@cindex Large astronomical images
address@hidden @r{ImageCrop @value{IMGCROP_VERSION} (address@hidden)}
address@hidden @r{ImageCrop (address@hidden)}
Astronomical images are often very large, filled with thousands of
galaxies. It often happens that you only want a section of the image,
or you have a catalog of sources and you want to visually analyze them
@@ -11527,7 +11517,7 @@ data. The tools in this chapter create model galaxies
and will provide
@section MakeProfiles
@cindex Checking detection algorithms
address@hidden @r{MakeProfiles @value{MKPROF_VERSION} (address@hidden)}
address@hidden @r{MakeProfiles (address@hidden)}
MakeProfiles will create mock astronomical profiles from a catalog,
either individually or together in one output image. In data analysis,
making a mock image can act like a calibration tool, through which you
@@ -14781,54 +14771,54 @@ contextual ordering.
@table @asis
address@hidden Arithmetic @value{ARITHMETIC_VERSION}
address@hidden Arithmetic
(@file{astarithmetic}) For arithmetic operations on data (image) pixels
(@ref{Arithmetic}).
address@hidden ConvertType @value{CONVERTT_VERSION}
address@hidden ConvertType
(@file{astconvertt}) Convert astronomical data files (FITS or IMH) to
and from several other standard image and data formats, for example
JPEG, EPS or PDF (@ref{ConvertType}).
address@hidden Convolve @value{CONVOLVE_VERSION}
address@hidden Convolve
(@file{astconvolve}) Convolve (blur or smooth) data with a given
kernel (@ref{Convolve}).
address@hidden CosmicCalculator @value{COSMICCAL_VERSION}
address@hidden CosmicCalculator
(@file{astconvolve}) Find cosmological variables from input parameters
(@ref{CosmicCalculator}).
address@hidden Header @value{HEADER_VERSION}
address@hidden Header
(@file{astheader}) Print and manipulate the header data of a FITS file
(see @ref{Header}).
address@hidden ImageCrop @value{IMGCROP_VERSION}
address@hidden ImageCrop
(@file{astimgcrop}) Crop region(s) from an image and stitch several
images if necessary. Inputs can be in pixel coordinates or world
coordinates (@ref{ImageCrop}).
address@hidden ImageStatistics @value{IMGSTAT_VERSION}
address@hidden ImageStatistics
(@file{astimgstat}) Get pixel statistics and save histogram and
cumulative frequency plots (@ref{ImageStatistics}).
address@hidden ImageWarp @value{IMGWARP_VERSION}
address@hidden ImageWarp
(@file{astimgwarp}) Warp image to new pixel grid (@ref{ImageWarp}).
address@hidden MakeCatalog @value{MKCATALOG_VERSION}
address@hidden MakeCatalog
(@file{astmkcatalog}) Make catalog of labeled image
(@ref{MakeCatalog}).
address@hidden MakeNoise @value{MKNOISE_VERSION}
address@hidden MakeNoise
(@file{astmknoise}) Make (add) noise to an image (@ref{MakeNoise}).
address@hidden MakeProfiles @value{MKPROF_VERSION}
address@hidden MakeProfiles
(@file{astmkprof}) Make mock profiles in image (@ref{MakeProfiles}).
address@hidden NoiseChisel @value{NOISECHISEL_VERSION}
address@hidden NoiseChisel
(@file{astnoisechisel}) Detect and segment signal in noise
(@ref{NoiseChisel}).
address@hidden SubtractSky @value{SUBTRACTSKY_VERSION}
address@hidden SubtractSky
(@file{astsubtractsky}) Find and subtract sky value by comparing the
mode and median on a mesh grid (@ref{SubtractSky}).
diff --git a/include/configfiles.h b/include/configfiles.h
index afb9101..e16f952 100644
--- a/include/configfiles.h
+++ b/include/configfiles.h
@@ -74,21 +74,20 @@ along with Gnuastro. If not, see
<http://www.gnu.org/licenses/>.
readconfig(CURDIRCONFIG_FILE, p); \
if(cp->setdirconf) \
SAVE_LOCAL_CONFIG(CURDIRCONFIG_DIR); \
- if(cp->onlyversionset && strcmp(cp->onlyversion, SPACK_VERSION)) \
- error(EXIT_FAILURE, 0, "The running version of %s is `%s'. " \
- "However, you have asked for this %s run to be with " \
- "version `%s'. Either on the command line or in a " \
- "configuration file with the `--onlyversion' option. " \
- "Please either remove it, or set it to `%s' with a command " \
- "like:\n\n" \
- " %s --onlyversion=%s --setdirconf\n\n" \
- "Alternatively, you can install %s %s.\n" \
- "NOTE: If this option was a configuration file, probably " \
- "it is intended for reproducability. If so, to be exactly " \
- "reproducible, it is advised to install the requested " \
- "version.", SPACK_NAME, SPACK_VERSION, SPACK_NAME, \
- cp->onlyversion, SPACK_VERSION, SPACK, SPACK_VERSION, \
- SPACK_NAME, SPACK_VERSION); \
+ if(cp->onlyversionset && strcmp(cp->onlyversion, PACKAGE_VERSION)) \
+ error(EXIT_FAILURE, 0, "You are currently running Gnuastro %s. " \
+ "However, this run should be with version `%s'.\n\n" \
+ "To resolve the situation, use the the '--onlyversion' " \
+ "option, either on the command-line or in a configuration " \
+ "file. For example, set it to `%s' by repeating the " \
+ "previous command with:\n\n" \
+ " --onlyversion=%s\n\n" \
+ "Alternatively, you can install Gnuastro %s.\n\n" \
+ "NOTE: If you didn't set this option on the command-line, " \
+ "it was probably intended for reproducability. If so, it " \
+ "is advised to install Gnuastro %s.", \
+ PACKAGE_VERSION, cp->onlyversion, PACKAGE_VERSION, \
+ PACKAGE_VERSION, cp->onlyversion, cp->onlyversion); \
\
if(cp->onlydirconf==0) \
{ \
diff --git a/src/arithmetic/main.h b/src/arithmetic/main.h
index 072a5d3..ca57963 100644
--- a/src/arithmetic/main.h
+++ b/src/arithmetic/main.h
@@ -28,10 +28,9 @@ along with Gnuastro. If not, see
<http://www.gnu.org/licenses/>.
#include "commonparams.h"
/* Progarm name macros: */
-#define SPACK_VERSION "0.1"
#define SPACK "astarithmetic" /* Subpackage executable name. */
#define SPACK_NAME "Arithmetic" /* Subpackage full name. */
-#define SPACK_STRING SPACK_NAME" ("PACKAGE_STRING") "SPACK_VERSION
+#define SPACK_STRING SPACK_NAME" ("PACKAGE_NAME") "PACKAGE_VERSION
/* Do not use the main commonargs.h option reader for the --hdu
diff --git a/src/convertt/main.h b/src/convertt/main.h
index 4bf538f..28b2197 100644
--- a/src/convertt/main.h
+++ b/src/convertt/main.h
@@ -30,10 +30,9 @@ along with Gnuastro. If not, see
<http://www.gnu.org/licenses/>.
/* Progarm name macros: */
-#define SPACK_VERSION "0.1"
#define SPACK "astconvertt" /* Subpackage executable name. */
#define SPACK_NAME "ConvertType" /* Subpackage full name. */
-#define SPACK_STRING SPACK_NAME" ("PACKAGE_STRING") "SPACK_VERSION
+#define SPACK_STRING SPACK_NAME" ("PACKAGE_NAME") "PACKAGE_VERSION
diff --git a/src/convolve/main.h b/src/convolve/main.h
index 57cfd5d..1a9a7ba 100644
--- a/src/convolve/main.h
+++ b/src/convolve/main.h
@@ -32,10 +32,9 @@ along with Gnuastro. If not, see
<http://www.gnu.org/licenses/>.
/* Progarm name macros: */
-#define SPACK_VERSION "0.1"
#define SPACK "astconvolve" /* Subpackage executable name. */
#define SPACK_NAME "Convolve" /* Subpackage full name. */
-#define SPACK_STRING SPACK_NAME" ("PACKAGE_STRING") "SPACK_VERSION
+#define SPACK_STRING SPACK_NAME" ("PACKAGE_NAME") "PACKAGE_VERSION
diff --git a/src/cosmiccal/main.h b/src/cosmiccal/main.h
index a2cc5ba..1bf706e 100644
--- a/src/cosmiccal/main.h
+++ b/src/cosmiccal/main.h
@@ -26,10 +26,9 @@ along with Gnuastro. If not, see
<http://www.gnu.org/licenses/>.
#include "commonparams.h"
/* Progarm name macros: */
-#define SPACK_VERSION "0.1"
#define SPACK "astcosmiccal" /* Subpackage executable name. */
#define SPACK_NAME "CosmicCalculator" /* Subpackage full name. */
-#define SPACK_STRING SPACK_NAME" ("PACKAGE_STRING") "SPACK_VERSION
+#define SPACK_STRING SPACK_NAME" ("PACKAGE_NAME") "PACKAGE_VERSION
diff --git a/src/header/main.h b/src/header/main.h
index 66e1517..26b310a 100644
--- a/src/header/main.h
+++ b/src/header/main.h
@@ -27,10 +27,9 @@ along with Gnuastro. If not, see
<http://www.gnu.org/licenses/>.
#include "commonparams.h"
/* Progarm name macros: */
-#define SPACK_VERSION "0.1"
#define SPACK "astheader" /* Subpackage executable name. */
#define SPACK_NAME "Header" /* Subpackage full name. */
-#define SPACK_STRING SPACK_NAME" ("PACKAGE_STRING") "SPACK_VERSION
+#define SPACK_STRING SPACK_NAME" ("PACKAGE_NAME") "PACKAGE_VERSION
diff --git a/src/imgcrop/main.h b/src/imgcrop/main.h
index 09674aa..83d1e9f 100644
--- a/src/imgcrop/main.h
+++ b/src/imgcrop/main.h
@@ -31,10 +31,9 @@ along with Gnuastro. If not, see
<http://www.gnu.org/licenses/>.
/* Progarm name macros: */
-#define SPACK_VERSION "0.1"
#define SPACK "astimgcrop" /* Subpackage executable name. */
#define SPACK_NAME "ImageCrop" /* Subpackage full name. */
-#define SPACK_STRING SPACK_NAME" ("PACKAGE_STRING") "SPACK_VERSION
+#define SPACK_STRING SPACK_NAME" ("PACKAGE_NAME") "PACKAGE_VERSION
#define LOGFILENAME SPACK".log"
diff --git a/src/imgstat/main.h b/src/imgstat/main.h
index da275f0..2acdd9e 100644
--- a/src/imgstat/main.h
+++ b/src/imgstat/main.h
@@ -26,10 +26,9 @@ along with Gnuastro. If not, see
<http://www.gnu.org/licenses/>.
#include "commonparams.h"
/* Progarm name macros: */
-#define SPACK_VERSION "0.1"
#define SPACK "astimgstat" /* Subpackage executable name. */
#define SPACK_NAME "ImageStatistics" /* Subpackage full name. */
-#define SPACK_STRING SPACK_NAME" ("PACKAGE_STRING") "SPACK_VERSION
+#define SPACK_STRING SPACK_NAME" ("PACKAGE_NAME") "PACKAGE_VERSION
diff --git a/src/imgwarp/main.h b/src/imgwarp/main.h
index 583177d..65414fd 100644
--- a/src/imgwarp/main.h
+++ b/src/imgwarp/main.h
@@ -32,10 +32,9 @@ along with Gnuastro. If not, see
<http://www.gnu.org/licenses/>.
/* Progarm name macros: */
-#define SPACK_VERSION "0.1"
#define SPACK "astimgwarp" /* Subpackage executable name. */
#define SPACK_NAME "ImageWarp" /* Subpackage full name. */
-#define SPACK_STRING SPACK_NAME" ("PACKAGE_STRING") "SPACK_VERSION
+#define SPACK_STRING SPACK_NAME" ("PACKAGE_NAME") "PACKAGE_VERSION
#define LOGFILENAME SPACK".log"
diff --git a/src/mkcatalog/main.h b/src/mkcatalog/main.h
index 68faebc..037a5a4 100644
--- a/src/mkcatalog/main.h
+++ b/src/mkcatalog/main.h
@@ -27,10 +27,9 @@ along with Gnuastro. If not, see
<http://www.gnu.org/licenses/>.
#include "commonparams.h"
/* Progarm name macros: */
-#define SPACK_VERSION "0.1"
#define SPACK "astmkcatalog" /* Subpackage executable name. */
#define SPACK_NAME "MakeCatalog" /* Subpackage full name. */
-#define SPACK_STRING SPACK_NAME" ("PACKAGE_STRING") "SPACK_VERSION
+#define SPACK_STRING SPACK_NAME" ("PACKAGE_NAME") "PACKAGE_VERSION
diff --git a/src/mknoise/main.h b/src/mknoise/main.h
index cb5663f..be8795e 100644
--- a/src/mknoise/main.h
+++ b/src/mknoise/main.h
@@ -30,10 +30,9 @@ along with Gnuastro. If not, see
<http://www.gnu.org/licenses/>.
#include "commonparams.h"
/* Progarm name macros: */
-#define SPACK_VERSION "0.1"
#define SPACK "astmknoise" /* Subpackage executable name. */
#define SPACK_NAME "MakeNoise" /* Subpackage full name. */
-#define SPACK_STRING SPACK_NAME" ("PACKAGE_STRING") "SPACK_VERSION
+#define SPACK_STRING SPACK_NAME" ("PACKAGE_NAME") "PACKAGE_VERSION
diff --git a/src/mkprof/main.h b/src/mkprof/main.h
index fd46e28..ae5305d 100644
--- a/src/mkprof/main.h
+++ b/src/mkprof/main.h
@@ -31,10 +31,9 @@ along with Gnuastro. If not, see
<http://www.gnu.org/licenses/>.
/* Progarm name macros: */
-#define SPACK_VERSION "0.1"
#define SPACK "astmkprof" /* Subpackage executable name. */
#define SPACK_NAME "MakeProfiles" /* Subpackage full name. */
-#define SPACK_STRING SPACK_NAME" ("PACKAGE_STRING") "SPACK_VERSION
+#define SPACK_STRING SPACK_NAME" ("PACKAGE_NAME") "PACKAGE_VERSION
#define LOGFILENAME SPACK".log"
#define LOGNUMCOLS 5
diff --git a/src/noisechisel/main.h b/src/noisechisel/main.h
index 34da4a7..800de07 100644
--- a/src/noisechisel/main.h
+++ b/src/noisechisel/main.h
@@ -28,10 +28,9 @@ along with Gnuastro. If not, see
<http://www.gnu.org/licenses/>.
#include "commonparams.h"
/* Progarm name macros: */
-#define SPACK_VERSION "0.1"
#define SPACK "astnoisechisel" /* Subpackage executable name. */
#define SPACK_NAME "NoiseChisel" /* Subpackage full name. */
-#define SPACK_STRING SPACK_NAME" ("PACKAGE_STRING") "SPACK_VERSION
+#define SPACK_STRING SPACK_NAME" ("PACKAGE_NAME") "PACKAGE_VERSION
diff --git a/src/subtractsky/main.h b/src/subtractsky/main.h
index 43aebd4..0aa9a83 100644
--- a/src/subtractsky/main.h
+++ b/src/subtractsky/main.h
@@ -28,10 +28,9 @@ along with Gnuastro. If not, see
<http://www.gnu.org/licenses/>.
#include "commonparams.h"
/* Progarm name macros: */
-#define SPACK_VERSION "0.1"
#define SPACK "astsubtractsky" /* Subpackage executable name. */
#define SPACK_NAME "SubtractSky" /* Subpackage full name. */
-#define SPACK_STRING SPACK_NAME" ("PACKAGE_STRING") "SPACK_VERSION
+#define SPACK_STRING SPACK_NAME" ("PACKAGE_NAME") "PACKAGE_VERSION