From dc7b8c53f4bc94626634887e46167a367a91f707 Mon Sep 17 00:00:00 2001 From: Ales Hvezda Date: Wed, 4 Jul 2007 23:32:15 -0400 Subject: [PATCH] Changed gEDA/gaf's version mechanism to use new dotted X.Y.Z convention Added DOTTED_VERSION and DATE_VERSION variables to all configure.ac[.in] files. Changed all version related output to be DOTTED_VERSION.DATE_VERSION. Updated the configure.ac[.in] files to have consistent top sections. Updated code and various scheme files to use the new DOTTED_VERSION and DATE_VERSION variables available via config.h. Stopped using PREPEND_VERSION_STRING as the mechanism for doing the dotted versions (not intended for that use). Updated update-versions.sh script to set the version in all the configure.ac[.in] files and the toplevel Makefile. Went through all the g_rc.c files and make the handling of rc file mismatch handling consistent. --- Makefile | 13 +++++++++---- docs/configure.ac | 13 +++++++++---- examples/configure.ac | 13 +++++++++---- gattrib/configure.ac | 24 ++++++++++++++---------- gattrib/lib/system-gattribrc.in | 2 +- gattrib/src/g_rc.c | 12 ++++++------ gattrib/src/gattrib.c | 6 ++++-- gattrib/src/x_dialog.c | 9 +++++---- gnetlist/configure.ac | 17 +++++++++++------ gnetlist/lib/system-gnetlistrc.in | 2 +- gnetlist/src/g_rc.c | 14 +++++++++----- gnetlist/src/gnetlist.c | 6 ++++-- gschem/configure.ac.in | 19 +++++++++++-------- gschem/lib/system-gschemrc.in | 2 +- gschem/src/g_rc.c | 13 +++++++------ gschem/src/gschem.c | 7 ++++--- gschem/src/x_dialog.c | 5 +++-- gsymcheck/configure.ac | 17 +++++++++++------ gsymcheck/lib/system-gsymcheckrc.in | 2 +- gsymcheck/src/g_rc.c | 14 +++++++------- gsymcheck/src/gsymcheck.c | 4 ++-- libgeda/configure.ac | 18 ++++++++++-------- libgeda/include/defines.h | 12 +++++------- libgeda/libgeda.pc.in | 2 +- libgeda/src/a_basic.c | 4 ++-- libgeda/src/f_print.c | 2 +- symbols/configure.ac | 12 +++++++----- update-versions.sh | 35 +++++++++++++++++++++-------------- utils/configure.ac | 17 +++++++++++------ utils/gschlas/g_rc.c | 17 ++++++++++------- utils/gschlas/gschlas.c | 3 ++- utils/lib/system-gschlasrc.in | 2 +- utils/src/grenum.c | 3 ++- 33 files changed, 202 insertions(+), 139 deletions(-) diff --git a/Makefile b/Makefile index a43787839..63a99e3a8 100644 --- a/Makefile +++ b/Makefile @@ -3,12 +3,17 @@ # # -# Change this to the real version of the distribution +# These variables hold the the master version of gEDA/gaf. +# Change this to the real version of the distribution. However +# you still need to update all the configure.ac[.in] scripts; this +# can be accomplished by running ./update-versions.sh with the correct +# arguments. # -VERSION=20070526 +DOTTED_VERSION=1.1 +DATE_VERSION=20070526 # -# Use this when you are building the CVS version +# Use this when you are building the repository version # CD_VERSION= DIR_PREFIX= @@ -16,7 +21,7 @@ DIR_PREFIX= # # Use this when you are building the Released version (comment out above) # -#CD_VERSION=-$(VERSION) +#CD_VERSION=-$(DOTTED_VERSION) #DIR_PREFIX=geda- # diff --git a/docs/configure.ac b/docs/configure.ac index 7a13a7364..0f149d68a 100644 --- a/docs/configure.ac +++ b/docs/configure.ac @@ -1,12 +1,15 @@ # Process this file with autoconf to produce a configure script. AC_INIT +AC_CONFIG_SRCDIR([wiki/index.html]) +AC_PREREQ(2.54) -VERSION=20070526 +DOTTED_VERSION=1.1 +DATE_VERSION=20070526 PACKAGE=geda-docs -echo Configuring $PACKAGE version $VERSION +echo Configuring $PACKAGE version $DOTTED_VERSION.$DATE_VERSION # Init automake -AM_INIT_AUTOMAKE($PACKAGE, $VERSION) +AM_INIT_AUTOMAKE($PACKAGE, $DOTTED_VERSION, no-define) # Check for programs. @@ -39,6 +42,8 @@ expandgedadocdir=`echo $gedadocdir` GEDADOCDIR=$expandgedadocdir AC_SUBST(GEDADOCDIR) +AC_SUBST(DATE_VERSION) +AC_SUBST(DOTTED_VERSION) AC_DEFUN([GEDA_DECLARE_DOCS], [ @@ -83,7 +88,7 @@ AC_OUTPUT expandedGEDADOCDIR=`eval "echo $GEDADOCDIR"` AC_MSG_RESULT([ -** Configuration summary for $PACKAGE $VERSION: +** Configuration summary for $PACKAGE $DOTTED_VERSION.$DATE_VERSION: documentation directory: $expandedGEDADOCDIR ]) diff --git a/examples/configure.ac b/examples/configure.ac index 1f702edbd..a79fa707d 100644 --- a/examples/configure.ac +++ b/examples/configure.ac @@ -1,12 +1,15 @@ # Process this file with autoconf to produce a configure script. AC_INIT +AC_CONFIG_SRCDIR([gTAG/gTAG.sch]) +AC_PREREQ(2.54) PACKAGE=geda-examples -VERSION=20070526 -echo Configuring $PACKAGE version $VERSION +DOTTED_VERSION=1.1 +DATE_VERSION=20070526 +echo Configuring $PACKAGE version $DOTTED_VERSION.$DATE_VERSION # Initialize automake -AM_INIT_AUTOMAKE($PACKAGE, $VERSION, no-define) +AM_INIT_AUTOMAKE($PACKAGE, $DOTTED_VERSION, no-define) # Expand the prefix variable @@ -26,6 +29,8 @@ expandgedadocdir=`echo $gedadocdir` GEDADOCDIR=$expandgedadocdir AC_SUBST(GEDADOCDIR) +AC_SUBST(DATE_VERSION) +AC_SUBST(DOTTED_VERSION) AC_CONFIG_FILES([ Makefile @@ -42,6 +47,6 @@ AC_CONFIG_FILES([ AC_OUTPUT AC_MSG_RESULT([ -** Configuration complete for $PACKAGE $VERSION +** Configuration complete for $PACKAGE $DOTTED_VERSION.$DATE_VERSION ]) diff --git a/gattrib/configure.ac b/gattrib/configure.ac index 9d56cd5c6..d87d9f8de 100644 --- a/gattrib/configure.ac +++ b/gattrib/configure.ac @@ -1,14 +1,15 @@ -dr Process this file with autoconf to produce a configure script. +# Process this file with autoconf to produce a configure script. AC_INIT AC_CONFIG_SRCDIR([src/gattrib.c]) -AC_PREREQ(2.53) +AC_PREREQ(2.54) PACKAGE=geda-gattrib -VERSION=20070526 -echo Configuring $PACKAGE version $VERSION +DOTTED_VERSION=1.1 +DATE_VERSION=20070526 +echo Configuring $PACKAGE version $DOTTED_VERSION.$DATE_VERSION -# Initialize automake -- use base gEDA version here -AM_INIT_AUTOMAKE($PACKAGE, $VERSION) +# Initialize automake +AM_INIT_AUTOMAKE($PACKAGE, $DOTTED_VERSION, no-define) AM_CONFIG_HEADER([config.h]) # Initialize maintainer mode @@ -138,7 +139,7 @@ AM_CONDITIONAL(GTK24_SOURCE, test "$GLIB24" = "yes") ############################################################################ # Check for libgeda start # -PKG_CHECK_MODULES(LIBGEDA, libgeda >= $VERSION, LIBGEDA="yes", +PKG_CHECK_MODULES(LIBGEDA, libgeda >= $DATE_VERSION, LIBGEDA="yes", no_LIBGEDA="yes") if test "$LIBGEDA" = "yes" @@ -311,7 +312,9 @@ expandgedadatadir=`echo $gedatopdir` # this has to be expanded ( no ${prefix} ) -- AC_DEFINE_UNQUOTED(GEDADATADIR, "$gedatopdir", [gEDA/gaf's data directory]) -AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Currently running version of gEDA/gaf]) +AC_DEFINE_UNQUOTED(DATE_VERSION, "$DATE_VERSION", [Currently running date version of gEDA/gaf]) +AC_DEFINE_UNQUOTED(DOTTED_VERSION, "$DOTTED_VERSION", [Currently running dotted version of gEDA/gaf]) +AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of this program's package]) # # gEDA/gaf specify things which need to setup @@ -322,6 +325,8 @@ GATTRIB_CFLAGS="$GTK_CFLAGS $GLIB_CFLAGS $LIBGEDA_CFLAGS $GTHREAD_CFLAGS" GATTRIB_LDFLAGS="$GTK_LIBS $GLIB_LIBS $LIBGEDA_LIBS $GTHREAD_LIBS" # Makefile.in variable substitution +AC_SUBST(DATE_VERSION) +AC_SUBST(DOTTED_VERSION) AC_SUBST(GATTRIB_CFLAGS) AC_SUBST(GATTRIB_LDFLAGS) AC_SUBST(GEDARCDIR) @@ -345,9 +350,8 @@ expandedGEDADATADIR=`eval "echo $GEDADATADIR"` expandedGEDARCDIR=`eval "echo $GEDARCDIR"` AC_MSG_RESULT([ -***** Configuration summary for $PACKAGE VERSION ***** +***** Configuration summary for $PACKAGE $DOTTED_VERSION.$DATE_VERSION ***** -== base gEDA version: $VERSION == libgeda library version: $LIBGEDA_VERSION == data directory: $expandedGEDADATADIR == rc directory: $expandedGEDARCDIR diff --git a/gattrib/lib/system-gattribrc.in b/gattrib/lib/system-gattribrc.in index b78a62d78..852af6a3c 100644 --- a/gattrib/lib/system-gattribrc.in +++ b/gattrib/lib/system-gattribrc.in @@ -15,7 +15,7 @@ ; that the rc file is compatible with the version of gschem that is ; being run. The end user should *not* change this value. ; -(gattrib-version "@VERSION@") +(gattrib-version "@DATE_VERSION@") ; Setup data path variables. ; diff --git a/gattrib/src/g_rc.c b/gattrib/src/g_rc.c index 95c972851..b8a5a5784 100644 --- a/gattrib/src/g_rc.c +++ b/gattrib/src/g_rc.c @@ -68,15 +68,15 @@ SCM g_rc_gattrib_version(SCM version) SCM_ASSERT (scm_is_string (version), version, SCM_ARG1, "gattrib-version"); - if (g_strcasecmp (SCM_STRING_CHARS (version), VERSION) != 0) { + if (g_strcasecmp (SCM_STRING_CHARS (version), DATE_VERSION) != 0) { fprintf(stderr, - "You are running gEDA version [%s%s],\n", PREPEND_VERSION_STRING, - VERSION); + "You are running gEDA/gaf version [%s%s.%s],\n", + PREPEND_VERSION_STRING, DOTTED_VERSION, DATE_VERSION); fprintf(stderr, - "but you have a version [%s] gattribrc file:\n[%s]\n", - SCM_STRING_CHARS (version), rc_filename); + "but you have a version [%s] gattribrc file:\n[%s]\n", + SCM_STRING_CHARS (version), rc_filename); fprintf(stderr, - "Please run a version of gattrib compatible with your gEDA installation.\n"); + "Please be sure that you have the latest rc file.\n"); return SCM_BOOL_F; } diff --git a/gattrib/src/gattrib.c b/gattrib/src/gattrib.c index 2e95db4f2..9d295d012 100644 --- a/gattrib/src/gattrib.c +++ b/gattrib/src/gattrib.c @@ -152,7 +152,8 @@ void gattrib_main(void *closure, int argc, char *argv[]) g_free (logfile); s_log_message - ("gEDA/gattrib version %s%s\n", PREPEND_VERSION_STRING, VERSION); + ("gEDA/gattrib version %s%s.%s\n", PREPEND_VERSION_STRING, + DOTTED_VERSION, DATE_VERSION); s_log_message ("gEDA/gattrib comes with ABSOLUTELY NO WARRANTY; see COPYING for more details.\n"); s_log_message @@ -164,7 +165,8 @@ void gattrib_main(void *closure, int argc, char *argv[]) fflush(stderr); fflush(stdout); fprintf(stderr, - "gEDA/gattrib version %s%s\n", PREPEND_VERSION_STRING, VERSION); + "gEDA/gattrib version %s%s.%s\n", PREPEND_VERSION_STRING, + DOTTED_VERSION, DATE_VERSION); fprintf(stderr, "gEDA/gattrib comes with ABSOLUTELY NO WARRANTY; see COPYING for more details.\n"); fprintf(stderr, diff --git a/gattrib/src/x_dialog.c b/gattrib/src/x_dialog.c index 67ad1b678..204e27e8d 100644 --- a/gattrib/src/x_dialog.c +++ b/gattrib/src/x_dialog.c @@ -339,7 +339,7 @@ void x_dialog_about_dialog() GtkWidget *dialog; const char *string = "gEDA : GPL Electronic Design Automation\n\n" "This is gattrib -- gEDA's attribute editor\n\n" - "Gattrib version: %s%s\n\n" + "Gattrib version: %s%s.%s\n\n" "Gattrib is written by: Stuart Brorson (sdb@cloud9.net)\n" "with generous helpings of code from gschem, gnetlist, \n" "and gtkextra, as well as support from the gEDA community."; @@ -347,9 +347,10 @@ void x_dialog_about_dialog() /* Create the dialog */ dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL, - GTK_MESSAGE_INFO, - GTK_BUTTONS_OK, - string, PREPEND_VERSION_STRING, VERSION); + GTK_MESSAGE_INFO, + GTK_BUTTONS_OK, + string, PREPEND_VERSION_STRING, + DOTTED_VERSION, DATE_VERSION); gtk_window_set_title(GTK_WINDOW(dialog), "About..."); diff --git a/gnetlist/configure.ac b/gnetlist/configure.ac index af1b0c8d2..d326ac2f6 100644 --- a/gnetlist/configure.ac +++ b/gnetlist/configure.ac @@ -4,11 +4,12 @@ AC_CONFIG_SRCDIR([src/gnetlist.c]) AC_PREREQ(2.54) PACKAGE=geda-gnetlist -VERSION=20070526 -echo Configuring $PACKAGE version $VERSION +DOTTED_VERSION=1.1 +DATE_VERSION=20070526 +echo Configuring $PACKAGE version $DOTTED_VERSION.$DATE_VERSION # Initialize automake -AM_INIT_AUTOMAKE($PACKAGE, $VERSION) +AM_INIT_AUTOMAKE($PACKAGE, $DOTTED_VERSION, no-define) AM_CONFIG_HEADER([config.h]) # Initialize maintainer mode @@ -202,7 +203,7 @@ fi ############################################################################ # Check for libgeda start # -PKG_CHECK_MODULES(LIBGEDA, libgeda >= $VERSION, LIBGEDA="yes", +PKG_CHECK_MODULES(LIBGEDA, libgeda >= $DATE_VERSION, LIBGEDA="yes", no_LIBGEDA="yes") if test "$LIBGEDA" = "yes" @@ -351,7 +352,9 @@ AC_SUBST(GEDADOCDIR) # this has to be expanded ( no ${prefix} ) -- AC_DEFINE_UNQUOTED(GEDADATADIR, "$gedatopdir", [gEDA/gaf's data directory]) -AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Currently running version of gEDA/gaf]) +AC_DEFINE_UNQUOTED(DATE_VERSION, "$DATE_VERSION", [Currently running date version of gEDA/gaf]) +AC_DEFINE_UNQUOTED(DOTTED_VERSION, "$DOTTED_VERSION", [Currently running dotted version of gEDA/gaf]) +AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of this program's package]) # # gEDA/gaf specify things which need to setup @@ -362,6 +365,8 @@ GNETLIST_CFLAGS="$LIBGEDA_CFLAGS" GNETLIST_LDFLAGS="$LIBGEDA_LIBS $DMALLOC_LIBS" # Makefile.in variable substitution +AC_SUBST(DATE_VERSION) +AC_SUBST(DOTTED_VERSION) AC_SUBST(GNETLIST_CFLAGS) AC_SUBST(GNETLIST_LDFLAGS) AC_SUBST(GEDARCDIR) @@ -407,7 +412,7 @@ expandedGEDADOCDIR=`eval "echo $GEDADOCDIR"` expandedPCBM4DIR=`eval "echo $PCBM4DIR"` AC_MSG_RESULT([ -** Configuration summary for $PACKAGE $VERSION: +** Configuration summary for $PACKAGE $DOTTED_VERSION.$DATE_VERSION: GTK+ library version: $GTK_VERSION libgeda library version: $LIBGEDA_VERSION diff --git a/gnetlist/lib/system-gnetlistrc.in b/gnetlist/lib/system-gnetlistrc.in index 96f550df6..f92cb40bf 100644 --- a/gnetlist/lib/system-gnetlistrc.in +++ b/gnetlist/lib/system-gnetlistrc.in @@ -15,7 +15,7 @@ ; that the rc file is compatible with the version of gschem that is ; being run. The end user should *not* change this value. ; -(gnetlist-version "@VERSION@") +(gnetlist-version "@DATE_VERSION@") ; Setup data path variables. ; diff --git a/gnetlist/src/g_rc.c b/gnetlist/src/g_rc.c index d3d1fb315..471ca61c8 100644 --- a/gnetlist/src/g_rc.c +++ b/gnetlist/src/g_rc.c @@ -115,15 +115,19 @@ SCM g_rc_gnetlist_version(SCM version) SCM_ASSERT (scm_is_string (version), version, SCM_ARG1, "gnetlist-version"); - if (strcmp (SCM_STRING_CHARS (version), VERSION) != 0) { + if (strcmp (SCM_STRING_CHARS (version), DATE_VERSION) != 0) { fprintf(stderr, - "Found a version [%s] gnetlist file:\n[%s]\n", - SCM_STRING_CHARS (version), rc_filename); + "You are running gEDA/gaf version [%s%s.%s],\n", + PREPEND_VERSION_STRING, DOTTED_VERSION, DATE_VERSION); fprintf(stderr, - "While gnetlist is in ALPHA, please be sure that you have the latest rc file.\n"); + "but you have a version [%s] gnetlistrc file:\n[%s]\n", + SCM_STRING_CHARS (version), rc_filename); + fprintf(stderr, + "Please be sure that you have the latest rc file.\n"); + return SCM_BOOL_F; } - return scm_from_int (0); + return SCM_BOOL_T; } diff --git a/gnetlist/src/gnetlist.c b/gnetlist/src/gnetlist.c index abdd10b7c..77fc97afd 100644 --- a/gnetlist/src/gnetlist.c +++ b/gnetlist/src/gnetlist.c @@ -155,7 +155,8 @@ void main_prog(void *closure, int argc, char *argv[]) s_log_init (logfile); g_free (logfile); - s_log_message("gEDA/gnetlist version %s%s\n", PREPEND_VERSION_STRING, VERSION); + s_log_message("gEDA/gnetlist version %s%s.%s\n", PREPEND_VERSION_STRING, + DOTTED_VERSION, DATE_VERSION); s_log_message ("gEDA/gnetlist comes with ABSOLUTELY NO WARRANTY; see COPYING for more details.\n"); s_log_message @@ -164,7 +165,8 @@ void main_prog(void *closure, int argc, char *argv[]) ("conditions; please see the COPYING file for more details.\n\n"); if (!quiet_mode) { - fprintf(stderr, "gEDA/gnetlist version %s%s\n", PREPEND_VERSION_STRING, VERSION); + fprintf(stderr, "gEDA/gnetlist version %s%s.%s\n", + PREPEND_VERSION_STRING, DOTTED_VERSION, DATE_VERSION); fprintf(stderr, "gEDA/gnetlist comes with ABSOLUTELY NO WARRANTY; see COPYING for more details.\n"); fprintf(stderr, diff --git a/gschem/configure.ac.in b/gschem/configure.ac.in index 8cb5fc463..e61b5d08f 100644 --- a/gschem/configure.ac.in +++ b/gschem/configure.ac.in @@ -1,16 +1,15 @@ -# $Id$ -# # Process this file with autoconf to produce a configure script. AC_INIT AC_CONFIG_SRCDIR([src/gschem.c]) AC_PREREQ(2.54) PACKAGE=geda-gschem -VERSION=20070526 -echo Configuring $PACKAGE version $VERSION +DOTTED_VERSION=1.1 +DATE_VERSION=20070526 +echo Configuring $PACKAGE version $DOTTED_VERSION.$DATE_VERSION # Initialize automake -AM_INIT_AUTOMAKE($PACKAGE, $VERSION) +AM_INIT_AUTOMAKE($PACKAGE, $DOTTED_VERSION, no-define) AM_CONFIG_HEADER([config.h]) # Initialize maintainer mode @@ -228,7 +227,7 @@ fi ############################################################################ # Check for libgeda start # -PKG_CHECK_MODULES(LIBGEDA, libgeda >= $VERSION, LIBGEDA="yes", +PKG_CHECK_MODULES(LIBGEDA, libgeda >= $DATE_VERSION, LIBGEDA="yes", no_LIBGEDA="yes") if test "$LIBGEDA" = "yes" @@ -473,7 +472,9 @@ AC_SUBST(GEDADOCDIR) # this has to be expanded ( no ${prefix} ) -- AC_DEFINE_UNQUOTED(GEDADATADIR, "$gedatopdir", [gEDA/gaf's data directory]) -AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Currently running version of gEDA/gaf]) +AC_DEFINE_UNQUOTED(DATE_VERSION, "$DATE_VERSION", [Currently running date version of gEDA/gaf]) +AC_DEFINE_UNQUOTED(DOTTED_VERSION, "$DOTTED_VERSION", [Currently running dotted version of gEDA/gaf]) +AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of this program's package]) # # gEDA/gaf specify things which need to setup @@ -488,6 +489,8 @@ GSCHEM_CFLAGS="$LIBSTROKE_CFLAGS $LIBGEDA_CFLAGS $GTHREAD_CFLAGS" GSCHEM_LDFLAGS="$LIBSTROKE_LIBS $LIBGEDA_LIBS $GTK_LIBS $X_LDFLAGS $DMALLOC_LIBS $GTHREAD_LIBS" # Makefile.in variable substitution +AC_SUBST(DATE_VERSION) +AC_SUBST(DOTTED_VERSION) AC_SUBST(GSCHEM_CFLAGS) AC_SUBST(GSCHEM_LDFLAGS) AC_SUBST(GEDADATADIR) @@ -522,7 +525,7 @@ expandedGEDARCDIR=`eval "echo $GEDARCDIR"` expandedGEDADOCDIR=`eval "echo $GEDADOCDIR"` AC_MSG_RESULT([ -** Configuration summary for $PACKAGE $VERSION: +** Configuration summary for $PACKAGE $DOTTED_VERSION.$DATE_VERSION: GTK+ library version: $GTK_VERSION GUILE library version: $GUILE_VERSION diff --git a/gschem/lib/system-gschemrc.in b/gschem/lib/system-gschemrc.in index 2098a2464..0fb6132c7 100644 --- a/gschem/lib/system-gschemrc.in +++ b/gschem/lib/system-gschemrc.in @@ -15,7 +15,7 @@ ; that the rc file is compatible with the version of gschem that is ; being run. The end user should *not* change this value. ; -(gschem-version "@VERSION@") +(gschem-version "@DATE_VERSION@") ; ; Start of color section diff --git a/gschem/src/g_rc.c b/gschem/src/g_rc.c index 63c98dd8b..9c30e8967 100644 --- a/gschem/src/g_rc.c +++ b/gschem/src/g_rc.c @@ -102,14 +102,15 @@ SCM g_rc_gschem_version(SCM version) SCM_ASSERT (scm_is_string (version), version, SCM_ARG1, "gschem-version"); - if (g_strcasecmp (SCM_STRING_CHARS (version), VERSION) != 0) { + if (g_strcasecmp (SCM_STRING_CHARS (version), DATE_VERSION) != 0) { fprintf(stderr, - _("Found a version [%s%s] gschemrc file:\n[%s]\n"), - PREPEND_VERSION_STRING, SCM_STRING_CHARS (version), - rc_filename); + "You are running gEDA/gaf version [%s%s.%s],\n", + PREPEND_VERSION_STRING, DOTTED_VERSION, DATE_VERSION); fprintf(stderr, - _("While gschem is in ALPHA, " - "please be sure that you have the latest rc file.\n")); + "but you have a version [%s] gschemrc file:\n[%s]\n", + SCM_STRING_CHARS (version), rc_filename); + fprintf(stderr, + "Please be sure that you have the latest rc file.\n"); ret = SCM_BOOL_F; } else { ret = SCM_BOOL_T; diff --git a/gschem/src/gschem.c b/gschem/src/gschem.c index e109eba70..015b3f8db 100644 --- a/gschem/src/gschem.c +++ b/gschem/src/gschem.c @@ -188,8 +188,8 @@ void main_prog(void *closure, int argc, char *argv[]) #endif s_log_message( - _("gEDA/gschem version %s%s\n"), PREPEND_VERSION_STRING, - VERSION); + _("gEDA/gschem version %s%s.%s\n"), PREPEND_VERSION_STRING, + DOTTED_VERSION, DATE_VERSION); s_log_message( _("gEDA/gschem comes with ABSOLUTELY NO WARRANTY; see COPYING for more details.\n")); s_log_message( @@ -199,7 +199,8 @@ void main_prog(void *closure, int argc, char *argv[]) if (!quiet_mode) { fprintf(stderr, - _("gEDA/gschem version %s%s\n"), PREPEND_VERSION_STRING, VERSION); + _("gEDA/gschem version %s%s.%s\n"), PREPEND_VERSION_STRING, + DOTTED_VERSION, DATE_VERSION); fprintf(stderr, _("gEDA/gschem comes with ABSOLUTELY NO WARRANTY; see COPYING for more details.\n")); fprintf(stderr, diff --git a/gschem/src/x_dialog.c b/gschem/src/x_dialog.c index ed0ed50ce..44bf763fd 100644 --- a/gschem/src/x_dialog.c +++ b/gschem/src/x_dialog.c @@ -2032,8 +2032,9 @@ void about_dialog (TOPLEVEL *w_current) gtk_label_set_use_markup (GTK_LABEL(label), TRUE); gtk_box_pack_start(GTK_BOX(vbox), label, TRUE, TRUE, 0); - string = g_strdup_printf(_("gschem version %s%s"), - PREPEND_VERSION_STRING, VERSION); + string = g_strdup_printf(_("gschem version %s%s.%s"), + PREPEND_VERSION_STRING, DOTTED_VERSION, + DATE_VERSION); label = gtk_label_new (string); gtk_label_set_use_markup (GTK_LABEL(label), TRUE); g_free(string); diff --git a/gsymcheck/configure.ac b/gsymcheck/configure.ac index 11b8cb1e4..14f46b30e 100644 --- a/gsymcheck/configure.ac +++ b/gsymcheck/configure.ac @@ -4,11 +4,12 @@ AC_CONFIG_SRCDIR([src/gsymcheck.c]) AC_PREREQ(2.54) PACKAGE=geda-gsymcheck -VERSION=20070526 -echo Configuring $PACKAGE version $VERSION +DOTTED_VERSION=1.1 +DATE_VERSION=20070526 +echo Configuring $PACKAGE version $DOTTED_VERSION.$DATE_VERSION # Initialize automake -AM_INIT_AUTOMAKE($PACKAGE, $VERSION) +AM_INIT_AUTOMAKE($PACKAGE, $DOTTED_VERSION, no-define) AM_CONFIG_HEADER([config.h]) # Initialize maintainer mode @@ -116,7 +117,7 @@ fi ############################################################################ # Check for libgeda start # -PKG_CHECK_MODULES(LIBGEDA, libgeda >= $VERSION, LIBGEDA="yes", +PKG_CHECK_MODULES(LIBGEDA, libgeda >= $DATE_VERSION, LIBGEDA="yes", no_LIBGEDA="yes") if test "$LIBGEDA" = "yes" @@ -215,7 +216,9 @@ AC_SUBST(GEDADOCDIR) # this has to be expanded ( no ${prefix} ) -- AC_DEFINE_UNQUOTED(GEDADATADIR, "$gedatopdir", [gEDA/gaf's data directory]) -AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Currently running version of gEDA/gaf]) +AC_DEFINE_UNQUOTED(DATE_VERSION, "$DATE_VERSION", [Currently running date version of gEDA/gaf]) +AC_DEFINE_UNQUOTED(DOTTED_VERSION, "$DOTTED_VERSION", [Currently running dotted version of gEDA/gaf]) +AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of this program's package]) # # gEDA/gaf specify things which need to setup @@ -226,6 +229,8 @@ GSYMCHECK_CFLAGS="$LIBGEDA_CFLAGS" GSYMCHECK_LDFLAGS="$LIBGEDA_LIBS" # Makefile.in variable substitution +AC_SUBST(DATE_VERSION) +AC_SUBST(DOTTED_VERSION) AC_SUBST(GSYMCHECK_CFLAGS) AC_SUBST(GSYMCHECK_LDFLAGS) AC_SUBST(GEDARCDIR) @@ -252,7 +257,7 @@ expandedGEDARCDIR=`eval "echo $GEDARCDIR"` expandedGEDADOCDIR=`eval "echo $GEDADOCDIR"` AC_MSG_RESULT([ -** Configuration summary for $PACKAGE $VERSION: +** Configuration summary for $PACKAGE $DOTTED_VERSION.$DATE_VERSION: GTK+ library version: $GTK_VERSION libgeda library version: $LIBGEDA_VERSION diff --git a/gsymcheck/lib/system-gsymcheckrc.in b/gsymcheck/lib/system-gsymcheckrc.in index a121e741a..d4b78aeb7 100644 --- a/gsymcheck/lib/system-gsymcheckrc.in +++ b/gsymcheck/lib/system-gsymcheckrc.in @@ -15,7 +15,7 @@ ; that the rc file is compatible with the version of gschem that is ; being run. The end user should *not* change this value. ; -(gsymcheck-version "@VERSION@") +(gsymcheck-version "@DATE_VERSION@") ; Setup data path variables. ; diff --git a/gsymcheck/src/g_rc.c b/gsymcheck/src/g_rc.c index c9bee24a5..0ffc6010f 100644 --- a/gsymcheck/src/g_rc.c +++ b/gsymcheck/src/g_rc.c @@ -115,17 +115,17 @@ SCM g_rc_gsymcheck_version(SCM version) SCM_ASSERT (scm_is_string (version), version, SCM_ARG1, "gsymcheck-version"); - if (g_strcasecmp (SCM_STRING_CHARS (version), VERSION) != 0) { + if (g_strcasecmp (SCM_STRING_CHARS (version), DATE_VERSION) != 0) { fprintf(stderr, - "You are running gEDA version [%s%s],\n", PREPEND_VERSION_STRING, - VERSION); + "You are running gEDA/gaf version [%s%s.%s],\n", + PREPEND_VERSION_STRING, DOTTED_VERSION, DATE_VERSION); fprintf(stderr, - "but you have a version [%s] gsymcheck file:\n[%s]\n", - SCM_STRING_CHARS (version), rc_filename); + "but you have a version [%s] gsymcheckrc file:\n[%s]\n", + SCM_STRING_CHARS (version), rc_filename); fprintf(stderr, - "While gsymcheck is in ALPHA, " - "please be sure that you have the latest rc file.\n"); + "Please be sure that you have the latest rc file.\n"); return SCM_BOOL_F; + } return SCM_BOOL_T; diff --git a/gsymcheck/src/gsymcheck.c b/gsymcheck/src/gsymcheck.c index 3c3fde75f..12601a470 100644 --- a/gsymcheck/src/gsymcheck.c +++ b/gsymcheck/src/gsymcheck.c @@ -78,8 +78,8 @@ main_prog(void *closure, int argc, char *argv[]) if (!quiet_mode) { s_log_message( - "gEDA/gsymcheck version %s%s\n", PREPEND_VERSION_STRING, - VERSION); + "gEDA/gsymcheck version %s%s.%s\n", PREPEND_VERSION_STRING, + DOTTED_VERSION, DATE_VERSION); s_log_message( "gEDA/symcheck comes with ABSOLUTELY NO WARRANTY; see COPYING for more details.\n"); s_log_message( diff --git a/libgeda/configure.ac b/libgeda/configure.ac index 498edc6ae..149d84068 100644 --- a/libgeda/configure.ac +++ b/libgeda/configure.ac @@ -1,17 +1,16 @@ -# $Id$ -# # Process this file with autoconf to produce a configure script. AC_INIT AC_CONFIG_SRCDIR([include/libgeda.h]) AC_PREREQ(2.54) PACKAGE=libgeda -VERSION=20070526 +DOTTED_VERSION=1.1 +DATE_VERSION=20070526 SHARED_LIBRARY_VERSION=29:0:0 -echo Configuring $PACKAGE version $VERSION +echo Configuring $PACKAGE version $DOTTED_VERSION.$DATE_VERSION # Init automake -AM_INIT_AUTOMAKE($PACKAGE, $VERSION, no-define) +AM_INIT_AUTOMAKE($PACKAGE, $DOTTED_VERSION, no-define) AM_CONFIG_HEADER([config.h]) # Init libtool @@ -388,7 +387,9 @@ expandgedadatadir=`echo $gedatopdir` # this has to be expanded ( no ${prefix} ) -- AC_DEFINE_UNQUOTED(GEDADATADIR, "$gedatopdir", [gEDA/gaf's data directory]) -AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Currently running version of gEDA/gaf]) +AC_DEFINE_UNQUOTED(DATE_VERSION, "$DATE_VERSION", [Currently running date version of gEDA/gaf]) +AC_DEFINE_UNQUOTED(DOTTED_VERSION, "$DOTTED_VERSION", [Currently running dotted version of gEDA/gaf]) +AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of this program's package]) # # gEDA/gaf specify things which need to setup @@ -401,7 +402,8 @@ LIBGEDA_LDFLAGS="$GUILE_LDFLAGS $GLIB_LIBS $MINGW_LIBS $DMALLOC_LIBS $GDK_PIXBUF LIBTOOL_FLAGS="-version-info $SHARED_LIBRARY_VERSION" # Makefile.in variable substitution -AC_SUBST(VERSION) +AC_SUBST(DATE_VERSION) +AC_SUBST(DOTTED_VERSION) AC_SUBST(LIBGEDA_CFLAGS) AC_SUBST(LIBGEDA_LDFLAGS) AC_SUBST(LIBTOOL_FLAGS) @@ -429,7 +431,7 @@ expandedGEDADATADIR=`eval "echo $GEDADATADIR"` expandedGEDARCDIR=`eval "echo $GEDARCDIR"` AC_MSG_RESULT([ -** Configuration summary for $PACKAGE $VERSION: +** Configuration summary for $PACKAGE $DOTTED_VERSION.$DATE_VERSION GLIB library version: $GLIB_VERSION GTK+ library version: $GTK_VERSION diff --git a/libgeda/include/defines.h b/libgeda/include/defines.h index c42f613ea..e521bc4fb 100644 --- a/libgeda/include/defines.h +++ b/libgeda/include/defines.h @@ -35,13 +35,11 @@ /* Set this string to something interesting to create a custom */ /* version of gEDA/gaf. This string is prepended to all messages that */ -/* output the program's VERSION. You would set this if you are creating a */ -/* specific custom version of gEDA/gaf. This string is also used to */ -/* distinguish between stable and development versions of gEDA/gaf. */ -/* For example, if you set this string to "1.0-", the resulting output is: */ -/* 1.0-20060906. */ -#define PREPEND_VERSION_STRING "1.1-" - +/* output the program's version output. You would set this if you are */ +/* creating a specific custom version of gEDA/gaf. */ +/* For example, if you set this string to "FIX-", the resulting output is: */ +/* FIX-1.0.0.20060906. */ +#define PREPEND_VERSION_STRING "" /* for color mechanism used in gschem */ #define MAX_COLORS 25 diff --git a/libgeda/libgeda.pc.in b/libgeda/libgeda.pc.in index 92b6f3a76..46266517c 100644 --- a/libgeda/libgeda.pc.in +++ b/libgeda/libgeda.pc.in @@ -6,6 +6,6 @@ includedir=@includedir@ Name: libgeda Description: gEDA/gaf's core library Requires: -Version: @VERSION@ +Version: @DATE_VERSION@ Libs: -L${libdir} -lgeda @LIBGEDA_LDFLAGS@ Cflags: -I${includedir} @LIBGEDA_CFLAGS@ diff --git a/libgeda/src/a_basic.c b/libgeda/src/a_basic.c index 9bda5b954..af8c46f41 100644 --- a/libgeda/src/a_basic.c +++ b/libgeda/src/a_basic.c @@ -151,14 +151,14 @@ void o_save_embedded(TOPLEVEL *w_current, OBJECT *object_list, FILE *fp) /*! \brief Write libgeda file header * \par Function Description - * This function simply prints the VERSION and FILEFORMAT_VERSION + * This function simply prints the DATE_VERSION and FILEFORMAT_VERSION * definitions to the file. * * \param [in] fp The file to write the header to. */ void o_save_write_header(FILE *fp) { - fprintf(fp, "v %s %u\n", VERSION, FILEFORMAT_VERSION); + fprintf(fp, "v %s %u\n", DATE_VERSION, FILEFORMAT_VERSION); } /*! \brief Save a file diff --git a/libgeda/src/f_print.c b/libgeda/src/f_print.c index 087fbc168..7c6e0613a 100644 --- a/libgeda/src/f_print.c +++ b/libgeda/src/f_print.c @@ -130,7 +130,7 @@ int f_print_header(TOPLEVEL *w_current, FILE *fp, "%%%%Pages: 1\n" "%%%%Endcomments\n" "%%%%BeginProlog\n", - VERSION, + DATE_VERSION, ctime(¤t_time), w_current->page_current->page_filename, getlogin(), diff --git a/symbols/configure.ac b/symbols/configure.ac index 3101c2dca..c149ff57d 100644 --- a/symbols/configure.ac +++ b/symbols/configure.ac @@ -4,11 +4,12 @@ AC_CONFIG_SRCDIR([74/7400-1.sym]) AC_PREREQ(2.54) PACKAGE=geda-symbols -VERSION=20070526 -echo Configuring $PACKAGE version $VERSION +DOTTED_VERSION=1.1 +DATE_VERSION=20070526 +echo Configuring $PACKAGE version $DOTTED_VERSION.$DATE_VERSION # Initialize automake stuff -AM_INIT_AUTOMAKE($PACKAGE, $VERSION, no-define) +AM_INIT_AUTOMAKE($PACKAGE, $DOTTED_VERSION, no-define) # Init maintainer mode AM_MAINTAINER_MODE @@ -174,7 +175,8 @@ GEDADOCDIR=$expandgedadocdir # gEDA/gaf specify setup end ######################################################################### -AC_SUBST(VERSION) +AC_SUBST(DATE_VERSION) +AC_SUBST(DOTTED_VERSION) AC_SUBST(GEDADATADIR) AC_SUBST(GEDADOCDIR) AC_SUBST(GEDARCDIR) @@ -240,7 +242,7 @@ expandedGEDARCDIR=`eval "echo $GEDARCDIR"` expandedGEDADOCDIR=`eval "echo $GEDADOCDIR"` AC_MSG_RESULT([ -** Configuration summary for $PACKAGE $VERSION: +** Configuration summary for $PACKAGE $DOTTED_VERSION.$DATE_VERSION: data directory: $expandedGEDADATADIR rc directory: $expandedGEDARCDIR diff --git a/update-versions.sh b/update-versions.sh index 21ffa5186..45aa63edb 100755 --- a/update-versions.sh +++ b/update-versions.sh @@ -35,30 +35,28 @@ then fi -old_dottedversion=`cat libgeda/include/defines.h | \ - grep "#define PREPEND_VERSION_STRING" | awk '{print $3}'` +old_dottedversion=`grep ^DOTTED_VERSION= Makefile | \ + awk -F= '{print $2}'` -old_date=`grep ^VERSION= libgeda/configure.ac | \ +old_date=`grep ^DATE_VERSION= Makefile | \ awk -F= '{print $2}'` old_sharedlibversion=`grep ^SHARED_LIBRARY_VERSION libgeda/configure.ac | \ awk -F= '{print $2}'` -# Update dotted version -libgeda_defines=libgeda/include/defines.h -echo Updating $old_dottedversion to \"$new_dottedversion-\" in $libgeda_defines -mv -f $libgeda_defines $libgeda_defines.orig -cat $libgeda_defines.orig | sed "s/#define PREPEND_VERSION_STRING $old_dottedversion/#define PREPEND_VERSION_STRING \"$new_dottedversion-\"/" > $libgeda_defines -rm -f $libgeda_defines.orig +echo Existing version info: $old_dottedversion $old_date $old_sharedlibversion +echo "" -# Update dates -date_files="docs/configure.ac examples/configure.ac gattrib/configure.ac gnetlist/configure.ac gsymcheck/configure.ac libgeda/configure.ac symbols/configure.ac utils/configure.ac gschem/configure.ac.in" +# Update dates and dotted version in the configure scripts +tbd_files="docs/configure.ac examples/configure.ac gattrib/configure.ac gnetlist/configure.ac gsymcheck/configure.ac libgeda/configure.ac symbols/configure.ac utils/configure.ac gschem/configure.ac.in Makefile" -for i in $date_files +for i in $tbd_files do - echo Updating $old_date to $new_date in $i + echo Updating $old_date / $old_dottedversion to $new_date / $new_dottedversion in $i mv -f $i $i.orig - cat $i.orig | sed "s/^VERSION=$old_date/VERSION=$new_date/" > $i + cat $i.orig | \ + sed "s/^DATE_VERSION=$old_date/DATE_VERSION=$new_date/" | \ + sed "s/^DOTTED_VERSION=$old_dottedversion/DOTTED_VERSION=$new_dottedversion/" > $i rm -f $i.orig done @@ -70,3 +68,12 @@ cat $libgeda_conf.orig2 | \ sed "s/^SHARED_LIBRARY_VERSION=$old_sharedlibversion/SHARED_LIBRARY_VERSION=$new_sharedlibversion/" > $libgeda_conf rm -f $libgeda_conf.orig2 +echo "" + +# Verification step needed here. +for i in $tbd_files +do + echo Verify $i + grep ^DOTTED_VERSION= $i + grep ^DATE_VERSION= $i +done diff --git a/utils/configure.ac b/utils/configure.ac index cb7e99bda..efdf2c282 100644 --- a/utils/configure.ac +++ b/utils/configure.ac @@ -4,11 +4,12 @@ AC_CONFIG_SRCDIR([src/gmk_sym.c]) AC_PREREQ(2.54) PACKAGE=geda-utils -VERSION=20070526 -echo Configuring $PACKAGE version $VERSION +DOTTED_VERSION=1.1 +DATE_VERSION=20070526 +echo Configuring $PACKAGE version $DOTTED_VERSION.$DATE_VERSION # Initialize automake -AM_INIT_AUTOMAKE($PACKAGE, $VERSION) +AM_INIT_AUTOMAKE($PACKAGE, $DOTTED_VERSION, no-define) AM_CONFIG_HEADER([config.h]) # Initialize maintainer mode @@ -110,7 +111,7 @@ AC_CHECK_LIB(dl, dlopen, DL_LIB="-ldl", DL_LIB="") ############################################################################ # Check for libgeda start # -PKG_CHECK_MODULES(LIBGEDA, libgeda >= $VERSION, LIBGEDA="yes", +PKG_CHECK_MODULES(LIBGEDA, libgeda >= $DATE_VERSION, LIBGEDA="yes", no_LIBGEDA="yes") if test "$LIBGEDA" = "yes" @@ -375,7 +376,9 @@ GEDADOCDIR=$expandgedadocdir # this has to be expanded ( no ${prefix} ) -- AC_DEFINE_UNQUOTED(GEDADATADIR, "$gedatopdir", [gEDA/gaf's data directory]) -AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Currently running version of gEDA/gaf]) +AC_DEFINE_UNQUOTED(DATE_VERSION, "$DATE_VERSION", [Currently running date version of gEDA/gaf]) +AC_DEFINE_UNQUOTED(DOTTED_VERSION, "$DOTTED_VERSION", [Currently running dotted version of gEDA/gaf]) +AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of this program's package]) # # gEDA/gaf specify things which need to setup @@ -390,6 +393,8 @@ GRENUM_CFLAGS="$LIBGEDA_CFLAGS" GRENUM_LDFLAGS="$GLIB_LIBS" # Makefile.in variable substitution +AC_SUBST(DATE_VERSION) +AC_SUBST(DOTTED_VERSION) AC_SUBST(GSCHLAS_CFLAGS) AC_SUBST(GSCHLAS_LDFLAGS) AC_SUBST(GSCH2PCB_CFLAGS) @@ -432,7 +437,7 @@ expandedGEDADOCDIR=`eval "echo $GEDADOCDIR"` expandedPCBLIBPATH=`eval "echo $PCBLIBPATH"` AC_MSG_RESULT([ -** Configuration summary for $PACKAGE $VERSION: +** Configuration summary for $PACKAGE $DOTTED_VERSION.$DATE_VERSION: GTK+ library version: $GTK_VERSION GLIB library version: $GLIB_VERSION diff --git a/utils/gschlas/g_rc.c b/utils/gschlas/g_rc.c index cec9313d2..a11a10a79 100644 --- a/utils/gschlas/g_rc.c +++ b/utils/gschlas/g_rc.c @@ -115,13 +115,16 @@ SCM g_rc_gschlas_version(SCM version) SCM_ARG1, "gschlas-version"); - if (g_strcasecmp (SCM_STRING_CHARS (version), VERSION) != 0) { - fprintf(stderr, "Found a version [%s%s] gschlas file:\n[%s]\n", - PREPEND_VERSION_STRING, SCM_STRING_CHARS (version), - rc_filename ? rc_filename : "unknown"); - fprintf(stderr, - "While gschlas is in ALPHA, please be sure that you have the latest rc file.\n"); - return SCM_BOOL_F; + if (g_strcasecmp (SCM_STRING_CHARS (version), DATE_VERSION) != 0) { + fprintf(stderr, + "You are running gEDA/gaf version [%s%s.%s],\n", + PREPEND_VERSION_STRING, DOTTED_VERSION, DATE_VERSION); + fprintf(stderr, + "but you have a version [%s] gschlasrc file:\n[%s]\n", + SCM_STRING_CHARS (version), rc_filename); + fprintf(stderr, + "Please be sure that you have the latest rc file.\n"); + return SCM_BOOL_F; } return SCM_BOOL_T; diff --git a/utils/gschlas/gschlas.c b/utils/gschlas/gschlas.c index c4443c976..11a8b255d 100644 --- a/utils/gschlas/gschlas.c +++ b/utils/gschlas/gschlas.c @@ -79,7 +79,8 @@ main_prog(void *closure, int argc, char *argv[]) if (!quiet_mode) { s_log_message( - "gEDA/gschlas version %s%s\n", PREPEND_VERSION_STRING, VERSION); + "gEDA/gschlas version %s%s.%s\n", PREPEND_VERSION_STRING, + DOTTED_VERSION, DATE_VERSION); s_log_message( "gEDA/gschlas comes with ABSOLUTELY NO WARRANTY; see COPYING for more details.\n"); s_log_message( diff --git a/utils/lib/system-gschlasrc.in b/utils/lib/system-gschlasrc.in index b1a2e2091..1f26c347a 100644 --- a/utils/lib/system-gschlasrc.in +++ b/utils/lib/system-gschlasrc.in @@ -15,7 +15,7 @@ ; that the rc file is compatible with the version of gschem that is ; being run. The end user should *not* change this value. ; -(gschlas-version "@VERSION@") +(gschlas-version "@DATE_VERSION@") ; Setup data path variables. ; diff --git a/utils/src/grenum.c b/utils/src/grenum.c index f2401f6c0..73c888ab9 100644 --- a/utils/src/grenum.c +++ b/utils/src/grenum.c @@ -391,6 +391,7 @@ void printhelp() void printver() { printf("This is grenum, an advanced refdes renumber utility for gEDA's gschem.\n"); - printf("Version %s. gEDA/gaf version %s\n",GRVERSION, VERSION); + printf("Version %s. gEDA/gaf version %s.%s\n",GRVERSION, + DOTTED_VERSION, DATE_VERSION); printf("Compiled on %s at %s\n",COMP_DATE,COMP_TIME); } -- 2.11.4.GIT