all install programs support --version

and a version bump to 8.12 for the new dev cycle
This commit is contained in:
John Cupitt 2021-06-15 10:33:42 +01:00
parent 06b429955a
commit dc56a5aa65
7 changed files with 27 additions and 6 deletions

View File

@ -1,3 +1,6 @@
14/6/21 started 8.12
- all tools support `--version`
14/8/20 started 8.11 14/8/20 started 8.11
- add vips_jpegload_source() and vips_svgload_source() to public C API - add vips_jpegload_source() and vips_svgload_source() to public C API
- integrate doxygen in build system to generate C++ API docs - integrate doxygen in build system to generate C++ API docs

View File

@ -2,7 +2,7 @@
# also update the version number in the m4 macros below # also update the version number in the m4 macros below
AC_INIT([vips], [8.11.0], [vipsip@jiscmail.ac.uk]) AC_INIT([vips], [8.12.0], [vipsip@jiscmail.ac.uk])
# required for gobject-introspection # required for gobject-introspection
AC_PREREQ(2.62) AC_PREREQ(2.62)
@ -17,7 +17,7 @@ AC_CONFIG_MACRO_DIR([m4])
# user-visible library versioning # user-visible library versioning
m4_define([vips_major_version], [8]) m4_define([vips_major_version], [8])
m4_define([vips_minor_version], [11]) m4_define([vips_minor_version], [12])
m4_define([vips_micro_version], [0]) m4_define([vips_micro_version], [0])
m4_define([vips_version], m4_define([vips_version],
[vips_major_version.vips_minor_version.vips_micro_version]) [vips_major_version.vips_minor_version.vips_micro_version])
@ -42,9 +42,9 @@ VIPS_LIBS=""
# binary interface changes backwards compatible?: increment age # binary interface changes backwards compatible?: increment age
# binary interface changes not backwards compatible?: reset age to 0 # binary interface changes not backwards compatible?: reset age to 0
LIBRARY_CURRENT=55
LIBRARY_REVISION=0 LIBRARY_REVISION=0
LIBRARY_AGE=13 LIBRARY_CURRENT=56
LIBRARY_AGE=14
# patched into include/vips/version.h # patched into include/vips/version.h
AC_SUBST(VIPS_VERSION) AC_SUBST(VIPS_VERSION)

View File

@ -20,11 +20,11 @@ bin_SCRIPTS = \
batch_rubber_sheet \ batch_rubber_sheet \
batch_crop \ batch_crop \
vipsprofile \ vipsprofile \
vips-8.11 vips-8.12
EXTRA_DIST = \ EXTRA_DIST = \
vipsprofile \ vipsprofile \
vips-8.11 \ vips-8.12 \
light_correct.in \ light_correct.in \
shrink_width.in \ shrink_width.in \
batch_image_convert.in \ batch_image_convert.in \

View File

@ -79,6 +79,7 @@ static char *xoffset = NULL;
static char *yoffset = NULL; static char *yoffset = NULL;
static char *endian = NULL; static char *endian = NULL;
static gboolean setext = FALSE; static gboolean setext = FALSE;
static gboolean version = FALSE;
static GOptionEntry entries[] = { static GOptionEntry entries[] = {
{ "endian", 'n', 0, G_OPTION_ARG_STRING, &endian, { "endian", 'n', 0, G_OPTION_ARG_STRING, &endian,
@ -111,6 +112,8 @@ static GOptionEntry entries[] = {
N_( "set Ysize to N (deprecated, use height)" ), "N" }, N_( "set Ysize to N (deprecated, use height)" ), "N" },
{ "type", 't', 0, G_OPTION_ARG_STRING, &interpretation, { "type", 't', 0, G_OPTION_ARG_STRING, &interpretation,
N_( "set Type to T (deprecated, use interpretation)" ), "T" }, N_( "set Type to T (deprecated, use interpretation)" ), "T" },
{ "version", 'v', 0, G_OPTION_ARG_NONE, &version,
N_( "print version" ), NULL },
{ NULL } { NULL }
}; };
@ -170,6 +173,9 @@ main( int argc, char **argv )
for( argc = 0; argv[argc]; argc++ ) for( argc = 0; argv[argc]; argc++ )
; ;
if( version )
printf( "vips-%s\n", vips_version_string() );
if( argc != 2 ) { if( argc != 2 ) {
fprintf( stderr, _( "usage: %s [OPTION...] vips-file\n" ), fprintf( stderr, _( "usage: %s [OPTION...] vips-file\n" ),
g_get_prgname() ); g_get_prgname() );

View File

@ -84,6 +84,7 @@
static char *main_option_field = NULL; static char *main_option_field = NULL;
static gboolean main_option_all = FALSE; static gboolean main_option_all = FALSE;
static gboolean version = FALSE;
static GOptionEntry main_option[] = { static GOptionEntry main_option[] = {
{ "all", 'a', 0, G_OPTION_ARG_NONE, &main_option_all, { "all", 'a', 0, G_OPTION_ARG_NONE, &main_option_all,
@ -92,6 +93,8 @@ static GOptionEntry main_option[] = {
N_( "print value of FIELD (\"getext\" reads extension block, " N_( "print value of FIELD (\"getext\" reads extension block, "
"\"Hist\" reads image history)" ), "\"Hist\" reads image history)" ),
"FIELD" }, "FIELD" },
{ "version", 'v', 0, G_OPTION_ARG_NONE, &version,
N_( "print version" ), NULL },
{ NULL } { NULL }
}; };
@ -207,6 +210,9 @@ main( int argc, char *argv[] )
g_option_context_free( context ); g_option_context_free( context );
if( version )
printf( "vips-%s\n", vips_version_string() );
result = 0; result = 0;
for( i = 1; argv[i]; i++ ) { for( i = 1; argv[i]; i++ ) {

View File

@ -138,6 +138,7 @@ static gboolean crop_image = FALSE;
static gboolean no_rotate_image = FALSE; static gboolean no_rotate_image = FALSE;
static char *smartcrop_image = NULL; static char *smartcrop_image = NULL;
static char *thumbnail_intent = NULL; static char *thumbnail_intent = NULL;
static gboolean version = FALSE;
/* Deprecated and unused. /* Deprecated and unused.
*/ */
@ -183,6 +184,8 @@ static GOptionEntry options[] = {
{ "no-rotate", 0, 0, { "no-rotate", 0, 0,
G_OPTION_ARG_NONE, &no_rotate_image, G_OPTION_ARG_NONE, &no_rotate_image,
N_( "don't auto-rotate" ), NULL }, N_( "don't auto-rotate" ), NULL },
{ "version", 'v', 0, G_OPTION_ARG_NONE, &version,
N_( "print version" ), NULL },
{ "format", 'f', G_OPTION_FLAG_HIDDEN, { "format", 'f', G_OPTION_FLAG_HIDDEN,
G_OPTION_ARG_STRING, &output_format, G_OPTION_ARG_STRING, &output_format,
@ -528,6 +531,9 @@ main( int argc, char **argv )
g_option_context_free( context ); g_option_context_free( context );
if( version )
printf( "vips-%s\n", vips_version_string() );
if( thumbnail_size && if( thumbnail_size &&
thumbnail_parse_geometry( thumbnail_size ) ) thumbnail_parse_geometry( thumbnail_size ) )
vips_error_exit( NULL ); vips_error_exit( NULL );