mirror of
https://github.com/Gnucash/gnucash.git
synced 2025-02-25 18:55:30 -06:00
Merge branch 'maint'
Conflicts: configure.ac
This commit is contained in:
Frank H. Ellenberger
commit
b63370856d
382
ChangeLog
382
ChangeLog
@ -1,6 +1,370 @@
|
||||
2015-03-30 John Ralls
|
||||
|
||||
* Update NEWS and ChangeLog to include Bug 746977 and fix some typos. (HEAD, maint)
|
||||
|
||||
2015-03-30 Geert Janssens
|
||||
|
||||
* Updated Danish translation from the translation project (origin/maint)
|
||||
|
||||
2015-03-30 Simon Arlott
|
||||
|
||||
* Bug 746977 - scm ccache files should be in pkglibdir not pkgdatadir
|
||||
|
||||
2015-03-28 Geert Janssens
|
||||
|
||||
* Fix bzr/svk copy/paste typo
|
||||
|
||||
2015-03-28 Geert Janssens
|
||||
|
||||
* Check proper env variable in gnc-scm-info
|
||||
|
||||
2015-03-28 John Ralls
|
||||
|
||||
* Remove extraneous path noise from translation project files. (2.6.6)
|
||||
|
||||
2015-03-28 John Ralls
|
||||
|
||||
* Add more scheme symlinks plus a better explanation of why they're needed.
|
||||
|
||||
2015-03-28 John Ralls
|
||||
|
||||
* Protect the function tests from -Werror passed in from CFLAGS.
|
||||
|
||||
2015-03-27 John Ralls
|
||||
|
||||
* Bump Version to 2.6.6 for release.
|
||||
|
||||
2015-03-24 Mark Haanen
|
||||
|
||||
* Updated Dutch translation.
|
||||
|
||||
2015-03-21 John Ralls
|
||||
|
||||
* Bug 746517 - gnc-sql-backend.c compile fails with -Werror=format-nonliteral
|
||||
|
||||
2015-03-20 Frank H. Ellenberger
|
||||
|
||||
* Fix minor I18n issues
|
||||
|
||||
2015-03-14 Mechtilde Stehmann
|
||||
|
||||
* Update de.po
|
||||
|
||||
2015-03-14 John Ralls
|
||||
|
||||
* Bug 742089 - Decimal places
|
||||
|
||||
2015-03-13 Javier Serrador
|
||||
|
||||
* Bug 742164 - Updated Spanish translation
|
||||
|
||||
2015-03-13 John Ralls
|
||||
|
||||
* Bug 745265 - Segfault in generate_statusbar_lastmodified_message on Windows
|
||||
|
||||
2015-03-13 Frank H. Ellenberger
|
||||
|
||||
* html-utilities.scm: Tell the user, where to select account.
|
||||
|
||||
2015-03-12 Chandrakant Dhutadmal
|
||||
|
||||
* Bug 745598 - GNUCash Translation for Manipuri Language - Bengali Script
|
||||
|
||||
2015-03-11 Sangeeta
|
||||
|
||||
* Bug 745596 - GNUCash Translation for Maithili Language
|
||||
|
||||
2015-03-11 John Ralls
|
||||
|
||||
* Bug 745265 - Segfault in generate_statusbar_lastmodified_message on Windows
|
||||
|
||||
2015-03-10 Chandrakant Dhutadmal
|
||||
|
||||
* Bug 745597 - GNUCash Translation for Manipuri Language - Meetei Mayek Script (New)
|
||||
|
||||
2015-03-08 Cristian Marchi
|
||||
|
||||
* Update Danish translation from the translation project
|
||||
|
||||
2015-03-04 gnucash-dev
|
||||
|
||||
* To fix build error: ISO C90 forbids mixed declarations and code
|
||||
|
||||
2015-03-04 Geert Janssens
|
||||
|
||||
* Stop checking for F::Q dependencies
|
||||
|
||||
2015-03-01 Mike Alexander
|
||||
|
||||
* Bug 745354: Enhance the Find Transactions dialog
|
||||
|
||||
2015-02-27 Geert Janssens
|
||||
|
||||
* Remove absolute paths in es.po
|
||||
|
||||
2015-02-23 Alex Aycinena
|
||||
|
||||
* Correct the number field displayed in the reconcile window to correspond with the source specified in File->Options.
|
||||
|
||||
2015-02-23 Mike Alexander
|
||||
|
||||
* Fix some bugs found by SWIG version 3.0.5. Prior to version 3.0.3 SWIG silently ignored invalid preprocessor directives. See <https://github.com/swig/swig/issues/217>
|
||||
|
||||
2015-02-23 Geert Janssens
|
||||
|
||||
* Bug 723409 - Incorrect symbol for Turkish lira
|
||||
|
||||
2015-02-23 Geert Janssens
|
||||
|
||||
* Add some verbosity to scrubbing
|
||||
|
||||
2015-02-22 Geert Janssens
|
||||
|
||||
* Add scrubbing function to recover dangling lot links and payments
|
||||
|
||||
2015-02-21 Geert Janssens
|
||||
|
||||
* Fix potential infinite loop in business lot scrubbing
|
||||
|
||||
2015-02-11 Geert Janssens
|
||||
|
||||
* Bug 733685 - Fancy Date Format doesn't stick
|
||||
|
||||
2015-02-10 Mike
|
||||
|
||||
* Bug 649933 - Creating cash flow report takes a long time
|
||||
|
||||
2015-02-09 Geert Janssens
|
||||
|
||||
* Updated Danish translation. From the translation project.
|
||||
|
||||
2015-02-09 John Ralls
|
||||
|
||||
* Remove explicit install of Finance::Quote dependencies.
|
||||
|
||||
2015-02-07 Geert Janssens
|
||||
|
||||
* Bug 727466 - The symbol of CNY changed to 元
|
||||
|
||||
2015-02-07 Geert Janssens
|
||||
|
||||
* Bug 727466 - The symbol of CNY changed to 元
|
||||
|
||||
2015-02-03 Robert Fewell
|
||||
|
||||
* Bug 743807 Stops critical error messages.
|
||||
|
||||
2015-02-03 Robert Fewell
|
||||
|
||||
* Bug 743807 Wrong date value being used.
|
||||
|
||||
2015-02-02 John Ralls
|
||||
|
||||
* Remove build and run of no-longer-existant intl-scm/guile-strings.
|
||||
|
||||
2015-01-31 Geert Janssens
|
||||
|
||||
* Bug 731889 - guile 2 exports different autoconf macros than what is expected
|
||||
|
||||
2015-01-29 John Ralls
|
||||
|
||||
* Bug 731889 - guile 2 exports different autoconf macros than what is expected
|
||||
|
||||
2011-05-31 Geert Janssens
|
||||
|
||||
* Bug 619899 - Use normal gettext or intltool toolchain also for scm files
|
||||
|
||||
2015-01-30 Geert Janssens
|
||||
|
||||
* Rewrite gnc-test-env in perl
|
||||
|
||||
2015-01-29 Geert Janssens
|
||||
|
||||
* Switch from guile to xml to manage our iso-currencies source file
|
||||
|
||||
2015-01-29 Geert Janssens
|
||||
|
||||
* Bug 743609 - Add configure options to disable libsecret detection
|
||||
|
||||
2015-01-28 Geert Janssens
|
||||
|
||||
* Bug 727647 - "gncInvoiceGetTotal" is not read-only function?
|
||||
|
||||
2015-01-25 Mike Evans
|
||||
|
||||
* Bug 721196 - Use a regex for checking for a valid numeric value.
|
||||
|
||||
2015-01-25 Mike Evans
|
||||
|
||||
* Numeric values with more than commodity smallest fraction get silently dropped.
|
||||
|
||||
2015-01-24 Geert Janssens
|
||||
|
||||
* Bug 742624 - [patch] Scheduled Transaction Editor results in immediate segfault
|
||||
|
||||
2015-01-24 Geert Janssens
|
||||
|
||||
* Bug 731889 - guile 2 exports different autoconf macros than what is expected
|
||||
|
||||
2015-01-20 gnucash-dev
|
||||
|
||||
* Update US Income Tax data to reflect minor changes for 2014
|
||||
|
||||
2015-01-20 Mike Alexander
|
||||
|
||||
* Advanced portfolio should respect report date when looking for other income/expense.
|
||||
|
||||
2015-01-19 Christian Stimming
|
||||
|
||||
* Update German translation to recent pot template. Very minor translation update.
|
||||
|
||||
2014-11-24 Mike Alexander
|
||||
|
||||
* book.not_saved should be book.session_not_saved
|
||||
|
||||
2015-01-18 Mike Alexander
|
||||
|
||||
* Bug 739228 - Advanced Portfolio report: wrong calculation of Value Correctly convert the value into the report's currency.
|
||||
|
||||
2015-01-18 Mike Alexander
|
||||
|
||||
* Improve income and expense reporting in advanced portfolio report
|
||||
|
||||
2014-11-23 Mike Alexander
|
||||
|
||||
* Accept prices of the form n.nnne[+-]nn, i.e. with an exponent. An example requiring this is currency conversion from IDR to USD.
|
||||
|
||||
2015-01-18 Geert Janssens
|
||||
|
||||
* Use the enum name instead of a number for GDateMonth
|
||||
|
||||
2015-01-04 Markus Blatt
|
||||
|
||||
* [Bug 742332] - German tax report uses US tax quarters and not real quarters.
|
||||
|
||||
2015-01-15 Romas
|
||||
|
||||
* Added Lithuanian language business accounts
|
||||
|
||||
2015-01-11 John Ralls
|
||||
|
||||
* Bug 672760 - Postponed transaction applied invalid date
|
||||
|
||||
2015-01-11 John Ralls
|
||||
|
||||
* Bug 672760 - Postponed transaction applied invalid date
|
||||
|
||||
2015-01-11 John Ralls
|
||||
|
||||
* Bug 672760 - Postponed transaction applied invalid date, causing segfault
|
||||
|
||||
2015-01-11 Mike Evans
|
||||
|
||||
* Bug 721196 - Fixed for locales where decimal point is a comma.
|
||||
|
||||
2014-10-19 Ralf Habacker
|
||||
|
||||
* Bug 738749 - Broken account template en_GB/uk-vat.gnucash-xea.
|
||||
|
||||
2014-12-29 Geert Janssens
|
||||
|
||||
* Revert "Bug 740471 - Applying payment to invoice Segmentation fault"
|
||||
|
||||
2014-12-26 John Ralls
|
||||
|
||||
* Fix typo in Transaction.c.
|
||||
|
||||
2014-12-24 Geert Janssens
|
||||
|
||||
* Revisit "Bug 741810 - Compilation fails because of creating .gnucash"
|
||||
|
||||
2014-12-23 John Ralls
|
||||
|
||||
* Extract function to clarify intent.
|
||||
|
||||
2014-12-22 John Ralls
|
||||
|
||||
* Bug 741228 - "Red line" threshold applies to Template scheduled transactions
|
||||
|
||||
2014-12-10 Mike Alexander
|
||||
|
||||
* Tell Guile (and others) to look in install/lib/gnucash for libraries. Without this Guile can't find libgncmod-engine and GnuCash won't start. I don't know how this worked before, perhaps because the correct path was in src/bin/overrides/gnucash-env.in
|
||||
|
||||
2014-12-23 Francisco
|
||||
|
||||
* Update Spanish translation
|
||||
|
||||
2014-12-23 Geert Janssens
|
||||
|
||||
* Cherry-pick "Bug 741810 - Compilation fails because of creating .gnucash"
|
||||
|
||||
2014-12-10 Mike Alexander
|
||||
|
||||
* Tell Guile (and others) to look in install/lib/gnucash for ligraries. Without this Guile can't find libgncmod-engine and GnuCash won't start, at least sometimes.
|
||||
|
||||
2014-12-21 John Ralls
|
||||
|
||||
* Replace GNC_HOME/bin with gnc_path_get_bindir().
|
||||
|
||||
2014-12-21 John Ralls
|
||||
|
||||
* Adjust #ifdef __clang__ to exclude clang versions > 6
|
||||
|
||||
2014-12-21 John Ralls
|
||||
|
||||
* Bug 739584 - gnucash-2.6.4 segfaults regularly on transfer .
|
||||
|
||||
2014-12-21 John Ralls
|
||||
|
||||
* Fix Guile compiled path in environment.in
|
||||
|
||||
2014-12-21 John Ralls
|
||||
|
||||
* Remove note from the top of environment.in. It's obsolete.
|
||||
|
||||
2014-12-06 Geert Janssens
|
||||
|
||||
* Bug 740471 - Applying payment to invoice Segmentation fault
|
||||
|
||||
2014-12-06 Geert Janssens
|
||||
|
||||
* Bug 740471 - Applying payment to invoice Segmentation fault
|
||||
|
||||
2014-12-06 Geert Janssens
|
||||
|
||||
* Bug 740471 - Applying payment to invoice Segmentation fault
|
||||
|
||||
2014-12-20 Geert Janssens
|
||||
|
||||
* Fix crash when running check & repair on an open AP/AR register
|
||||
|
||||
2014-12-18 John Ralls
|
||||
|
||||
* Update News for re-tag of 2.6.5 (2.6.5a)
|
||||
|
||||
2014-12-17 Geert Janssens
|
||||
|
||||
* Fix lot scrubbing for business lots
|
||||
|
||||
2014-12-17 Geert Janssens
|
||||
|
||||
* Improve comment for gncOwnerAutoApplyPaymentsWithLots
|
||||
|
||||
2014-12-15 John Ralls
|
||||
|
||||
* Release 2.6.5. (2.6.5)
|
||||
|
||||
2014-12-15 John Ralls
|
||||
|
||||
* Fix msgfmt errors in Indian-language .po files.
|
||||
|
||||
2014-12-15 John Ralls
|
||||
|
||||
* Update translation project po files.
|
||||
|
||||
2014-12-14 John Ralls
|
||||
|
||||
* Still more Guile library path additions, this time in tests. (HEAD, manjusri-maint/maint, maint)
|
||||
* Still more Guile library path additions, this time in tests.
|
||||
|
||||
2014-12-14 John Ralls
|
||||
|
||||
@ -12,7 +376,7 @@
|
||||
|
||||
2014-12-13 John Ralls
|
||||
|
||||
* Remove Windows specializations from gnc-date.c (origin/maint)
|
||||
* Remove Windows specializations from gnc-date.c
|
||||
|
||||
2014-12-12 John Ralls
|
||||
|
||||
@ -260,7 +624,7 @@
|
||||
|
||||
2014-09-27 John Ralls
|
||||
|
||||
* Release 2.6.4 (tag: 2.6.4)
|
||||
* Release 2.6.4 (2.6.4)
|
||||
|
||||
2014-09-27 John Ralls
|
||||
|
||||
@ -816,7 +1180,7 @@
|
||||
|
||||
2014-05-13 Mike Alexander
|
||||
|
||||
* The cash flow report should ignore splits in trading accounts.
|
||||
* The cash flow report should ignore splits in trading accounts. (local/maint)
|
||||
|
||||
2014-05-13 Simon Arlott
|
||||
|
||||
@ -1036,7 +1400,7 @@
|
||||
|
||||
2014-03-30 John Ralls
|
||||
|
||||
* Revert "Win32 build: Update aqbanking version numbers" (tag: 2.6.3)
|
||||
* Revert "Win32 build: Update aqbanking version numbers"
|
||||
|
||||
2014-03-30 John Ralls
|
||||
|
||||
@ -1044,7 +1408,7 @@
|
||||
|
||||
2014-03-29 John Ralls
|
||||
|
||||
* Release 2.6.3
|
||||
* Release 2.6.3 (2.6.3)
|
||||
|
||||
2014-03-29 John Ralls
|
||||
|
||||
@ -1152,7 +1516,7 @@
|
||||
|
||||
2014-03-06 Christian Stimming
|
||||
|
||||
* Aqbanking: SEPA transfer improvements - fix origin labels and add possibility to edit sender's name.
|
||||
* Aqbanking: SEPA transfer improvements - fix origin labels and add possibility to edit sender's name. (trunk, master)
|
||||
|
||||
2014-03-06 Christian Stimming
|
||||
|
||||
@ -1160,7 +1524,7 @@
|
||||
|
||||
2014-03-01 John Ralls
|
||||
|
||||
* Release GnuCash 2.6.2 (tag: 2.6.2)
|
||||
* Release GnuCash 2.6.2 (2.6.2)
|
||||
|
||||
2014-03-01 John Ralls
|
||||
|
||||
@ -3848,7 +4212,7 @@
|
||||
|
||||
2013-05-21 Geert Janssens
|
||||
|
||||
* Fix windows build after it got broken by r22982
|
||||
* Fix windows build after it got broken by r22982 (github/trunk)
|
||||
|
||||
2013-05-20 Christian Stimming
|
||||
|
||||
|
||||
1863
ChangeLog.2014
Normal file
1863
ChangeLog.2014
Normal file
File diff suppressed because it is too large
Load Diff
@ -15,6 +15,7 @@ dist_doc_DATA = \
|
||||
AUTHORS \
|
||||
COPYING \
|
||||
ChangeLog \
|
||||
ChangeLog.2014 \
|
||||
ChangeLog.2013 \
|
||||
ChangeLog.2012 \
|
||||
ChangeLog.2011 \
|
||||
@ -88,7 +89,7 @@ EXTRA_DIST = \
|
||||
intltool-extract.in \
|
||||
intltool-merge.in \
|
||||
intltool-update.in \
|
||||
util/gnc-scm-info
|
||||
util/gnc-vcs-info
|
||||
|
||||
## We borrow guile's convention and use @-...-@ as the substitution
|
||||
## brackets here, instead of the usual @...@. This prevents autoconf
|
||||
@ -200,7 +201,7 @@ po/gnucash.pot: po/POTFILES.in
|
||||
|
||||
SVN = svn
|
||||
|
||||
if BUILDING_FROM_SCM
|
||||
if BUILDING_FROM_VCS
|
||||
# This rule will generate a ChangeLog of gnucash/trunk commits, plus
|
||||
# all additional branches that are added in
|
||||
# ./macros/svn2cl.xsl. (FIXME: Is the dependency on NEWS really a good
|
||||
@ -209,7 +210,7 @@ if BUILDING_FROM_SCM
|
||||
ChangeLog: NEWS
|
||||
cd $(abs_srcdir) ; \
|
||||
if test x$(SCM_TYPE) = xsvn ; then \
|
||||
$(SVN) log -v --xml -r HEAD:'{2013-01-01}' http://svn.gnucash.org/repo/gnucash | \
|
||||
$(SVN) log -v --xml -r HEAD:'{2015-01-01}' http://svn.gnucash.org/repo/gnucash | \
|
||||
$(XSLTPROC) --stringparam strip-prefix "gnucash/trunk" \
|
||||
--stringparam include-rev "yes" $(abs_srcdir)/macros/svn2cl.xsl - > $(abs_builddir)/$@ ; \
|
||||
else \
|
||||
|
||||
54
NEWS
54
NEWS
@ -1,5 +1,59 @@
|
||||
Version history:
|
||||
------- -------
|
||||
2.6.6 - 29 March 2015
|
||||
Announcement: GnuCash 2.6.6 Release 2015-03-29
|
||||
GnuCash 2.6.6 released
|
||||
|
||||
The GnuCash development team proudly announces GnuCash 2.6.6, the
|
||||
sixth maintenance release in the 2.6-stable series.
|
||||
|
||||
The following bugs are fixed:
|
||||
619899 - Use normal gettext or intltool toolchain also for scm files
|
||||
649933 - Creating cash flow report takes a long tim
|
||||
672760 - Postponed transaction applied invalid date
|
||||
721196 - CSV. Cannot import lines with empty fields for deposit or withdrawal in bank transaction download.
|
||||
723409 - Incorrect symbol for Turkish lira
|
||||
727466 - The symbol of CNY changed to 元
|
||||
727647 - "gncInvoiceGetTotal" is not read-only function?
|
||||
731889 - guile 2 exports different autoconf macros than what is expected
|
||||
733685 - Fancy Date Format doesn't stick
|
||||
738749 - Broken account template en_GB/uk-vat.gnucash-xea.
|
||||
739228 - Advanced Portfolio report: wrong calculation of Value Correctly convert the value into the report's currency.
|
||||
739584 - gnucash-2.6.4 segfaults regularly on transfer .
|
||||
740471 - Applying payment to invoice Segmentation fault
|
||||
741228 - "Red line" threshold applies to Template scheduled transactions
|
||||
741810 - Compilation fails because of creating .gnucash
|
||||
742089 - Decimal places. Set the debit and credit cells' print_info to the account so that the decimal places are correct for the commodity.
|
||||
742332 - German tax report uses US tax quarters and not real quarters.
|
||||
742624 - Scheduled Transaction Editor results in immediate segfault
|
||||
743609 - Add configure options to disable libsecret detection
|
||||
743807 - Stops critical error messages.
|
||||
745265 - Segfault in generate_statusbar_lastmodified_message on Windows. Actually change the default date format without AM/PM
|
||||
745354 - Enhance the Find Transactions dialog. Make it possible to define search criteria that consist of multiple terms anded or ored together. Use this to define a new criterion to look for specified text in any of the Description, Notes, or Memo fields
|
||||
746517 - gnc-sql-backend.c compile fails with -Werror=format-nonliteral. Use GCC pragma to disable the warning in the one place that trips it
|
||||
746977 - scm ccache files should be in pkglibdir not pkgdatadir.
|
||||
|
||||
Other repairs that weren't reported in bugs:
|
||||
Let CPAN and ActiveState package managers take care of dependencies instead of explicitly installing a few of them directly.
|
||||
Correct the number field displayed in the reconcile window to correspond with the source specified in File->Options
|
||||
Fix some bugs found by SWIG version 3.0.5. Prior to version 3.0.3 SWIG silently ignored invalid preprocessor directives
|
||||
Scrubbing Improvements, including avoiding a potential infinite loop.
|
||||
Remove build and run of no-longer-existant intl-scm/guile-strings.
|
||||
Rewrite gnc-test-env in perl. This eliminates another guile dependency in the build chain.
|
||||
Switch from guile to xml to manage our iso-currencies source file
|
||||
Numeric values with more than commodity smallest fraction get silently dropped.
|
||||
Update US Income Tax data to reflect minor changes for 2014
|
||||
Advanced portfolio should respect report date when looking for other income/expense
|
||||
Improve income and expense reporting in advanced portfolio report
|
||||
Accept prices of the form n.nnne[+-]nn, i.e. with an exponent. An example requiring this is currency conversion from IDR to USD
|
||||
Added Lithuanian language business accounts
|
||||
Fix crash when running check & repair on an open AP/AR register
|
||||
|
||||
Updated Translations: Danish, Dutch, German, Spanish
|
||||
|
||||
New Translations: Maithili, Manipuri-Bengali Script, Manipuri-Meetei Mayek Script.
|
||||
|
||||
|
||||
2.6.5 - 16 December 2014
|
||||
Announcement: GnuCash 2.6.5 Release 2014-12-16
|
||||
GnuCash 2.6.5 released
|
||||
|
||||
26
configure.ac
26
configure.ac
@ -204,10 +204,10 @@ CFLAGS="${cflags_save}"
|
||||
|
||||
# test whether we are building directly from svn/svk/git/bzr
|
||||
AC_MSG_CHECKING(if building from an scm managed directory)
|
||||
"$srcdir/util/gnc-scm-info" -r "$srcdir" >/dev/null 2>&1
|
||||
if test $? = 0 -o "x${BUILDING_FROM_SCM}" = "xyes" ; then
|
||||
BUILDING_FROM_SCM=yes
|
||||
SCM_TYPE=$("$srcdir/util/gnc-scm-info" -t "$srcdir")
|
||||
"$srcdir/util/gnc-vcs-info" -r "$srcdir" >/dev/null 2>&1
|
||||
if test $? = 0 -o "x${BUILDING_FROM_VCS}" = "xyes" ; then
|
||||
BUILDING_FROM_VCS=yes
|
||||
SCM_TYPE=$("$srcdir/util/gnc-vcs-info" -t "$srcdir")
|
||||
AC_MSG_RESULT($SCM_TYPE)
|
||||
|
||||
if test "x${SCM_TYPE}" = "xgit"; then
|
||||
@ -222,32 +222,32 @@ if test $? = 0 -o "x${BUILDING_FROM_SCM}" = "xyes" ; then
|
||||
fi
|
||||
else
|
||||
AC_MSG_RESULT(no)
|
||||
BUILDING_FROM_SCM=no
|
||||
BUILDING_FROM_VCS=no
|
||||
SCM_TYPE=
|
||||
|
||||
# Make sure we've got swig-runtime.h and gnc-scm-info.h
|
||||
# Make sure we've got swig-runtime.h and gnc-vcs-info.h
|
||||
AC_CHECK_FILE(${srcdir}/src/swig-runtime.h, [],
|
||||
[AC_MSG_ERROR([
|
||||
|
||||
It looks like you are NOT building from Subversion, svk, git or bzr
|
||||
but I cannot find swig-runtime.h. Check your PATH and make sure
|
||||
we can find gnc-scm-info in your PATH!
|
||||
we can find gnc-vcs-info in your PATH!
|
||||
Either that or contact gnucash-devel@gnucash.org because
|
||||
the tarball you downloaded is broken.
|
||||
|
||||
])])
|
||||
AC_CHECK_FILE(${srcdir}/src/core-utils/gnc-scm-info.h, [],
|
||||
AC_CHECK_FILE(${srcdir}/src/core-utils/gnc-vcs-info.h, [],
|
||||
[AC_MSG_ERROR([
|
||||
|
||||
It looks like you are NOT building from Subversion, svk, git or bzr
|
||||
but I cannot find gnc-scm-info.h. Check your PATH and make sure
|
||||
we can find gnc-scm-info in your PATH!
|
||||
but I cannot find gnc-vcs-info.h. Check your PATH and make sure
|
||||
we can find gnc-vcs-info in your PATH!
|
||||
Either that or contact gnucash-devel@gnucash.org because
|
||||
the tarball you downloaded is broken.
|
||||
|
||||
])])
|
||||
fi
|
||||
AM_CONDITIONAL(BUILDING_FROM_SCM, test "x$BUILDING_FROM_SCM" = "xyes")
|
||||
AM_CONDITIONAL(BUILDING_FROM_VCS, test "x$BUILDING_FROM_VCS" = "xyes")
|
||||
AC_SUBST(SCM_TYPE)
|
||||
AC_SUBST(GIT_CMD)
|
||||
|
||||
@ -508,7 +508,7 @@ the intltool-ltdl development packages ?])])
|
||||
# with that tarball so we have to prepare the tarball for guile 2
|
||||
# compatibility.
|
||||
#
|
||||
if test "${BUILDING_FROM_SCM}" = yes
|
||||
if test "${BUILDING_FROM_VCS}" = yes
|
||||
then
|
||||
AX_PKG_SWIG(2.0.10, [gnc_have_swig_2_0_10=yes], [gnc_have_swig_2_0_10=no])
|
||||
|
||||
@ -1501,7 +1501,7 @@ then
|
||||
#warnFLAGS="${warnFLAGS} -Werror-implicit-function-declaration" # In -Wall
|
||||
|
||||
# error-on-warning should not be active in (stable) release tarballs
|
||||
if test "x$BUILDING_FROM_SCM" = "xyes"
|
||||
if test "x$BUILDING_FROM_VCS" = "xyes"
|
||||
then
|
||||
# This code is from svn/svk/git/bzr, so enable error-on-warning
|
||||
error_on_warning_as_default="yes"
|
||||
|
||||
@ -8,16 +8,30 @@ src/gnome-utils/gnc-tree-model-selection.c
|
||||
src/gnc/.*
|
||||
src/optional/gtkmm/.*
|
||||
|
||||
# Skip softlinks to scm files. These softlinks are created
|
||||
# for testing purposes. Unfortunately distcheck doesn't appear
|
||||
# smart enough to ignore them.
|
||||
# Skip softlinks to scm files. These softlinks are created in builddir
|
||||
# for testing purposes, intltool-extract isn't smart enough to ignore
|
||||
# them when bulddir and srcdir are the same, and both intltool-extract
|
||||
# and intltool-update use absolute paths to the srcdir when it's not
|
||||
# the same as builddir which messes up the file names in gnucash.pot.
|
||||
|
||||
src/app-utils/gnucash/app-utils.scm
|
||||
src/app-utils/gnucash/gettext.scm
|
||||
src/business/business-gnome/gnucash/business-gnome.scm
|
||||
src/core-utils/gnucash/core-utils.scm
|
||||
src/engine/gnucash/business-core.scm
|
||||
src/engine/gnucash/engine.scm
|
||||
src/gnc-module/gnucash/gnc-module.scm
|
||||
src/gnome-utils/gnucash/gnome-utils.scm
|
||||
src/import-export/qif-imp/gnucash/import-export/qif-import.scm
|
||||
src/import-export/qif-imp/qif-import/qif-dialog-utils.scm
|
||||
src/import-export/qif-imp/qif-import/qif-file.scm
|
||||
src/import-export/qif-imp/qif-import/qif-guess-map.scm
|
||||
src/import-export/qif-imp/qif-import/qif-import.scm
|
||||
src/import-export/qif-imp/qif-import/qif-merge-groups.scm
|
||||
src/import-export/qif-imp/qif-import/qif-objects.scm
|
||||
src/import-export/qif-imp/qif-import/qif-parse.scm
|
||||
src/import-export/qif-imp/qif-import/qif-to-gnc.scm
|
||||
src/import-export/qif-imp/qif-import/qif-utils.scm
|
||||
src/report/business-reports/gnucash/report/aging.scm
|
||||
src/report/business-reports/gnucash/report/balsheet-eg.eguile.scm
|
||||
src/report/business-reports/gnucash/report/balsheet-eg.scm
|
||||
@ -34,10 +48,19 @@ src/report/business-reports/gnucash/report/receipt.scm
|
||||
src/report/business-reports/gnucash/report/receivables.scm
|
||||
src/report/business-reports/gnucash/report/taxinvoice.eguile.scm
|
||||
src/report/business-reports/gnucash/report/taxinvoice.scm
|
||||
src/report/locale-specific/us/gnucash/report/locale-specific/de_DE.scm
|
||||
src/report/locale-specific/us/gnucash/report/locale-specific/us.scm
|
||||
src/report/locale-specific/us/gnucash/report/taxtxf-de_DE.scm
|
||||
src/report/locale-specific/us/gnucash/report/taxtxf.scm
|
||||
src/report/report-gnome/gnucash/report/report-gnome.scm
|
||||
src/report/report-system/gnucash/report/eguile-gnc.scm
|
||||
src/report/report-system/gnucash/report/eguile-html-utilities.scm
|
||||
src/report/report-system/gnucash/report/eguile-utilities.scm
|
||||
src/report/report-system/gnucash/report/report-system.scm
|
||||
src/report/report-system/gnucash/report/report-system/collectors.scm
|
||||
src/report/report-system/gnucash/report/report-system/list-extras.scm
|
||||
src/report/report-system/gnucash/report/report-system/report-collectors.scm
|
||||
src/report/standard-reports/gnucash/report/standard-reports.scm
|
||||
src/report/standard-reports/gnucash/report/standard-reports/account-piecharts.scm
|
||||
src/report/standard-reports/gnucash/report/standard-reports/account-summary.scm
|
||||
src/report/standard-reports/gnucash/report/standard-reports/advanced-portfolio.scm
|
||||
@ -68,10 +91,15 @@ src/report/stylesheets/gnucash/report/stylesheet-fancy.scm
|
||||
src/report/stylesheets/gnucash/report/stylesheet-footer.scm
|
||||
src/report/stylesheets/gnucash/report/stylesheet-head-or-tail.scm
|
||||
src/report/stylesheets/gnucash/report/stylesheet-plain.scm
|
||||
src/report/stylesheets/gnucash/report/stylesheets.scm
|
||||
src/report/utility-reports/gnucash/report/hello-world.scm
|
||||
src/report/utility-reports/gnucash/report/utility-reports.scm
|
||||
src/report/utility-reports/gnucash/report/view-column.scm
|
||||
src/report/utility-reports/gnucash/report/welcome-to-gnucash.scm
|
||||
src/scm/build-config.scm
|
||||
src/scm/build-config.scm.in
|
||||
src/scm/gnucash/main.scm
|
||||
src/scm/gnucash/price-quotes.scm
|
||||
src/scm/gnucash/printf.scm
|
||||
src/tax/us/gnucash/tax/de_DE.scm
|
||||
src/tax/us/gnucash/tax/us.scm
|
||||
|
||||
11825
po/zh_CN.po
11825
po/zh_CN.po
File diff suppressed because it is too large
Load Diff
@ -51,7 +51,7 @@ endif
|
||||
noinst_HEADERS = \
|
||||
swig-runtime.h
|
||||
|
||||
if BUILDING_FROM_SCM
|
||||
if BUILDING_FROM_VCS
|
||||
swig-runtime.h:
|
||||
$(SWIG) -guile -external-runtime $@
|
||||
endif
|
||||
|
||||
@ -105,7 +105,7 @@ libgncmod_app_utils_la_LIBADD = \
|
||||
${LIBXML2_LIBS} \
|
||||
${LIBXSLT_LIBS}
|
||||
|
||||
if BUILDING_FROM_SCM
|
||||
if BUILDING_FROM_VCS
|
||||
swig-app-utils-guile.c: app-utils.i ${top_srcdir}/src/base-typemaps.i
|
||||
$(SWIG) -guile $(SWIG_ARGS) -Linkage module \
|
||||
-I${top_srcdir}/src -o $@ $<
|
||||
@ -222,10 +222,10 @@ GUILE_COMPILE_ENV = \
|
||||
$(shell ${abs_top_srcdir}/src/gnc-test-env.pl --noexports ${GUILE_COMPILE_ENV}) \
|
||||
$(GUILD) compile -o $@ $<
|
||||
|
||||
gncscmmodcachedir = ${GNC_SCM_INSTALL_DIR}/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash
|
||||
gncscmmodcachedir = ${pkglibdir}/scm/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash
|
||||
gncscmmodcache_DATA = $(gncscmmod_DATA:.scm=.go)
|
||||
|
||||
gncscmcachedir = ${GNC_SCM_INSTALL_DIR}/ccache/@GUILE_EFFECTIVE_VERSION@
|
||||
gncscmcachedir = ${pkglibdir}/scm/ccache/@GUILE_EFFECTIVE_VERSION@
|
||||
gncscmcache_DATA = $(gncscm_DATA:.scm=.go)
|
||||
endif
|
||||
|
||||
|
||||
@ -53,7 +53,7 @@ GUILE_WARN_DEPRECATED=no
|
||||
# GUILE_LIBS=
|
||||
# GUILE_COMPILED_LIBS=
|
||||
GUILE_LOAD_PATH={GNC_DATA}/scm;{GUILE_LIBS};{GUILE_LOAD_PATH}
|
||||
GUILE_LOAD_COMPILED_PATH={GNC_DATA}/scm/ccache/@-GUILE_EFFECTIVE_VERSION-@;{GUILE_COMPILED_LIBS};{GUILE_LOAD_COMPILED_PATH}
|
||||
GUILE_LOAD_COMPILED_PATH={GNC_LIB}/scm/ccache/@-GUILE_EFFECTIVE_VERSION-@;{GUILE_COMPILED_LIBS};{GUILE_LOAD_COMPILED_PATH}
|
||||
|
||||
# Tell Guile where to find GnuCash specific shared libraries
|
||||
GNC_LIBRARY_PATH={SYS_LIB};{GNC_LIB}
|
||||
|
||||
@ -144,7 +144,7 @@ GUILE_COMPILE_ENV = \
|
||||
$(shell ${abs_top_srcdir}/src/gnc-test-env.pl --noexports ${GUILE_COMPILE_ENV}) \
|
||||
$(GUILD) compile -o $@ $<
|
||||
|
||||
gncscmmodcachedir = ${GNC_SCM_INSTALL_DIR}/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash
|
||||
gncscmmodcachedir = ${pkglibdir}/scm/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash
|
||||
gncscmmodcache_DATA = $(gncscmmod_DATA:.scm=.go)
|
||||
endif
|
||||
|
||||
|
||||
@ -42,7 +42,7 @@ noinst_HEADERS = \
|
||||
gnc-path.h \
|
||||
gnc-uri-utils.h
|
||||
|
||||
if BUILDING_FROM_SCM
|
||||
if BUILDING_FROM_VCS
|
||||
swig-core-utils-guile.c: core-utils.i ${top_srcdir}/src/base-typemaps.i
|
||||
$(SWIG) -guile $(SWIG_ARGS) -Linkage module \
|
||||
-I${top_srcdir}/src -o $@ $<
|
||||
@ -123,13 +123,13 @@ GUILE_COMPILE_ENV = \
|
||||
$(shell ${abs_top_srcdir}/src/gnc-test-env.pl --noexports ${GUILE_COMPILE_ENV}) \
|
||||
$(GUILD) compile -o $@ $<
|
||||
|
||||
gncscmmodcachedir = ${GNC_SCM_INSTALL_DIR}/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash
|
||||
gncscmmodcachedir = ${pkglibdir}/scm/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash
|
||||
gncscmmodcache_DATA = $(gncscmmod_DATA:.scm=.go)
|
||||
endif
|
||||
|
||||
noinst_DATA = .scm-links
|
||||
BUILT_SOURCES = gncla-dir.h gnc-version.h
|
||||
EXTRA_DIST = $(gncscmmod_DATA) core-utils.i gncla-dir.h.in gnc-scm-info.h
|
||||
EXTRA_DIST = $(gncscmmod_DATA) core-utils.i gncla-dir.h.in gnc-vcs-info.h
|
||||
clean-local:
|
||||
rm -rf gnucash
|
||||
|
||||
@ -159,37 +159,37 @@ gnc-version.h: _gnc-version.h
|
||||
-cmp -s _gnc-version.h gnc-version.h || cp _gnc-version.h gnc-version.h
|
||||
-rm -f _gnc-version.h
|
||||
|
||||
_gnc-version.h: gnc-scm-info.h Makefile
|
||||
_gnc-version.h: gnc-vcs-info.h Makefile
|
||||
@echo "/* Autogenerated. Do not change. */" > _gnc-version.h
|
||||
@echo "#ifndef GNC_VERSION_H" >> _gnc-version.h
|
||||
@echo "#define GNC_VERSION_H" >> _gnc-version.h
|
||||
@echo "" >> _gnc-version.h
|
||||
@scm_info=`${top_srcdir}/util/gnc-scm-info -t ${top_srcdir}` ; \
|
||||
@scm_info=`${top_srcdir}/util/gnc-vcs-info -t ${top_srcdir}` ; \
|
||||
if [ $$? = 0 ] ; then \
|
||||
echo "#define GNUCASH_SCM \"$$scm_info\"" >> _gnc-version.h ; \
|
||||
fi
|
||||
@echo "#define GNUCASH_BUILD_DATE \"`date +%Y-%m-%d`\"" >> _gnc-version.h
|
||||
@echo "#include \"gnc-scm-info.h\"" >> _gnc-version.h
|
||||
@echo "#include \"gnc-vcs-info.h\"" >> _gnc-version.h
|
||||
@echo "#endif" >> _gnc-version.h
|
||||
|
||||
gnc-scm-info.h: _gnc-scm-info.h
|
||||
-if [ ! -f gnc-scm-info.h ]; then cp _gnc-scm-info.h gnc-scm-info.h; fi
|
||||
-cmp -s _gnc-scm-info.h gnc-scm-info.h || cp _gnc-scm-info.h gnc-scm-info.h
|
||||
-rm -f _gnc-scm-info.h
|
||||
gnc-vcs-info.h: _gnc-vcs-info.h
|
||||
-if [ ! -f gnc-vcs-info.h ]; then cp _gnc-vcs-info.h gnc-vcs-info.h; fi
|
||||
-cmp -s _gnc-vcs-info.h gnc-vcs-info.h || cp _gnc-vcs-info.h gnc-vcs-info.h
|
||||
-rm -f _gnc-vcs-info.h
|
||||
|
||||
_gnc-scm-info.h: Makefile
|
||||
@scm_info=`${top_srcdir}/util/gnc-scm-info -r ${top_srcdir}` ; \
|
||||
_gnc-vcs-info.h: Makefile
|
||||
@scm_info=`${top_srcdir}/util/gnc-vcs-info -r ${top_srcdir}` ; \
|
||||
if [ $$? = 0 ] ; then \
|
||||
if [ -z "$$scm_info" ] ; then \
|
||||
echo "gnc-scm-info failed. figure out why." ; \
|
||||
echo "gnc-vcs-info failed. figure out why." ; \
|
||||
echo "can't determine svn/svk/git/bzr revision from ${top_srcdir}." ; \
|
||||
exit 1 ; \
|
||||
fi ; \
|
||||
echo "/* Autogenerated. Do not change. */" > _gnc-scm-info.h ; \
|
||||
echo "#define GNUCASH_SCM_REV \"$$scm_info\"" >> _gnc-scm-info.h ; \
|
||||
echo "/* Autogenerated. Do not change. */" > _gnc-vcs-info.h ; \
|
||||
echo "#define GNUCASH_SCM_REV \"$$scm_info\"" >> _gnc-vcs-info.h ; \
|
||||
else \
|
||||
if [ -r $(srcdir)/gnc-scm-info.h ] ; then \
|
||||
cp $(srcdir)/gnc-scm-info.h _gnc-scm-info.h ; \
|
||||
if [ -r $(srcdir)/gnc-vcs-info.h ] ; then \
|
||||
cp $(srcdir)/gnc-vcs-info.h _gnc-vcs-info.h ; \
|
||||
else \
|
||||
echo "You're building from svn/svk/git/bzr... But your build system is broken" ; \
|
||||
echo "Don't do that. Complain to your build-system creator." ; \
|
||||
|
||||
@ -202,16 +202,16 @@ GUILE_COMPILE_ENV = \
|
||||
$(shell ${abs_top_srcdir}/src/gnc-test-env.pl --noexports ${GUILE_COMPILE_ENV}) \
|
||||
$(GUILD) compile -o $@ $<
|
||||
|
||||
gncscmmodcachedir = ${GNC_SCM_INSTALL_DIR}/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash
|
||||
gncscmmodcachedir = ${pkglibdir}/scm/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash
|
||||
gncscmmodcache_DATA = $(gncscmmod_DATA:.scm=.go)
|
||||
|
||||
gncscmcachedir = ${GNC_SCM_INSTALL_DIR}/ccache/@GUILE_EFFECTIVE_VERSION@
|
||||
gncscmcachedir = ${pkglibdir}/scm/ccache/@GUILE_EFFECTIVE_VERSION@
|
||||
gncscmcache_DATA = $(gncscm_DATA:.scm=.go)
|
||||
endif
|
||||
|
||||
noinst_DATA = .scm-links
|
||||
|
||||
if BUILDING_FROM_SCM
|
||||
if BUILDING_FROM_VCS
|
||||
|
||||
# The generated file depends on various libqof headers. Out of
|
||||
# laziness I only include a few here - more might be needed
|
||||
|
||||
@ -29,7 +29,7 @@ gncinclude_HEADERS = \
|
||||
|
||||
noinst_DATA = .scm-links
|
||||
|
||||
if BUILDING_FROM_SCM
|
||||
if BUILDING_FROM_VCS
|
||||
swig-gnc-module.c: gnc-module.i ${top_srcdir}/src/base-typemaps.i
|
||||
$(SWIG) -guile $(SWIG_ARGS) -Linkage module \
|
||||
-I${top_srcdir}/src -o $@ $<
|
||||
@ -77,7 +77,7 @@ GUILE_COMPILE_ENV = \
|
||||
$(shell ${abs_top_srcdir}/src/gnc-test-env.pl --noexports ${GUILE_COMPILE_ENV}) \
|
||||
$(GUILD) compile -o $@ $<
|
||||
|
||||
gncscmmodcachedir = ${GNC_SCM_INSTALL_DIR}/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash
|
||||
gncscmmodcachedir = ${pkglibdir}/scm/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash
|
||||
gncscmmodcache_DATA = $(gncscmmod_DATA:.scm=.go)
|
||||
endif
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@ libgncmodbar_la_LIBADD=libbar.la \
|
||||
$(GUILE_LIBS) \
|
||||
$(GLIB_LIBS)
|
||||
|
||||
if BUILDING_FROM_SCM
|
||||
if BUILDING_FROM_VCS
|
||||
swig-bar.c: bar.i
|
||||
$(SWIG) -guile $(SWIG_ARGS) -Linkage module -o $@ $<
|
||||
if ! OS_WIN32
|
||||
|
||||
@ -26,7 +26,7 @@ libgncmodbaz_la_LIBADD = \
|
||||
$(GUILE_LIBS) \
|
||||
$(GLIB_LIBS)
|
||||
|
||||
if BUILDING_FROM_SCM
|
||||
if BUILDING_FROM_VCS
|
||||
swig-baz.c: baz.i
|
||||
$(SWIG) -guile $(SWIG_ARGS) -Linkage module -o $@ $<
|
||||
if ! OS_WIN32
|
||||
|
||||
@ -27,7 +27,7 @@ EXTRA_DIST = \
|
||||
foo.i \
|
||||
gnucash/foo.scm
|
||||
|
||||
if BUILDING_FROM_SCM
|
||||
if BUILDING_FROM_VCS
|
||||
swig-foo.c: foo.i
|
||||
$(SWIG) -guile $(SWIG_ARGS) -Linkage module -o $@ $<
|
||||
if ! OS_WIN32
|
||||
|
||||
@ -225,7 +225,7 @@ if HAVE_X11_XLIB_H
|
||||
libgncmod_gnome_utils_la_LIBADD += -lX11
|
||||
endif
|
||||
|
||||
if BUILDING_FROM_SCM
|
||||
if BUILDING_FROM_VCS
|
||||
swig-gnome-utils.c: gnome-utils.i \
|
||||
${top_srcdir}/src/base-typemaps.i
|
||||
$(SWIG) -guile $(SWIG_ARGS) -Linkage module \
|
||||
@ -293,10 +293,10 @@ GUILE_COMPILE_ENV = \
|
||||
$(shell ${abs_top_srcdir}/src/gnc-test-env.pl --noexports ${GUILE_COMPILE_ENV}) \
|
||||
$(GUILD) compile -o $@ $<
|
||||
|
||||
gncscmmodcachedir = ${GNC_SCM_INSTALL_DIR}/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash
|
||||
gncscmmodcachedir = ${pkglibdir}/scm/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash
|
||||
gncscmmodcache_DATA = $(gncscmmod_DATA:.scm=.go)
|
||||
|
||||
gncscmcachedir = ${GNC_SCM_INSTALL_DIR}/ccache/@GUILE_EFFECTIVE_VERSION@
|
||||
gncscmcachedir = ${pkglibdir}/scm/ccache/@GUILE_EFFECTIVE_VERSION@
|
||||
gncscmcache_DATA = $(gncscm_DATA:.scm=.go)
|
||||
endif
|
||||
|
||||
|
||||
@ -112,7 +112,7 @@ noinst_HEADERS = \
|
||||
window-reconcile2.h \
|
||||
window-autoclear.h
|
||||
|
||||
if BUILDING_FROM_SCM
|
||||
if BUILDING_FROM_VCS
|
||||
swig-gnome.c: gnome.i dialog-progress.h ${top_srcdir}/src/base-typemaps.i
|
||||
$(SWIG) -guile $(SWIG_ARGS) -Linkage module \
|
||||
-I${top_srcdir}/src -o $@ $<
|
||||
|
||||
@ -54,7 +54,7 @@ libgncmod_html_la_LIBADD = \
|
||||
${GUILE_LIBS} \
|
||||
${REGEX_LIBS}
|
||||
|
||||
if BUILDING_FROM_SCM
|
||||
if BUILDING_FROM_VCS
|
||||
swig-gnc-html.c: gnc-html.i gnc-html.h \
|
||||
${top_srcdir}/src/base-typemaps.i
|
||||
$(SWIG) -guile $(SWIG_ARGS) -Linkage module \
|
||||
|
||||
@ -128,10 +128,10 @@ GUILE_COMPILE_ENV = \
|
||||
$(shell ${abs_top_srcdir}/src/gnc-test-env.pl --noexports ${GUILE_COMPILE_ENV}) \
|
||||
$(GUILD) compile -o $@ $<
|
||||
|
||||
gncscmmodcachedir = ${GNC_SCM_INSTALL_DIR}/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash/import-export
|
||||
gncscmmodcachedir = ${pkglibdir}/scm/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash/import-export
|
||||
gncscmmodcache_DATA = $(gncscmmod_DATA:.scm=.go)
|
||||
|
||||
gncscmcachedir = ${GNC_SCM_INSTALL_DIR}/ccache/@GUILE_EFFECTIVE_VERSION@/qif-import
|
||||
gncscmcachedir = ${pkglibdir}/scm/ccache/@GUILE_EFFECTIVE_VERSION@/qif-import
|
||||
gncscmcache_DATA = $(gncscm_DATA:.scm=.go)
|
||||
endif
|
||||
|
||||
|
||||
@ -38,7 +38,7 @@ _gnucash_core_c_la_LIBADD = \
|
||||
${top_builddir}/src/gnc-module/libgnc-module.la \
|
||||
${top_builddir}/src/engine/libgncmod-engine.la \
|
||||
${top_builddir}/src/app-utils/libgncmod-app-utils.la
|
||||
if BUILDING_FROM_SCM
|
||||
if BUILDING_FROM_VCS
|
||||
_gnucash_core_c_includes= \
|
||||
${top_builddir}/config.h \
|
||||
${top_srcdir}/src/libqof/qof/qofsession.h \
|
||||
|
||||
@ -78,7 +78,7 @@ gncextrasmallicon_DATA = 16x16/gnucash-icon.png
|
||||
gncscalableicondir = ${datadir}/icons/hicolor/scalable/apps
|
||||
gncscalableicon_DATA = scalable/gnucash-icon.svg
|
||||
|
||||
if BUILDING_FROM_SCM
|
||||
if BUILDING_FROM_VCS
|
||||
256x256/gnucash-icon.png: gnucash-icon-256x256.png
|
||||
-mkdir -p 256x256
|
||||
cp ${srcdir}/gnucash-icon-256x256.png 256x256/gnucash-icon.png
|
||||
@ -161,7 +161,7 @@ EXTRA_DIST = \
|
||||
${gncscalableicon_DATA}
|
||||
|
||||
# Only clean up if we're building from svn/svk/git/bzr
|
||||
if BUILDING_FROM_SCM
|
||||
if BUILDING_FROM_VCS
|
||||
clean-local:
|
||||
-rm -rf 256x256 128x128 96x96 64x64 48x48 32x32 24x24 22x22 16x16 scalable
|
||||
endif
|
||||
|
||||
@ -80,7 +80,7 @@ GUILE_COMPILE_ENV = \
|
||||
$(shell ${abs_top_srcdir}/src/gnc-test-env.pl --noexports ${GUILE_COMPILE_ENV}) \
|
||||
$(GUILD) compile -o $@ $<
|
||||
|
||||
gncscmmodcachedir = ${GNC_SCM_INSTALL_DIR}/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash/report
|
||||
gncscmmodcachedir = ${pkglibdir}/scm/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash/report
|
||||
gncscmmodcache_DATA = $(gncscmmod_DATA:.scm=.go)
|
||||
endif
|
||||
|
||||
|
||||
@ -84,10 +84,10 @@ GUILE_COMPILE_ENV = \
|
||||
$(shell ${abs_top_srcdir}/src/gnc-test-env.pl --noexports ${GUILE_COMPILE_ENV}) \
|
||||
$(GUILD) compile -o $@ $<
|
||||
|
||||
gncscmmodcachedir = ${GNC_SCM_INSTALL_DIR}/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash/report
|
||||
gncscmmodcachedir = ${pkglibdir}/scm/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash/report
|
||||
gncscmmodcache_DATA = $(gncscmmod_DATA:.scm=.go)
|
||||
|
||||
gncscmrptcachedir = ${GNC_SCM_INSTALL_DIR}/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash/report/locale-specific
|
||||
gncscmrptcachedir = ${pkglibdir}/scm/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash/report/locale-specific
|
||||
gncscmrptcache_DATA = $(gncscmrpt_DATA:.scm=.go)
|
||||
endif
|
||||
|
||||
|
||||
@ -49,7 +49,7 @@ libgncmod_report_gnome_la_LIBADD = \
|
||||
${GUILE_LIBS} \
|
||||
${GLIB_LIBS}
|
||||
|
||||
if BUILDING_FROM_SCM
|
||||
if BUILDING_FROM_VCS
|
||||
swig-report-gnome.c: report-gnome.i ${top_srcdir}/src/base-typemaps.i
|
||||
$(SWIG) -guile $(SWIG_ARGS) -Linkage module \
|
||||
-I${top_srcdir}/src -o $@ $<
|
||||
@ -132,7 +132,7 @@ GUILE_COMPILE_ENV = \
|
||||
$(shell ${abs_top_srcdir}/src/gnc-test-env.pl --noexports ${GUILE_COMPILE_ENV}) \
|
||||
$(GUILD) compile -o $@ $<
|
||||
|
||||
gncscmmodcachedir = ${GNC_SCM_INSTALL_DIR}/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash/report
|
||||
gncscmmodcachedir = ${pkglibdir}/scm/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash/report
|
||||
gncscmmodcache_DATA = $(gncscmmod_DATA:.scm=.go)
|
||||
endif
|
||||
|
||||
|
||||
@ -23,7 +23,7 @@ libgncmod_report_system_la_LIBADD = \
|
||||
${GLIB_LIBS} \
|
||||
${GTK_LIBS}
|
||||
|
||||
if BUILDING_FROM_SCM
|
||||
if BUILDING_FROM_VCS
|
||||
swig-report-system.c: report-system.i ${top_srcdir}/src/base-typemaps.i
|
||||
$(SWIG) -guile $(SWIG_ARGS) -Linkage module \
|
||||
-I${top_srcdir}/src -o $@ $<
|
||||
@ -137,13 +137,13 @@ GUILE_COMPILE_ENV = \
|
||||
$(shell ${abs_top_srcdir}/src/gnc-test-env.pl --noexports ${GUILE_COMPILE_ENV}) \
|
||||
$(GUILD) compile -o $@ $<
|
||||
|
||||
gncscmmodcachedir = ${GNC_SCM_INSTALL_DIR}/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash/report
|
||||
gncscmmodcachedir = ${pkglibdir}/scm/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash/report
|
||||
gncscmmodcache_DATA = $(gncscmmod_DATA:.scm=.go)
|
||||
|
||||
gncmodscmcachedir = ${GNC_SCM_INSTALL_DIR}/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash/report/report-system
|
||||
gncmodscmcachedir = ${pkglibdir}/scm/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash/report/report-system
|
||||
gncmodscmcache_DATA = $(gncmodscm_DATA:.scm=.go)
|
||||
|
||||
gncscmcachedir = ${GNC_SCM_INSTALL_DIR}/ccache/@GUILE_EFFECTIVE_VERSION@
|
||||
gncscmcachedir = ${pkglibdir}/scm/ccache/@GUILE_EFFECTIVE_VERSION@
|
||||
gncscmcache_DATA = $(gncscm_DATA:.scm=.go)
|
||||
endif
|
||||
|
||||
|
||||
@ -105,10 +105,10 @@ GUILE_COMPILE_ENV = \
|
||||
$(shell ${abs_top_srcdir}/src/gnc-test-env.pl --noexports ${GUILE_COMPILE_ENV}) \
|
||||
$(GUILD) compile -o $@ $<
|
||||
|
||||
gncscmmodcachedir = ${GNC_SCM_INSTALL_DIR}/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash/report
|
||||
gncscmmodcachedir = ${pkglibdir}/scm/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash/report
|
||||
gncscmmodcache_DATA = $(gncscmmod_DATA:.scm=.go)
|
||||
|
||||
gncscmrptcachedir = ${GNC_SCM_INSTALL_DIR}/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash/report/standard-reports
|
||||
gncscmrptcachedir = ${pkglibdir}/scm/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash/report/standard-reports
|
||||
gncscmrptcache_DATA = $(gncscmrpt_DATA:.scm=.go)
|
||||
endif
|
||||
|
||||
|
||||
@ -93,7 +93,7 @@ GUILE_COMPILE_ENV = \
|
||||
$(shell ${abs_top_srcdir}/src/gnc-test-env.pl --noexports ${GUILE_COMPILE_ENV}) \
|
||||
$(GUILD) compile -o $@ $<
|
||||
|
||||
gncscmmodcachedir = ${GNC_SCM_INSTALL_DIR}/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash/report
|
||||
gncscmmodcachedir = ${pkglibdir}/scm/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash/report
|
||||
gncscmmodcache_DATA = $(gncscmmod_DATA:.scm=.go)
|
||||
endif
|
||||
|
||||
|
||||
@ -77,7 +77,7 @@ GUILE_COMPILE_ENV = \
|
||||
$(shell ${abs_top_srcdir}/src/gnc-test-env.pl --noexports ${GUILE_COMPILE_ENV}) \
|
||||
$(GUILD) compile -o $@ $<
|
||||
|
||||
gncscmmodcachedir = ${GNC_SCM_INSTALL_DIR}/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash/report
|
||||
gncscmmodcachedir = ${pkglibdir}/scm/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash/report
|
||||
gncscmmodcache_DATA = $(gncscmmod_DATA:.scm=.go)
|
||||
endif
|
||||
|
||||
|
||||
@ -54,10 +54,10 @@ GUILE_COMPILE_ENV = \
|
||||
$(shell ${abs_top_srcdir}/src/gnc-test-env.pl --noexports ${GUILE_COMPILE_ENV}) \
|
||||
$(GUILD) compile -o $@ $<
|
||||
|
||||
gncscmmodcachedir = ${GNC_SCM_INSTALL_DIR}/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash
|
||||
gncscmmodcachedir = ${pkglibdir}/scm/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash
|
||||
gncscmmodcache_DATA = $(gncscmmod_DATA:.scm=.go)
|
||||
|
||||
gncscmcachedir = ${GNC_SCM_INSTALL_DIR}/ccache/@GUILE_EFFECTIVE_VERSION@
|
||||
gncscmcachedir = ${pkglibdir}/scm/ccache/@GUILE_EFFECTIVE_VERSION@
|
||||
gncscmcache_DATA = $(gncscm_DATA:.scm=.go)
|
||||
endif
|
||||
|
||||
|
||||
@ -24,7 +24,7 @@ if GNC_HAVE_GUILE_2
|
||||
$(GUILD) compile \
|
||||
-o $@ $<
|
||||
|
||||
gncscmcachedir = ${GNC_SCM_INSTALL_DIR}/ccache/@GUILE_EFFECTIVE_VERSION@/gnumeric
|
||||
gncscmcachedir = ${pkglibdir}/scm/ccache/@GUILE_EFFECTIVE_VERSION@/gnumeric
|
||||
gncscmcache_DATA = $(gncscm_DATA:.scm=.go)
|
||||
endif
|
||||
|
||||
|
||||
@ -64,10 +64,10 @@ GUILE_COMPILE_ENV = \
|
||||
$(shell ${abs_top_srcdir}/src/gnc-test-env.pl --noexports ${GUILE_COMPILE_ENV}) \
|
||||
$(GUILD) compile -o $@ $<
|
||||
|
||||
gncscmmodcachedir = ${GNC_SCM_INSTALL_DIR}/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash/tax
|
||||
gncscmmodcachedir = ${pkglibdir}/scm/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash/tax
|
||||
gncscmmodcache_DATA = $(gncscmmod_DATA:.scm=.go)
|
||||
|
||||
gncscmcachedir = ${GNC_SCM_INSTALL_DIR}/ccache/@GUILE_EFFECTIVE_VERSION@
|
||||
gncscmcachedir = ${pkglibdir}/scm/ccache/@GUILE_EFFECTIVE_VERSION@
|
||||
gncscmcache_DATA = $(gncscm_DATA:.scm=.go)
|
||||
endif
|
||||
|
||||
|
||||
@ -23,7 +23,7 @@ libtest_core_la_CPPFLAGS = \
|
||||
libtest_core_la_LDFLAGS = \
|
||||
-rpath ${exec-prefix}/lib
|
||||
|
||||
if BUILDING_FROM_SCM
|
||||
if BUILDING_FROM_VCS
|
||||
swig-unittest-support-guile.c: unittest-support.i $(top_srcdir)/src/base-typemaps.i
|
||||
$(SWIG) -guile $(SWIG_ARGS) -Linkage module \
|
||||
-I${top_srcdir}/src \
|
||||
@ -123,7 +123,7 @@ GUILE_COMPILE_ENV = \
|
||||
$(shell ${abs_top_srcdir}/src/gnc-test-env.pl --noexports ${GUILE_COMPILE_ENV}) \
|
||||
$(GUILD) compile -o $@ $<
|
||||
|
||||
gncscmmodcachedir = ${GNC_SCM_INSTALL_DIR}/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash
|
||||
gncscmmodcachedir = ${pkglibdir}/scm/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash
|
||||
gncscmmodcache_DATA = $(gncscmmod_DATA:.scm=.go)
|
||||
endif
|
||||
|
||||
|
||||
@ -26,14 +26,14 @@ my_die()
|
||||
exit 1
|
||||
}
|
||||
|
||||
if [ "$BUILDING_FROM_SVN" = "0" -o \
|
||||
"$BUILDING_FROM_SVN" = "no" -o \
|
||||
"$BUILDING_FROM_SVN" = "false" ]; then
|
||||
if [ "$BUILDING_FROM_VCS" = "0" -o \
|
||||
"$BUILDING_FROM_VCS" = "no" -o \
|
||||
"$BUILDING_FROM_VCS" = "false" ]; then
|
||||
# Something outside of the Gnucash build system knows that we
|
||||
# are NOT building from svn, svk or git checkout.
|
||||
# We should believe it (needed by packagers that maintain the
|
||||
# packaging code in svn, svk or git too)
|
||||
echo "Environment variable BUILDING_FROM_SVN=$BUILDING_FROM_SVN" >&2
|
||||
echo "Environment variable BUILDING_FROM_VCS=$BUILDING_FROM_VCS" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
@ -165,7 +165,7 @@ if test $? != 0 ; then exit 1 ; fi
|
||||
# If we're only interested in the vcs type, then we're done here
|
||||
if [ "$request" = "type" ]
|
||||
then
|
||||
echo "bzr"
|
||||
echo "svk"
|
||||
exit 0
|
||||
fi
|
||||
|
||||
Loading…
Reference in New Issue
Block a user