IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Bug #616696 - Development version warning string should not include hardcode version.

Browse Source 
* Improve on the previous fix: really display stable version in tooltip, not current version.
* Also revert change of "What's new in GnuCash 2.0" because that's the title actually found
  in the help manual.

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@19077 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Geert Janssens 2010-04-27 19:41:07 +00:00
parent 7be168dd80
commit 3ac9526ac8
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure.in
View File

@ -32,6 +32,7 @@ GNUCASH_VERSION_STRING=AC_PACKAGE_VERSION
GNUCASH_MAJOR_VERSION=`echo $GNUCASH_VERSION_STRING | [ sed -e 's/^\([^\.]*\)\.\([^.]*\)\.\(.*\)$/\1/' ]` GNUCASH_MAJOR_VERSION=`echo $GNUCASH_VERSION_STRING | [ sed -e 's/^\([^\.]*\)\.\([^.]*\)\.\(.*\)$/\1/' ]`
GNUCASH_MINOR_VERSION=`echo $GNUCASH_VERSION_STRING | [ sed -e 's/^\([^\.]*\)\.\([^.]*\)\.\(.*\)$/\2/' ]` GNUCASH_MINOR_VERSION=`echo $GNUCASH_VERSION_STRING | [ sed -e 's/^\([^\.]*\)\.\([^.]*\)\.\(.*\)$/\2/' ]`
GNUCASH_MICRO_VERSION=`echo $GNUCASH_VERSION_STRING | [ sed -e 's/^\([^\.]*\)\.\([^.]*\)\.\(.*\)$/\3/' ]` GNUCASH_MICRO_VERSION=`echo $GNUCASH_VERSION_STRING | [ sed -e 's/^\([^\.]*\)\.\([^.]*\)\.\(.*\)$/\3/' ]`
GNUCASH_LATEST_STABLE_VERSION="2.2.9"
# save any user/environment optimization flags before we muck with them in # save any user/environment optimization flags before we muck with them in
# --enable-debug: # --enable-debug:
@ -66,6 +67,7 @@ AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE_DIRONLY)
AC_SUBST(GNUCASH_MAJOR_VERSION) AC_SUBST(GNUCASH_MAJOR_VERSION)
AC_SUBST(GNUCASH_MINOR_VERSION) AC_SUBST(GNUCASH_MINOR_VERSION)
AC_SUBST(GNUCASH_MICRO_VERSION) AC_SUBST(GNUCASH_MICRO_VERSION)
AC_SUBST(GNUCASH_LATEST_STABLE_VERSION)
AC_DEFINE_UNQUOTED(GNUCASH_MAJOR_VERSION, $GNUCASH_MAJOR_VERSION, AC_DEFINE_UNQUOTED(GNUCASH_MAJOR_VERSION, $GNUCASH_MAJOR_VERSION,
[GnuCash Major version number]) [GnuCash Major version number])
@ -73,6 +75,8 @@ AC_DEFINE_UNQUOTED(GNUCASH_MINOR_VERSION, $GNUCASH_MINOR_VERSION,
[GnuCash Minor version number]) [GnuCash Minor version number])
AC_DEFINE_UNQUOTED(GNUCASH_MICRO_VERSION, $GNUCASH_MICRO_VERSION, AC_DEFINE_UNQUOTED(GNUCASH_MICRO_VERSION, $GNUCASH_MICRO_VERSION,
[GnuCash Micro version number]) [GnuCash Micro version number])
AC_DEFINE_UNQUOTED(GNUCASH_LATEST_STABLE_VERSION, "$GNUCASH_LATEST_STABLE_VERSION",
[Most recent stable version of GnuCash])
dnl Set of available languages. dnl Set of available languages.
ALL_LINGUAS="ca cs da de el en_GB es_NI es eu fa fi fr he hu it ja ko lt lv_LV nb ne nl pl pt_BR pt ro ru rw sk sv ta tr uk vi zh_CN zh_TW" ALL_LINGUAS="ca cs da de el en_GB es_NI es eu fa fi fr he hu it ja ko lt lv_LV nb ne nl pl pt_BR pt ro ru rw sk sv ta tr uk vi zh_CN zh_TW"

2
doc/Makefile.am
View File

@ -59,7 +59,7 @@ gnucash.1: gnucash.1.in Makefile
tip_of_the_day.list: tip_of_the_day.list.in Makefile tip_of_the_day.list: tip_of_the_day.list.in Makefile
${CC} -E -P -x c -D'N_(x)=x' -o $@.tmp $< ${CC} -E -P -x c -D'N_(x)=x' -o $@.tmp $<
cat -s $@.tmp | ${SED} -e 's/^ *\"\(.*\)\" *$$/\1/' \ cat -s $@.tmp | ${SED} -e 's/^ *\"\(.*\)\" *$$/\1/' \
-e 's:@-VERSION-@:${VERSION}:g' > $@ -e 's:@-GNUCASH_LATEST_STABLE_VERSION-@:${GNUCASH_LATEST_STABLE_VERSION}:g' > $@
rm -f $@.tmp rm -f $@.tmp
DISTCLEANFILES = gnc-prices.1 gnucash.1 tip_of_the_day.list DISTCLEANFILES = gnc-prices.1 gnucash.1 tip_of_the_day.list

4
doc/tip_of_the_day.list.in
View File

@ -1,11 +1,11 @@
N_( "Warning!! This is a DEVELOPMENT version of GnuCash. \ N_( "Warning!! This is a DEVELOPMENT version of GnuCash. \
It probably has lots of bugs and unstable features! \ It probably has lots of bugs and unstable features! \
If you are looking for a stable personal finance application, \ If you are looking for a stable personal finance application, \
you should use the latest release of GnuCash @-VERSION-@.") you should use the latest release of GnuCash @-GNUCASH_LATEST_STABLE_VERSION-@.")
N_( "The GnuCash online manual has lots of helpful information. \ N_( "The GnuCash online manual has lots of helpful information. \
If you are upgrading from earlier versions of GnuCash, the section \ If you are upgrading from earlier versions of GnuCash, the section \
\"What's new in GnuCash @-VERSION-@\" is particularly interesting. You can \ \"What's new in GnuCash 2.0\" is particularly interesting. You can \
access the manual under the Help menu.") access the manual under the Help menu.")
N_( "You can easily import your existing financial data from Quicken, \ N_( "You can easily import your existing financial data from Quicken, \