r23519 - gnucash/trunk/src - Long term fix for wrong version number part of bug 639371

[Geert Janssens]

Author: gjanssens
Date: 2013-12-08 13:02:25 -0500 (Sun, 08 Dec 2013)
New Revision: 23519
Trac: http://svn.gnucash.org/trac/changeset/23519

Modified:
   gnucash/trunk/src/core-utils/core-utils.i
   gnucash/trunk/src/core-utils/core-utils.scm
   gnucash/trunk/src/report/locale-specific/us/taxtxf-de_DE.scm
   gnucash/trunk/src/report/locale-specific/us/taxtxf.scm
   gnucash/trunk/src/report/utility-reports/welcome-to-gnucash.scm
   gnucash/trunk/src/scm/main.scm
Log:
Long term fix for wrong version number part of bug 639371

Read compile time version number to display in the report

Modified: gnucash/trunk/src/core-utils/core-utils.i
===================================================================
--- gnucash/trunk/src/core-utils/core-utils.i	2013-12-08 18:02:09 UTC (rev 23518)
+++ gnucash/trunk/src/core-utils/core-utils.i	2013-12-08 18:02:25 UTC (rev 23519)
@@ -1,11 +1,13 @@
 %module sw_core_utils
 %{
+#include <config.h>
 #include <gnc-glib-utils.h>
 #include <gnc-prefs.h>
 #include <gnc-path.h>
 #include <gnc-filepath-utils.h>
 #include <gnc-locale-utils.h>
 #include <glib.h>
+const gchar *gnc_version(void);
 %}
 #if defined(SWIGGUILE)
 %{
@@ -26,6 +28,10 @@
 %import "base-typemaps.i"
 
 %include <gnc-prefs.h>
+%inline %{
+const gchar *gnc_version(void)
+{ return VERSION; }
+%}
 
 %newobject gnc_path_get_bindir;
 gchar * gnc_path_get_bindir(void);

Modified: gnucash/trunk/src/core-utils/core-utils.scm
===================================================================
--- gnucash/trunk/src/core-utils/core-utils.scm	2013-12-08 18:02:09 UTC (rev 23518)
+++ gnucash/trunk/src/core-utils/core-utils.scm	2013-12-08 18:02:25 UTC (rev 23519)
@@ -41,3 +41,5 @@
 (re-export gnc-prefs-set-float)
 (re-export gnc-prefs-set-string)
 (re-export gnc-prefs-set-coords)
+
+(define-public gnc:version (gnc-version))

Modified: gnucash/trunk/src/report/locale-specific/us/taxtxf-de_DE.scm
===================================================================
--- gnucash/trunk/src/report/locale-specific/us/taxtxf-de_DE.scm	2013-12-08 18:02:09 UTC (rev 23518)
+++ gnucash/trunk/src/report/locale-specific/us/taxtxf-de_DE.scm	2013-12-08 18:02:25 UTC (rev 23519)
@@ -51,6 +51,7 @@
 (use-modules (gnucash main)) ;; FIXME: delete after we finish modularizing.
 (use-modules (srfi srfi-1))
 (use-modules (gnucash printf))
+(use-modules (gnucash core-utils)) ; for gnc:version
 
 (use-modules (gnucash gnc-module))
 (gnc:module-load "gnucash/tax/de_DE" 0)

Modified: gnucash/trunk/src/report/locale-specific/us/taxtxf.scm
===================================================================
--- gnucash/trunk/src/report/locale-specific/us/taxtxf.scm	2013-12-08 18:02:09 UTC (rev 23518)
+++ gnucash/trunk/src/report/locale-specific/us/taxtxf.scm	2013-12-08 18:02:25 UTC (rev 23519)
@@ -79,6 +79,7 @@
 (use-modules (sw_gnome_utils)) ;; to get to gnc-error-dialog
 
 (use-modules (gnucash printf))
+(use-modules (gnucash core-utils)) ; for gnc:version
 
 (gnc:module-load "gnucash/html" 0)   ; added for 'gnc-html-engine-supports-css'
 (gnc:module-load "gnucash/tax/us" 0)

Modified: gnucash/trunk/src/report/utility-reports/welcome-to-gnucash.scm
===================================================================
--- gnucash/trunk/src/report/utility-reports/welcome-to-gnucash.scm	2013-12-08 18:02:09 UTC (rev 23518)
+++ gnucash/trunk/src/report/utility-reports/welcome-to-gnucash.scm	2013-12-08 18:02:25 UTC (rev 23519)
@@ -24,6 +24,7 @@
 (export gnc:make-welcome-report)
 
 (use-modules (gnucash main)) ;; FIXME: delete after we finish modularizing.
+(use-modules (gnucash core-utils)) ; for gnc:version
 (use-modules (gnucash gnc-module))
 (use-modules (sw_report_system))
 
@@ -86,9 +87,9 @@
     (gnc:html-document-add-object! 
      doc
      (gnc:make-html-text 
-      (gnc:html-markup-h2 (_ "Welcome to GnuCash 2.4!"))
-      (gnc:html-markup-p
-       (_ "GnuCash 2.4 has lots of nice features. Here are a few."))))
+      (gnc:html-markup-h2 (format (_ "Welcome to GnuCash ~a !") gnc:version))
+      (gnc:html-markup-p (format
+       (_ "GnuCash ~a has lots of nice features. Here are a few.") gnc:version))))
     doc))
 
 (gnc:define-report 

Modified: gnucash/trunk/src/scm/main.scm
===================================================================
--- gnucash/trunk/src/scm/main.scm	2013-12-08 18:02:09 UTC (rev 23518)
+++ gnucash/trunk/src/scm/main.scm	2013-12-08 18:02:25 UTC (rev 23519)
@@ -49,7 +49,6 @@
 ;; Exports
 
 ;; from main.scm
-(export gnc:version)
 (export gnc:warn)
 (export gnc:error)
 (export gnc:msg)
@@ -78,7 +77,6 @@
 
 ;;(use-modules (ice-9 statprof))
 
-
 ;; various utilities
 
 (define (gnc:safe-strcmp a b)