[Gnucash-changes] r12880 - gnucash/trunk - Print SVN version information more often.

[Derek Atkins]

Author: warlord
Date: 2006-01-18 23:54:37 -0500 (Wed, 18 Jan 2006)
New Revision: 12880
Trac: http://svn.gnucash.org/trac/changeset/12880

Modified:
   gnucash/trunk/ChangeLog
   gnucash/trunk/src/bin/gnucash-bin.c
   gnucash/trunk/src/gnome-utils/Makefile.am
   gnucash/trunk/src/gnome-utils/gnc-splash.c
Log:
Print SVN version information more often.

	* src/bin/gnucash-bin.c:
	* src/gnome-utils/gnc-splash.c:
	  Always print the SVN version and build date.
	  Make "development version" based on GNUCASH_SVN
	* src/gnome-utils/Makefile.am:
	  Define GNUCASH_SVN whenever the source is not a dist tarball.



Modified: gnucash/trunk/ChangeLog
===================================================================
--- gnucash/trunk/ChangeLog	2006-01-19 04:29:07 UTC (rev 12879)
+++ gnucash/trunk/ChangeLog	2006-01-19 04:54:37 UTC (rev 12880)
@@ -1,3 +1,12 @@
+2006-01-18  Derek Atkins  <derek at ihtfp.com>
+
+	* src/bin/gnucash-bin.c:
+	* src/gnome-utils/gnc-splash.c:
+	  Always print the SVN version and build date.
+	  Make "development version" based on GNUCASH_SVN
+	* src/gnome-utils/Makefile.am:
+	  Define GNUCASH_SVN whenever the source is not a dist tarball.
+
 2006-01-18  David Hampton  <hampton at employees.org>
 
 	* src/business/business-core/gncOwner.[ch]:

Modified: gnucash/trunk/src/bin/gnucash-bin.c
===================================================================
--- gnucash/trunk/src/bin/gnucash-bin.c	2006-01-19 04:29:07 UTC (rev 12879)
+++ gnucash/trunk/src/bin/gnucash-bin.c	2006-01-19 04:54:37 UTC (rev 12880)
@@ -37,7 +37,12 @@
 #include "gnc-file.h"
 
 static int gnucash_show_version;
+/* GNUCASH_SVN is defined whenever we're building from an SVN tree */
+#ifdef GNUCASH_SVN
 static int is_development_version = TRUE;
+#else
+static int is_development_version = FALSE;
+#endif
 
 static void
 gnc_print_unstable_message(void)
@@ -118,9 +123,7 @@
     if (gnucash_show_version) {
         printf("GnuCash %s %s\n", VERSION, 
                is_development_version ? _("development version") : "");
-#ifdef GNUCASH_SVN
-        printf("built %s from svn r%s\n", GNUCASH_BUILD_DATE, GNUCASH_SVN_REV);
-#endif 
+        printf(_("built %s from r%s\n"), GNUCASH_BUILD_DATE, GNUCASH_SVN_REV);
         exit(0);
     }
     

Modified: gnucash/trunk/src/gnome-utils/Makefile.am
===================================================================
--- gnucash/trunk/src/gnome-utils/Makefile.am	2006-01-19 04:29:07 UTC (rev 12879)
+++ gnucash/trunk/src/gnome-utils/Makefile.am	2006-01-19 04:54:37 UTC (rev 12880)
@@ -278,6 +278,9 @@
 		else \
 			echo "/* Autogenerated. Do not change. */" > _gnc-svninfo.h ; \
 			echo "#define GNUCASH_SVN_REV \"unknown -- bad svn checkout?\"" >> _gnc-svninfo.h ; \
+			echo "#ifndef GNUCASH_SVN" >> _gnc_svn-info.h ; \
+			echo "#define GNUCASH_SVN 1" >> _gnc_svn-info.h ; \
+			echo "#endif" >> _gnc_svn-info.h ; \
 		fi ; \
 	fi
 

Modified: gnucash/trunk/src/gnome-utils/gnc-splash.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-splash.c	2006-01-19 04:29:07 UTC (rev 12879)
+++ gnucash/trunk/src/gnome-utils/gnc-splash.c	2006-01-19 04:54:37 UTC (rev 12880)
@@ -74,10 +74,13 @@
   frame = gtk_frame_new (NULL);
   vbox = gtk_vbox_new (FALSE, 3);
 #ifdef GNUCASH_SVN
+  /* Development version */
   ver_string = g_strdup_printf(_("Version: Gnucash-%s svn (r%s built %s)"),
 			       VERSION, GNUCASH_SVN_REV, GNUCASH_BUILD_DATE);
 #else
-  ver_string =  g_strdup_printf(_("Version: Gnucash-%s"), VERSION);
+  /* Dist Tarball */
+  ver_string = g_strdup_printf(_("Version: Gnucash-%s (r%s built %s)"),
+			       VERSION, GNUCASH_SVN_REV, GNUCASH_BUILD_DATE);
 #endif
 
   version = gtk_label_new (ver_string);