From 76b764582a4713315a6fb1fd931c80d8a0b09892 Mon Sep 17 00:00:00 2001 From: Christian Stimming Date: Sat, 3 Jul 2010 21:53:22 +0000 Subject: [PATCH] Move the business object implementations from separate module into the main gnucash engine. git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@19329 57a11ea4-9604-0410-9ed3-97b8803252fd --- src/business/business-core/CMakeLists.txt | 41 -------------- src/business/business-core/Makefile.am | 53 ++----------------- src/engine/CMakeLists.txt | 41 ++++++++++++++ src/engine/Makefile.am | 49 +++++++++++++++-- .../business-core => engine}/business-core.i | 0 .../business-core => engine}/gncAddress.c | 0 .../business-core => engine}/gncAddress.h | 0 .../business-core => engine}/gncAddressP.h | 0 .../business-core => engine}/gncBillTerm.c | 0 .../business-core => engine}/gncBillTerm.h | 0 .../business-core => engine}/gncBillTermP.h | 0 .../business-core => engine}/gncBusGuile.c | 0 .../business-core => engine}/gncBusGuile.h | 0 .../business-core => engine}/gncBusPeriod.c | 0 .../business-core => engine}/gncBusiness.c | 0 .../business-core => engine}/gncBusiness.h | 0 .../business-core => engine}/gncCustomer.c | 0 .../business-core => engine}/gncCustomer.h | 0 .../business-core => engine}/gncCustomerP.h | 0 .../business-core => engine}/gncEmployee.c | 0 .../business-core => engine}/gncEmployee.h | 0 .../business-core => engine}/gncEmployeeP.h | 0 .../business-core => engine}/gncEntry.c | 0 .../business-core => engine}/gncEntry.h | 0 .../business-core => engine}/gncEntryP.h | 0 .../business-core => engine}/gncInvoice.c | 0 .../business-core => engine}/gncInvoice.h | 0 .../business-core => engine}/gncInvoiceP.h | 0 .../business-core => engine}/gncJob.c | 0 .../business-core => engine}/gncJob.h | 0 .../business-core => engine}/gncJobP.h | 0 .../business-core => engine}/gncOrder.c | 0 .../business-core => engine}/gncOrder.h | 0 .../business-core => engine}/gncOrderP.h | 0 .../business-core => engine}/gncOwner.c | 0 .../business-core => engine}/gncOwner.h | 0 .../business-core => engine}/gncOwnerP.h | 0 .../business-core => engine}/gncTaxTable.c | 0 .../business-core => engine}/gncTaxTable.h | 0 .../business-core => engine}/gncTaxTableP.h | 0 .../business-core => engine}/gncVendor.c | 0 .../business-core => engine}/gncVendor.h | 0 .../business-core => engine}/gncVendorP.h | 0 src/gnc/main.cpp | 2 +- 44 files changed, 92 insertions(+), 94 deletions(-) rename src/{business/business-core => engine}/business-core.i (100%) rename src/{business/business-core => engine}/gncAddress.c (100%) rename src/{business/business-core => engine}/gncAddress.h (100%) rename src/{business/business-core => engine}/gncAddressP.h (100%) rename src/{business/business-core => engine}/gncBillTerm.c (100%) rename src/{business/business-core => engine}/gncBillTerm.h (100%) rename src/{business/business-core => engine}/gncBillTermP.h (100%) rename src/{business/business-core => engine}/gncBusGuile.c (100%) rename src/{business/business-core => engine}/gncBusGuile.h (100%) rename src/{business/business-core => engine}/gncBusPeriod.c (100%) rename src/{business/business-core => engine}/gncBusiness.c (100%) rename src/{business/business-core => engine}/gncBusiness.h (100%) rename src/{business/business-core => engine}/gncCustomer.c (100%) rename src/{business/business-core => engine}/gncCustomer.h (100%) rename src/{business/business-core => engine}/gncCustomerP.h (100%) rename src/{business/business-core => engine}/gncEmployee.c (100%) rename src/{business/business-core => engine}/gncEmployee.h (100%) rename src/{business/business-core => engine}/gncEmployeeP.h (100%) rename src/{business/business-core => engine}/gncEntry.c (100%) rename src/{business/business-core => engine}/gncEntry.h (100%) rename src/{business/business-core => engine}/gncEntryP.h (100%) rename src/{business/business-core => engine}/gncInvoice.c (100%) rename src/{business/business-core => engine}/gncInvoice.h (100%) rename src/{business/business-core => engine}/gncInvoiceP.h (100%) rename src/{business/business-core => engine}/gncJob.c (100%) rename src/{business/business-core => engine}/gncJob.h (100%) rename src/{business/business-core => engine}/gncJobP.h (100%) rename src/{business/business-core => engine}/gncOrder.c (100%) rename src/{business/business-core => engine}/gncOrder.h (100%) rename src/{business/business-core => engine}/gncOrderP.h (100%) rename src/{business/business-core => engine}/gncOwner.c (100%) rename src/{business/business-core => engine}/gncOwner.h (100%) rename src/{business/business-core => engine}/gncOwnerP.h (100%) rename src/{business/business-core => engine}/gncTaxTable.c (100%) rename src/{business/business-core => engine}/gncTaxTable.h (100%) rename src/{business/business-core => engine}/gncTaxTableP.h (100%) rename src/{business/business-core => engine}/gncVendor.c (100%) rename src/{business/business-core => engine}/gncVendor.h (100%) rename src/{business/business-core => engine}/gncVendorP.h (100%) diff --git a/src/business/business-core/CMakeLists.txt b/src/business/business-core/CMakeLists.txt index ea32b93ee0..73104725fe 100644 --- a/src/business/business-core/CMakeLists.txt +++ b/src/business/business-core/CMakeLists.txt @@ -18,25 +18,8 @@ INCLUDE_DIRECTORIES (${CMAKE_SOURCE_DIR}/src/backend/xml) # for io-gncxml-v2.h INCLUDE_DIRECTORIES (${CMAKE_CURRENT_SOURCE_DIR}) # when building swig-core-utils.c INCLUDE_DIRECTORIES (${CMAKE_CURRENT_BINARY_DIR}) # for gncla-dir.h -SET (SWIG_BUSINESS_CORE_C ${CMAKE_CURRENT_BINARY_DIR}/swig-business-core.c) -GNC_ADD_SWIG_COMMAND (${SWIG_BUSINESS_CORE_C} ${CMAKE_CURRENT_SOURCE_DIR}/business-core.i) - SET (libgnc_business_core_SOURCES - gncAddress.c - gncBillTerm.c - gncBusGuile.c - gncBusiness.c - gncCustomer.c - gncEmployee.c - gncEntry.c - gncInvoice.c - gncJob.c - gncOrder.c - gncOwner.c - gncTaxTable.c - gncVendor.c gncmod-business-core.c - ${SWIG_BUSINESS_CORE_C} ) SET (libgnc_business_core_xml_SOURCES @@ -55,30 +38,6 @@ SET (libgnc_business_core_xml_SOURCES ) SET (libgnc_business_core_HEADERS - gncAddress.h - gncAddressP.h - gncBillTerm.h - gncBillTermP.h - gncBusGuile.h - gncBusiness.h - gncCustomer.h - gncCustomerP.h - gncEmployee.h - gncEmployeeP.h - gncEntry.h - gncEntryP.h - gncInvoice.h - gncInvoiceP.h - gncJob.h - gncJobP.h - gncOrder.h - gncOrderP.h - gncOwner.h - gncOwnerP.h - gncTaxTable.h - gncTaxTableP.h - gncVendor.h - gncVendorP.h ) ADD_LIBRARY (business-core diff --git a/src/business/business-core/Makefile.am b/src/business/business-core/Makefile.am index 9fc6c46766..f85e501f4d 100644 --- a/src/business/business-core/Makefile.am +++ b/src/business/business-core/Makefile.am @@ -12,47 +12,9 @@ AM_CPPFLAGS = \ ${GLIB_CFLAGS} libgncmod_business_core_la_SOURCES = \ - swig-business-core.c \ - gncBusGuile.c \ - gncmod-business-core.c \ - gncAddress.c \ - gncBillTerm.c \ - gncBusiness.c \ - gncCustomer.c \ - gncEmployee.c \ - gncEntry.c \ - gncInvoice.c \ - gncJob.c \ - gncOrder.c \ - gncOwner.c \ - gncTaxTable.c \ - gncVendor.c + gncmod-business-core.c -noinst_HEADERS = \ - gncAddress.h \ - gncAddressP.h \ - gncBillTerm.h \ - gncBillTermP.h \ - gncBusiness.h \ - gncBusGuile.h \ - gncCustomer.h \ - gncCustomerP.h \ - gncEmployee.h \ - gncEmployeeP.h \ - gncEntry.h \ - gncEntryP.h \ - gncInvoice.h \ - gncInvoiceP.h \ - gncJob.h \ - gncJobP.h \ - gncOrder.h \ - gncOrderP.h \ - gncOwner.h \ - gncOwnerP.h \ - gncTaxTable.h \ - gncTaxTableP.h \ - gncVendor.h \ - gncVendorP.h +noinst_HEADERS = libgncmod_business_core_la_LDFLAGS = -avoid-version @@ -66,17 +28,10 @@ libgncmod_business_core_la_LIBADD = \ # business-core-helpers.c -if BUILDING_FROM_SVN -swig-business-core.c: business-core.i ${noinst_HEADERS} \ - ${top_srcdir}/src/base-typemaps.i - $(SWIG) -guile $(SWIG_ARGS) -Linkage module \ - -I${top_srcdir}/src -o $@ $< -endif - gncmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash gncmod_DATA = business-core.scm -EXTRA_DIST = business-core.i ${gncmod_DATA} +EXTRA_DIST = ${gncmod_DATA} if GNUCASH_SEPARATE_BUILDDIR #For executing test cases @@ -99,6 +54,6 @@ endif noinst_DATA = .scm-links CLEANFILES = gnucash .scm-links ${SCM_FILE_LINKS} -MAINTAINERCLEANFILES = swig-business-core.c +MAINTAINERCLEANFILES = INCLUDES = -DG_LOG_DOMAIN=\"gnc.business.core\" diff --git a/src/engine/CMakeLists.txt b/src/engine/CMakeLists.txt index 19cd2c8e2d..40d54417bb 100644 --- a/src/engine/CMakeLists.txt +++ b/src/engine/CMakeLists.txt @@ -50,12 +50,39 @@ SET (libgncmod_engine_HEADERS gncObject.h kvp-scm.h policy.h + gncAddress.h + gncAddressP.h + gncBillTerm.h + gncBillTermP.h + gncBusGuile.h + gncBusiness.h + gncCustomer.h + gncCustomerP.h + gncEmployee.h + gncEmployeeP.h + gncEntry.h + gncEntryP.h + gncInvoice.h + gncInvoiceP.h + gncJob.h + gncJobP.h + gncOrder.h + gncOrderP.h + gncOwner.h + gncOwnerP.h + gncTaxTable.h + gncTaxTableP.h + gncVendor.h + gncVendorP.h ) # Command to generate the swig-engine.c wrapper file SET (SWIG_ENGINE_C ${CMAKE_CURRENT_BINARY_DIR}/swig-engine.c) GNC_ADD_SWIG_COMMAND (${SWIG_ENGINE_C} ${CMAKE_CURRENT_SOURCE_DIR}/engine.i) +SET (SWIG_BUSINESS_CORE_C ${CMAKE_CURRENT_BINARY_DIR}/swig-business-core.c) +GNC_ADD_SWIG_COMMAND (${SWIG_BUSINESS_CORE_C} ${CMAKE_CURRENT_SOURCE_DIR}/business-core.i) + # Command to generate the iso-4217-currencies.c file SET (ISO_4217_C ${CMAKE_CURRENT_BINARY_DIR}/iso-4217-currencies.c) ADD_CUSTOM_COMMAND ( @@ -108,6 +135,20 @@ SET (libgncmod_engine_SOURCES glib-helpers.c policy.c ${SWIG_ENGINE_C} + gncAddress.c + gncBillTerm.c + gncBusGuile.c + gncBusiness.c + gncCustomer.c + gncEmployee.c + gncEntry.c + gncInvoice.c + gncJob.c + gncOrder.c + gncOwner.c + gncTaxTable.c + gncVendor.c + ${SWIG_BUSINESS_CORE_C} ) # Add dependency on config.h diff --git a/src/engine/Makefile.am b/src/engine/Makefile.am index a3967d48fb..a2ead91899 100644 --- a/src/engine/Makefile.am +++ b/src/engine/Makefile.am @@ -42,7 +42,21 @@ libgncmod_engine_la_SOURCES = \ kvp-scm.c \ engine-helpers.c \ glib-helpers.c \ - policy.c + policy.c \ + swig-business-core.c \ + gncBusGuile.c \ + gncAddress.c \ + gncBillTerm.c \ + gncBusiness.c \ + gncCustomer.c \ + gncEmployee.c \ + gncEntry.c \ + gncInvoice.c \ + gncJob.c \ + gncOrder.c \ + gncOwner.c \ + gncTaxTable.c \ + gncVendor.c EXTRA_libgncmod_engine_la_SOURCES = iso-4217-currencies.c @@ -81,7 +95,31 @@ gncinclude_HEADERS = \ gnc-session-scm.h \ gncObject.h \ kvp-scm.h \ - policy.h + policy.h \ + gncAddress.h \ + gncAddressP.h \ + gncBillTerm.h \ + gncBillTermP.h \ + gncBusiness.h \ + gncBusGuile.h \ + gncCustomer.h \ + gncCustomerP.h \ + gncEmployee.h \ + gncEmployeeP.h \ + gncEntry.h \ + gncEntryP.h \ + gncInvoice.h \ + gncInvoiceP.h \ + gncJob.h \ + gncJobP.h \ + gncOrder.h \ + gncOrderP.h \ + gncOwner.h \ + gncOwnerP.h \ + gncTaxTable.h \ + gncTaxTableP.h \ + gncVendor.h \ + gncVendorP.h noinst_HEADERS = \ AccountP.h \ @@ -129,6 +167,7 @@ EXTRA_DIST = \ kvp_doc.txt \ SX-book-p.h \ engine.i \ + business-core.i \ ${gncmod_DATA} \ ${gncscm_DATA} @@ -162,6 +201,10 @@ swig-engine.c: engine.i ${top_srcdir}/src/base-typemaps.i \ ${gncinclude_HEADERS} ${noinst_HEADERS} $(SWIG) -guile $(SWIG_ARGS) -Linkage module \ -I${top_srcdir}/src/libqof/qof -I${top_srcdir}/src -o $@ $< +swig-business-core.c: business-core.i ${noinst_HEADERS} \ + ${top_srcdir}/src/base-typemaps.i + $(SWIG) -guile $(SWIG_ARGS) -Linkage module \ + -I${top_srcdir}/src -o $@ $< endif iso-4217-currencies.c: iso-4217-currencies.scm iso-currencies-to-c @@ -172,6 +215,6 @@ BUILT_SOURCES = iso-4217-currencies.c CLEANFILES = $(BUILT_SOURCES) gnucash .scm-links \ ${SCM_FILE_LINKS} -MAINTAINERCLEANFILES = swig-engine.c +MAINTAINERCLEANFILES = swig-engine.c swig-business-core.c INCLUDES = -DG_LOG_DOMAIN=\"gnc.engine\" diff --git a/src/business/business-core/business-core.i b/src/engine/business-core.i similarity index 100% rename from src/business/business-core/business-core.i rename to src/engine/business-core.i diff --git a/src/business/business-core/gncAddress.c b/src/engine/gncAddress.c similarity index 100% rename from src/business/business-core/gncAddress.c rename to src/engine/gncAddress.c diff --git a/src/business/business-core/gncAddress.h b/src/engine/gncAddress.h similarity index 100% rename from src/business/business-core/gncAddress.h rename to src/engine/gncAddress.h diff --git a/src/business/business-core/gncAddressP.h b/src/engine/gncAddressP.h similarity index 100% rename from src/business/business-core/gncAddressP.h rename to src/engine/gncAddressP.h diff --git a/src/business/business-core/gncBillTerm.c b/src/engine/gncBillTerm.c similarity index 100% rename from src/business/business-core/gncBillTerm.c rename to src/engine/gncBillTerm.c diff --git a/src/business/business-core/gncBillTerm.h b/src/engine/gncBillTerm.h similarity index 100% rename from src/business/business-core/gncBillTerm.h rename to src/engine/gncBillTerm.h diff --git a/src/business/business-core/gncBillTermP.h b/src/engine/gncBillTermP.h similarity index 100% rename from src/business/business-core/gncBillTermP.h rename to src/engine/gncBillTermP.h diff --git a/src/business/business-core/gncBusGuile.c b/src/engine/gncBusGuile.c similarity index 100% rename from src/business/business-core/gncBusGuile.c rename to src/engine/gncBusGuile.c diff --git a/src/business/business-core/gncBusGuile.h b/src/engine/gncBusGuile.h similarity index 100% rename from src/business/business-core/gncBusGuile.h rename to src/engine/gncBusGuile.h diff --git a/src/business/business-core/gncBusPeriod.c b/src/engine/gncBusPeriod.c similarity index 100% rename from src/business/business-core/gncBusPeriod.c rename to src/engine/gncBusPeriod.c diff --git a/src/business/business-core/gncBusiness.c b/src/engine/gncBusiness.c similarity index 100% rename from src/business/business-core/gncBusiness.c rename to src/engine/gncBusiness.c diff --git a/src/business/business-core/gncBusiness.h b/src/engine/gncBusiness.h similarity index 100% rename from src/business/business-core/gncBusiness.h rename to src/engine/gncBusiness.h diff --git a/src/business/business-core/gncCustomer.c b/src/engine/gncCustomer.c similarity index 100% rename from src/business/business-core/gncCustomer.c rename to src/engine/gncCustomer.c diff --git a/src/business/business-core/gncCustomer.h b/src/engine/gncCustomer.h similarity index 100% rename from src/business/business-core/gncCustomer.h rename to src/engine/gncCustomer.h diff --git a/src/business/business-core/gncCustomerP.h b/src/engine/gncCustomerP.h similarity index 100% rename from src/business/business-core/gncCustomerP.h rename to src/engine/gncCustomerP.h diff --git a/src/business/business-core/gncEmployee.c b/src/engine/gncEmployee.c similarity index 100% rename from src/business/business-core/gncEmployee.c rename to src/engine/gncEmployee.c diff --git a/src/business/business-core/gncEmployee.h b/src/engine/gncEmployee.h similarity index 100% rename from src/business/business-core/gncEmployee.h rename to src/engine/gncEmployee.h diff --git a/src/business/business-core/gncEmployeeP.h b/src/engine/gncEmployeeP.h similarity index 100% rename from src/business/business-core/gncEmployeeP.h rename to src/engine/gncEmployeeP.h diff --git a/src/business/business-core/gncEntry.c b/src/engine/gncEntry.c similarity index 100% rename from src/business/business-core/gncEntry.c rename to src/engine/gncEntry.c diff --git a/src/business/business-core/gncEntry.h b/src/engine/gncEntry.h similarity index 100% rename from src/business/business-core/gncEntry.h rename to src/engine/gncEntry.h diff --git a/src/business/business-core/gncEntryP.h b/src/engine/gncEntryP.h similarity index 100% rename from src/business/business-core/gncEntryP.h rename to src/engine/gncEntryP.h diff --git a/src/business/business-core/gncInvoice.c b/src/engine/gncInvoice.c similarity index 100% rename from src/business/business-core/gncInvoice.c rename to src/engine/gncInvoice.c diff --git a/src/business/business-core/gncInvoice.h b/src/engine/gncInvoice.h similarity index 100% rename from src/business/business-core/gncInvoice.h rename to src/engine/gncInvoice.h diff --git a/src/business/business-core/gncInvoiceP.h b/src/engine/gncInvoiceP.h similarity index 100% rename from src/business/business-core/gncInvoiceP.h rename to src/engine/gncInvoiceP.h diff --git a/src/business/business-core/gncJob.c b/src/engine/gncJob.c similarity index 100% rename from src/business/business-core/gncJob.c rename to src/engine/gncJob.c diff --git a/src/business/business-core/gncJob.h b/src/engine/gncJob.h similarity index 100% rename from src/business/business-core/gncJob.h rename to src/engine/gncJob.h diff --git a/src/business/business-core/gncJobP.h b/src/engine/gncJobP.h similarity index 100% rename from src/business/business-core/gncJobP.h rename to src/engine/gncJobP.h diff --git a/src/business/business-core/gncOrder.c b/src/engine/gncOrder.c similarity index 100% rename from src/business/business-core/gncOrder.c rename to src/engine/gncOrder.c diff --git a/src/business/business-core/gncOrder.h b/src/engine/gncOrder.h similarity index 100% rename from src/business/business-core/gncOrder.h rename to src/engine/gncOrder.h diff --git a/src/business/business-core/gncOrderP.h b/src/engine/gncOrderP.h similarity index 100% rename from src/business/business-core/gncOrderP.h rename to src/engine/gncOrderP.h diff --git a/src/business/business-core/gncOwner.c b/src/engine/gncOwner.c similarity index 100% rename from src/business/business-core/gncOwner.c rename to src/engine/gncOwner.c diff --git a/src/business/business-core/gncOwner.h b/src/engine/gncOwner.h similarity index 100% rename from src/business/business-core/gncOwner.h rename to src/engine/gncOwner.h diff --git a/src/business/business-core/gncOwnerP.h b/src/engine/gncOwnerP.h similarity index 100% rename from src/business/business-core/gncOwnerP.h rename to src/engine/gncOwnerP.h diff --git a/src/business/business-core/gncTaxTable.c b/src/engine/gncTaxTable.c similarity index 100% rename from src/business/business-core/gncTaxTable.c rename to src/engine/gncTaxTable.c diff --git a/src/business/business-core/gncTaxTable.h b/src/engine/gncTaxTable.h similarity index 100% rename from src/business/business-core/gncTaxTable.h rename to src/engine/gncTaxTable.h diff --git a/src/business/business-core/gncTaxTableP.h b/src/engine/gncTaxTableP.h similarity index 100% rename from src/business/business-core/gncTaxTableP.h rename to src/engine/gncTaxTableP.h diff --git a/src/business/business-core/gncVendor.c b/src/engine/gncVendor.c similarity index 100% rename from src/business/business-core/gncVendor.c rename to src/engine/gncVendor.c diff --git a/src/business/business-core/gncVendor.h b/src/engine/gncVendor.h similarity index 100% rename from src/business/business-core/gncVendor.h rename to src/engine/gncVendor.h diff --git a/src/business/business-core/gncVendorP.h b/src/engine/gncVendorP.h similarity index 100% rename from src/business/business-core/gncVendorP.h rename to src/engine/gncVendorP.h diff --git a/src/gnc/main.cpp b/src/gnc/main.cpp index 8036de371d..de08557386 100644 --- a/src/gnc/main.cpp +++ b/src/gnc/main.cpp @@ -48,7 +48,7 @@ extern "C" #include "swig-runtime.h" #include "backend/xml/gnc-backend-xml.h" -#include "business/business-core/gncBusiness.h" +#include "engine/gncBusiness.h" #include "business/business-core/xml/gncmod-business-backend-xml.h" #ifdef WITH_SQL # include "backend/dbi/gnc-backend-dbi.h"