Give more control over what builds have a version number and what

builds hare labelled "cvs".


git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@8300 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
David Hampton 2003-05-11 23:31:23 +00:00
parent f7ae1b2de5
commit 7acf711c83
4 changed files with 26 additions and 11 deletions

View File

@ -1,3 +1,13 @@
2003-05-11 David Hampton <hampton@employees.org>
* src/gnome-utils/dialog-commodity.c: Fix problem selecting quote
source.
* configure.in:
* src/gnome/gnc-splash.c:
* src/gnome/window-main.c: Give more control over what builds have
a version number and what builds hare labelled "cvs".
2003-05-11 Derek Atkins <derek@ihtfp.com> 2003-05-11 Derek Atkins <derek@ihtfp.com>
* src/import-export/hbci/gnc-hbci-utils.c: you have to declare * src/import-export/hbci/gnc-hbci-utils.c: you have to declare

View File

@ -31,6 +31,10 @@ AC_PREREQ(2.53)
AC_PROG_CC AC_PROG_CC
# Comment out for production or semi-production builds. I.E. Anything
# that is explicitly tagged in cvs as a version.
AC_DEFINE(GNUCASH_CVS,1,[Define if built from untagged cvs])
GNUCASH_MAJOR_VERSION=1 GNUCASH_MAJOR_VERSION=1
GNUCASH_MINOR_VERSION=9 GNUCASH_MINOR_VERSION=9
GNUCASH_MICRO_VERSION=0 GNUCASH_MICRO_VERSION=0

View File

@ -70,12 +70,13 @@ gnc_show_splash_screen (void)
frame = gtk_frame_new (NULL); frame = gtk_frame_new (NULL);
vbox = gtk_vbox_new (FALSE, 3); vbox = gtk_vbox_new (FALSE, 3);
if (GNUCASH_MINOR_VERSION % 2) { #ifdef GNUCASH_CVS
sprintf(ver_string, _("Version: Gnucash-cvs (built %s)"), sprintf(ver_string, _("Version: Gnucash-%s cvs (built %s)"),
GNUCASH_BUILD_DATE); VERSION, GNUCASH_BUILD_DATE);
} else { #else
sprintf(ver_string, _("Version: Gnucash-%s"), VERSION); sprintf(ver_string, _("Version: Gnucash-%s"), VERSION);
} #endif
version = gtk_label_new (ver_string); version = gtk_label_new (ver_string);
separator = gtk_hseparator_new(); separator = gtk_hseparator_new();
progress = gtk_label_new(_("Loading...")); progress = gtk_label_new(_("Loading..."));

View File

@ -716,11 +716,11 @@ gnc_main_window_about_cb (GtkWidget *widget, gpointer data)
}; };
gchar *ver_string; gchar *ver_string;
if (GNUCASH_MINOR_VERSION % 2) { #ifdef GNUCASH_CVS
ver_string = g_strdup_printf("%s (built %s)", VERSION, GNUCASH_BUILD_DATE); ver_string = g_strdup_printf("%s cvs (built %s)", VERSION, GNUCASH_BUILD_DATE);
} else { #else
ver_string = strdup(VERSION); ver_string = strdup(VERSION);
} #endif
about = gnome_about_new ("GnuCash", ver_string, copyright, about = gnome_about_new ("GnuCash", ver_string, copyright,
authors, message, NULL); authors, message, NULL);
g_free(ver_string); g_free(ver_string);