r19364 - gnucash/trunk - Merge the sql parsers of the business objects into the main sql module.

Geert Janssens janssens-geert at telenet.be
Thu Jul 15 11:48:25 EDT 2010


On Wednesday 14 July 2010, Christian Stimming wrote:
> Author: cstim
> Date: 2010-07-14 15:39:19 -0400 (Wed, 14 Jul 2010)
> New Revision: 19364
> Trac: http://svn.gnucash.org/trac/changeset/19364
> 
> Added:
>    gnucash/trunk/src/backend/dbi/test/test-dbi-business-stuff.c
>    gnucash/trunk/src/backend/dbi/test/test-dbi-business-stuff.h
>    gnucash/trunk/src/backend/dbi/test/test-dbi-business.c
>    gnucash/trunk/src/backend/sql/gnc-address-sql.c
>    gnucash/trunk/src/backend/sql/gnc-address-sql.h
>    gnucash/trunk/src/backend/sql/gnc-bill-term-sql.c
>    gnucash/trunk/src/backend/sql/gnc-bill-term-sql.h
>    gnucash/trunk/src/backend/sql/gnc-customer-sql.c
>    gnucash/trunk/src/backend/sql/gnc-customer-sql.h
>    gnucash/trunk/src/backend/sql/gnc-employee-sql.c
>    gnucash/trunk/src/backend/sql/gnc-employee-sql.h
>    gnucash/trunk/src/backend/sql/gnc-entry-sql.c
>    gnucash/trunk/src/backend/sql/gnc-entry-sql.h
>    gnucash/trunk/src/backend/sql/gnc-invoice-sql.c
>    gnucash/trunk/src/backend/sql/gnc-invoice-sql.h
>    gnucash/trunk/src/backend/sql/gnc-job-sql.c
>    gnucash/trunk/src/backend/sql/gnc-job-sql.h
>    gnucash/trunk/src/backend/sql/gnc-order-sql.c
>    gnucash/trunk/src/backend/sql/gnc-order-sql.h
>    gnucash/trunk/src/backend/sql/gnc-owner-sql.c
>    gnucash/trunk/src/backend/sql/gnc-owner-sql.h
>    gnucash/trunk/src/backend/sql/gnc-tax-table-sql.c
>    gnucash/trunk/src/backend/sql/gnc-tax-table-sql.h
>    gnucash/trunk/src/backend/sql/gnc-vendor-sql.c
>    gnucash/trunk/src/backend/sql/gnc-vendor-sql.h
> Removed:
>    gnucash/trunk/src/business/business-core/sql/CMakeLists.txt
>    gnucash/trunk/src/business/business-core/sql/Makefile.am
>    gnucash/trunk/src/business/business-core/sql/gnc-address-sql.c
>    gnucash/trunk/src/business/business-core/sql/gnc-address-sql.h
>    gnucash/trunk/src/business/business-core/sql/gnc-bill-term-sql.c
>    gnucash/trunk/src/business/business-core/sql/gnc-bill-term-sql.h
>    gnucash/trunk/src/business/business-core/sql/gnc-customer-sql.c
>    gnucash/trunk/src/business/business-core/sql/gnc-customer-sql.h
>    gnucash/trunk/src/business/business-core/sql/gnc-employee-sql.c
>    gnucash/trunk/src/business/business-core/sql/gnc-employee-sql.h
>    gnucash/trunk/src/business/business-core/sql/gnc-entry-sql.c
>    gnucash/trunk/src/business/business-core/sql/gnc-entry-sql.h
>    gnucash/trunk/src/business/business-core/sql/gnc-invoice-sql.c
>    gnucash/trunk/src/business/business-core/sql/gnc-invoice-sql.h
>    gnucash/trunk/src/business/business-core/sql/gnc-job-sql.c
>    gnucash/trunk/src/business/business-core/sql/gnc-job-sql.h
>    gnucash/trunk/src/business/business-core/sql/gnc-order-sql.c
>    gnucash/trunk/src/business/business-core/sql/gnc-order-sql.h
>    gnucash/trunk/src/business/business-core/sql/gnc-owner-sql.c
>    gnucash/trunk/src/business/business-core/sql/gnc-owner-sql.h
>    gnucash/trunk/src/business/business-core/sql/gnc-tax-table-sql.c
>    gnucash/trunk/src/business/business-core/sql/gnc-tax-table-sql.h
>    gnucash/trunk/src/business/business-core/sql/gnc-vendor-sql.c
>    gnucash/trunk/src/business/business-core/sql/gnc-vendor-sql.h
>   
>  gnucash/trunk/src/business/business-core/sql/gncmod-business-backend-sql.c
>  gnucash/trunk/src/business/business-core/sql/gncmod-business-backend-sql.h
>  gnucash/trunk/src/business/business-core/sql/test/Makefile.am
>   
>  gnucash/trunk/src/business/business-core/sql/test/test-dbi-business-stuff.
> c
>  gnucash/trunk/src/business/business-core/sql/test/test-dbi-business-stuff.
> h gnucash/trunk/src/business/business-core/sql/test/test-dbi-business.c
>  Modified:
>    gnucash/trunk/configure.ac
>    gnucash/trunk/src/CMakeLists.txt
>    gnucash/trunk/src/backend/dbi/test/Makefile.am
>    gnucash/trunk/src/backend/sql/CMakeLists.txt
>    gnucash/trunk/src/backend/sql/Makefile.am
>    gnucash/trunk/src/backend/sql/gnc-backend-sql.c
>    gnucash/trunk/src/backend/sql/test/Makefile.am
>    gnucash/trunk/src/business/business-core/Makefile.am
>    gnucash/trunk/src/business/business-gnome/business-gnome.scm
>    gnucash/trunk/src/gnc/CMakeLists.txt
>    gnucash/trunk/src/optional/python-bindings/gnucash_core.i
> Log:
> Merge the sql parsers of the business objects into the main sql module.
> 
> Also, completely remove the business-core/sql module because it is
> no longer needed. The tests of this module have been moved into
> backend/dbi because they depend on sql+dbi, but not more than that.
> 
This commit breaks the build if you have python bindings enabled on a clean 
checkout.

I think this is due to a reference to the no longer existing
${top_builddir}/src/business/business-core/sql/libgncmod-business-backend-
sql.la
in gnucash/trunk/src/optional/python-bindings/Makefile.am.

Removing that reference fixes the build, but I don't know of that is 
sufficient for the python bindings, so I'll leave the proper fix up to you.

Also, I believe there are now a couple of empty directories in business-core 
(sql, sql/test and xml). Do you think these can be removed ?

Geert


More information about the gnucash-devel mailing list