mirror of
https://github.com/Gnucash/gnucash.git
synced 2025-02-25 18:55:30 -06:00
Merge qof directory into engine
They are both about handling core gnucash objects. Qof was once split out in an attempt to make it a separate library. This hasn't worked out so there's no good reason any more to keep this artificial separation. A few considerations: - The qof tests are merged into the engine test directory but they are kept as a separate test entity for now. Several assumptions made in the qof tests are no longer valid in the context of the engine. (For example if the pricedb test is added in the same test executable as the qofbook test, the book creation test fails because it now has 2 collections (pricedb and book) instead of only one. There are plenty of others like this so merging the tests needs more careful review and is perhaps best done while converting to c++/Google test. - I had to use unique names for the MockBackend classes because apparently the tests were using a MockClass from another file in the cmake builds, causing several tests to fail.
This commit is contained in:
Geert Janssens
parent
848bb34741
commit
8687dfb1da
7
.gitignore
vendored
7
.gitignore
vendored
@ -51,8 +51,6 @@ intltool-merge.in
|
||||
intltool-update
|
||||
intltool-update.in
|
||||
lib/guile-www/www
|
||||
lib/libqof/backend/file/qsf-dir.h
|
||||
lib/libqof/qof/qofla-dir.h
|
||||
libtool
|
||||
ltmain.sh
|
||||
macros/intltool.m4
|
||||
@ -194,10 +192,7 @@ src/import-export/qif-import/qif-import
|
||||
src/import-export/qif-import/test/test-link
|
||||
src/import-export/test/test-import-parse
|
||||
src/import-export/test/test-link
|
||||
src/libqof/backend/file/qsf-dir.h
|
||||
src/libqof/qof/qofla-dir.h
|
||||
src/libqof/qof/test-qofmath
|
||||
src/libqof/qof/test/test-qof
|
||||
src/engine/test/test-qof
|
||||
src/optional/gtkmm/test/test-gtkmm
|
||||
src/optional/python-bindings/.py-links
|
||||
src/optional/python-bindings/gnucash/
|
||||
|
||||
@ -672,7 +672,7 @@ configure_file(
|
||||
add_custom_target(uninstall
|
||||
COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake)
|
||||
|
||||
SET_TARGET_PROPERTIES(gnc-qof gnc-core-utils gnc-module gnc-backend-sql gnc-backend-xml-utils
|
||||
SET_TARGET_PROPERTIES(gnc-core-utils gnc-module gnc-backend-sql gnc-backend-xml-utils
|
||||
gnc-gnome PROPERTIES
|
||||
LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib
|
||||
IF (XCODE_VERSION)
|
||||
|
||||
2
HACKING
2
HACKING
@ -79,7 +79,7 @@ This is known to not work very well. Instead, `--prefix` your build into /opt/g
|
||||
|
||||
Getting Trace Messages From GnuCash
|
||||
-----------------------------------
|
||||
See the doxygen comments in lib/libqof/qof/qoflog.h (and .c)
|
||||
See the doxygen comments in src/engine/qoflog.h (and .c)
|
||||
|
||||
Starting GnuCash in GDB
|
||||
-----------------------
|
||||
|
||||
14
configure.ac
14
configure.ac
@ -657,17 +657,6 @@ AC_CHECK_LIB(z, gzopen, [:], [
|
||||
])
|
||||
LIBS="$oLIBS"
|
||||
|
||||
### --------------------------------------------------------------------------
|
||||
### Internal code part which is called "qof"
|
||||
|
||||
LIBQOF_LIBRARY_VERSION=1:4:0
|
||||
AC_SUBST(LIBQOF_LIBRARY_VERSION)
|
||||
|
||||
QOF_CFLAGS='-I${top_builddir}/src/libqof/qof -I${top_srcdir}/src/libqof/qof'
|
||||
QOF_LIBS='${top_builddir}/src/libqof/qof/libgnc-qof.la'
|
||||
AC_SUBST(QOF_CFLAGS)
|
||||
AC_SUBST(QOF_LIBS)
|
||||
|
||||
### ----------------------
|
||||
### LIBDBI
|
||||
|
||||
@ -1740,9 +1729,6 @@ AC_CONFIG_FILES(
|
||||
src/import-export/aqb/Makefile
|
||||
src/import-export/aqb/gschemas/Makefile
|
||||
src/import-export/aqb/test/Makefile
|
||||
src/libqof/Makefile
|
||||
src/libqof/qof/Makefile
|
||||
src/libqof/qof/test/Makefile
|
||||
src/optional/Makefile
|
||||
src/optional/gtkmm/Makefile
|
||||
src/optional/gtkmm/test/Makefile
|
||||
|
||||
@ -79,5 +79,5 @@ foreach my $file (@possible_files) {
|
||||
# These are also added, even though they are outside of src/
|
||||
print "src/gnome/gnucash.appdata.xml.in\n";
|
||||
print "src/gnome/gnucash.desktop.in.in\n";
|
||||
print "src/libqof/qof/qofbookslots.h\n";
|
||||
print "src/engine/qofbookslots.h\n";
|
||||
print "doc/tip_of_the_day.list.in\n";
|
||||
|
||||
@ -132,7 +132,7 @@ FUNCTION(MAKE_GNUCASH_POTFILES)
|
||||
# These are also added, even though they are outside of src/
|
||||
FILE(APPEND ${POTFILES_IN_PATH} "src/gnome/gnucash.appdata.xml.in
|
||||
src/gnome/gnucash.desktop.in.in
|
||||
src/libqof/qof/qofbookslots.h
|
||||
src/engine/qofbookslots.h
|
||||
doc/tip_of_the_day.list.in
|
||||
")
|
||||
|
||||
|
||||
@ -134,12 +134,15 @@ src/engine/engine.scm
|
||||
src/engine/engine-utilities.scm
|
||||
src/engine/glib-helpers.c
|
||||
src/engine/gncAddress.c
|
||||
src/engine/gnc-aqbanking-templates.cpp
|
||||
src/engine/gncBillTerm.c
|
||||
src/engine/gnc-budget.c
|
||||
src/engine/gncBusGuile.c
|
||||
src/engine/gncBusiness.c
|
||||
src/engine/gnc-commodity.c
|
||||
src/engine/gncCustomer.c
|
||||
src/engine/gnc-date.cpp
|
||||
src/engine/gnc-datetime.cpp
|
||||
src/engine/gncEmployee.c
|
||||
src/engine/gnc-engine.c
|
||||
src/engine/gncEntry.c
|
||||
@ -147,20 +150,42 @@ src/engine/gnc-event.c
|
||||
src/engine/gnc-features.c
|
||||
src/engine/gnc-hooks.c
|
||||
src/engine/gncIDSearch.c
|
||||
src/engine/gnc-int128.cpp
|
||||
src/engine/gncInvoice.c
|
||||
src/engine/gncJob.c
|
||||
src/engine/gnc-lot.c
|
||||
src/engine/gncmod-engine.c
|
||||
src/engine/gnc-numeric.cpp
|
||||
src/engine/gnc-numeric.scm
|
||||
src/engine/gncOrder.c
|
||||
src/engine/gncOwner.c
|
||||
src/engine/gnc-pricedb.c
|
||||
src/engine/gnc-rational.cpp
|
||||
src/engine/gnc-session.c
|
||||
src/engine/gncTaxTable.c
|
||||
src/engine/gnc-timezone.cpp
|
||||
src/engine/gnc-uri-utils.c
|
||||
src/engine/gncVendor.c
|
||||
src/engine/guid.cpp
|
||||
src/engine/kvp-frame.cpp
|
||||
src/engine/kvp-scm.cpp
|
||||
src/engine/kvp-value.cpp
|
||||
src/engine/policy.c
|
||||
src/engine/qof-backend.cpp
|
||||
src/engine/qofbook.cpp
|
||||
src/engine/qofchoice.cpp
|
||||
src/engine/qofclass.cpp
|
||||
src/engine/qofevent.cpp
|
||||
src/engine/qofid.cpp
|
||||
src/engine/qofinstance.cpp
|
||||
src/engine/qoflog.cpp
|
||||
src/engine/qofobject.cpp
|
||||
src/engine/qofquerycore.cpp
|
||||
src/engine/qofquery.cpp
|
||||
src/engine/qofsession.cpp
|
||||
src/engine/qof-string-cache.cpp
|
||||
src/engine/qofutil.cpp
|
||||
src/engine/qof-win32.cpp
|
||||
src/engine/Query.c
|
||||
src/engine/Recurrence.c
|
||||
src/engine/SchedXaction.c
|
||||
@ -477,31 +502,6 @@ src/import-export/qif-imp/qif-objects.scm
|
||||
src/import-export/qif-imp/qif-parse.scm
|
||||
src/import-export/qif-imp/qif-to-gnc.scm
|
||||
src/import-export/qif-imp/qif-utils.scm
|
||||
src/libqof/qof/gnc-aqbanking-templates.cpp
|
||||
src/libqof/qof/gnc-date.cpp
|
||||
src/libqof/qof/gnc-datetime.cpp
|
||||
src/libqof/qof/gnc-int128.cpp
|
||||
src/libqof/qof/gnc-numeric.cpp
|
||||
src/libqof/qof/gnc-rational.cpp
|
||||
src/libqof/qof/gnc-timezone.cpp
|
||||
src/libqof/qof/guid.cpp
|
||||
src/libqof/qof/kvp_frame.cpp
|
||||
src/libqof/qof/kvp-value.cpp
|
||||
src/libqof/qof/qof-backend.cpp
|
||||
src/libqof/qof/qofbook.cpp
|
||||
src/libqof/qof/qofchoice.cpp
|
||||
src/libqof/qof/qofclass.cpp
|
||||
src/libqof/qof/qofevent.cpp
|
||||
src/libqof/qof/qofid.cpp
|
||||
src/libqof/qof/qofinstance.cpp
|
||||
src/libqof/qof/qoflog.cpp
|
||||
src/libqof/qof/qofobject.cpp
|
||||
src/libqof/qof/qofquerycore.cpp
|
||||
src/libqof/qof/qofquery.cpp
|
||||
src/libqof/qof/qofsession.cpp
|
||||
src/libqof/qof/qof-string-cache.cpp
|
||||
src/libqof/qof/qofutil.cpp
|
||||
src/libqof/qof/qof-win32.cpp
|
||||
src/plugins/bi_import/dialog-bi-import.c
|
||||
src/plugins/bi_import/dialog-bi-import-gui.c
|
||||
src/plugins/bi_import/dialog-bi-import-helper.c
|
||||
@ -678,5 +678,5 @@ src/tax/us/txf.scm
|
||||
src/tax/us/us.scm
|
||||
src/gnome/gnucash.appdata.xml.in
|
||||
src/gnome/gnucash.desktop.in.in
|
||||
src/libqof/qof/qofbookslots.h
|
||||
src/engine/qofbookslots.h
|
||||
doc/tip_of_the_day.list.in
|
||||
|
||||
@ -141,7 +141,6 @@ SET(SCHEME_INSTALLED_SOURCE_DIR ${CMAKE_INSTALL_PREFIX}/share/gnucash/scm)
|
||||
SET(SCHEME_INSTALLED_CACHE_DIR ${CMAKE_INSTALL_PREFIX}/lib/gnucash/scm/ccache/${GUILE_EFFECTIVE_VERSION})
|
||||
|
||||
# The subdirectories
|
||||
ADD_SUBDIRECTORY (libqof)
|
||||
ADD_SUBDIRECTORY (core-utils)
|
||||
ADD_SUBDIRECTORY (gnc-module)
|
||||
ADD_SUBDIRECTORY (engine)
|
||||
@ -187,5 +186,5 @@ SET_LOCAL_DIST(src_DIST_local CMakeLists.txt Makefile.am ${src_EXTRA_DIST})
|
||||
|
||||
SET(src_DIST ${src_DIST_local} ${app_utils_DIST} ${backend_DIST} ${bin_DIST} ${cmake_modules_DIST}
|
||||
${core_utils_DIST} ${debug_DIST} ${doc_DIST} ${engine_DIST} ${gnc_module_DIST} ${gnome_DIST} ${gnome_search_DIST}
|
||||
${gnome_utils_DIST} ${html_DIST} ${import_export_DIST} ${libqof_DIST} ${optional_DIST} ${plugins_DIST} ${pixmaps_DIST} ${python_DIST}
|
||||
${gnome_utils_DIST} ${html_DIST} ${import_export_DIST} ${optional_DIST} ${plugins_DIST} ${pixmaps_DIST} ${python_DIST}
|
||||
${quotes_DIST} ${register_DIST} ${report_DIST} ${scm_DIST} ${tax_DIST} ${test_core_DIST} PARENT_SCOPE)
|
||||
|
||||
@ -1,13 +1,18 @@
|
||||
# These directories do not contain any gtk dependencies
|
||||
# Note the unusual ordering of some test directories. This is
|
||||
# because test-core depends on engine and the test directories
|
||||
# in turn depend on test-core.
|
||||
NONGUI_SUBDIRS = \
|
||||
libqof \
|
||||
test-core \
|
||||
debug \
|
||||
doc \
|
||||
pixmaps \
|
||||
core-utils \
|
||||
gnc-module \
|
||||
engine \
|
||||
test-core \
|
||||
core-utils/test \
|
||||
gnc-module/test \
|
||||
engine/test \
|
||||
backend \
|
||||
scm \
|
||||
quotes
|
||||
|
||||
@ -83,7 +83,7 @@ SET_SOURCE_FILES_PROPERTIES (${app_utils_SOURCES} PROPERTIES OBJECT_DEPENDS ${CO
|
||||
SET(app_utils_ALL_SOURCES ${app_utils_SOURCES} ${app_utils_HEADERS} ${app_utils_noinst_HEADERS})
|
||||
SET(app_utils_ALL_LIBRARIES gncmod-engine gnc-module ${GTK3_LDFLAGS} ${LIBXML2_LDFLAGS} ${LIBXSLT_LDFLAGS})
|
||||
SET(app_utils_ALL_INCLUDES ${CMAKE_CURRENT_SOURCE_DIR}/calculation ${LIBXML2_INCLUDE_DIRS}
|
||||
${LIBXSLT_INCLUDE_DIRS} ${GTK3_INCLUDE_DIRS})
|
||||
${LIBXSLT_INCLUDE_DIRS} ${GTK3_INCLUDE_DIRS} ${CMAKE_SOURCE_DIR}/engine)
|
||||
|
||||
IF (WIN32)
|
||||
LIST(APPEND app_utils_ALL_SOURCES gnc-help-utils.c)
|
||||
@ -171,7 +171,7 @@ SET(app_utils_SCHEME_3
|
||||
|
||||
SET(GUILE_MODULES src/engine)
|
||||
SET(GUILE_LOAD_DIRS src/app-utils src/core-utils src/engine src/gnc-module src/scm)
|
||||
SET(GUILE_LIBRARY_DIRS src/app-utils src/core-utils src/engine src/gnc-module src/libqof/qof)
|
||||
SET(GUILE_LIBRARY_DIRS src/app-utils src/core-utils src/engine src/gnc-module)
|
||||
SET(GUILE_DEPENDS gncmod-app-utils scm-core-utils scm-engine scm-scm)
|
||||
|
||||
GNC_ADD_SCHEME_TARGETS(scm-gettext
|
||||
|
||||
@ -28,7 +28,6 @@ AM_CPPFLAGS = \
|
||||
-I${top_srcdir}/src/app-utils/calculation \
|
||||
-I${top_srcdir}/src/core-utils \
|
||||
-I${top_srcdir}/src/engine \
|
||||
-I${top_srcdir}/src/libqof/qof \
|
||||
-I${top_srcdir}/src/backend/xml \
|
||||
${GUILE_CFLAGS} \
|
||||
${PYTHON_CPPFLAGS} \
|
||||
@ -100,7 +99,6 @@ libgncmod_app_utils_la_LIBADD = \
|
||||
${top_builddir}/src/gnc-module/libgnc-module.la \
|
||||
${top_builddir}/src/engine/libgncmod-engine.la \
|
||||
${top_builddir}/src/core-utils/libgnc-core-utils.la \
|
||||
${top_builddir}/src/libqof/qof/libgnc-qof.la \
|
||||
${GTK_LIBS} \
|
||||
${GUILE_LIBS} \
|
||||
${GLIB_LIBS} \
|
||||
@ -213,7 +211,6 @@ GUILE_COMPILE_ENV = \
|
||||
--guile-load-dir ${top_builddir}/src/engine \
|
||||
--guile-load-dir ${top_builddir}/src/gnc-module \
|
||||
--guile-load-dir ${top_builddir}/src/scm \
|
||||
--library-dir ${top_builddir}/src/libqof/qof \
|
||||
--library-dir ${top_builddir}/src/core-utils \
|
||||
--library-dir ${top_builddir}/src/gnc-module \
|
||||
--library-dir ${top_builddir}/src/engine \
|
||||
|
||||
@ -30,7 +30,7 @@
|
||||
#include "gnc-path.h"
|
||||
#include "guile-mappings.h"
|
||||
#include <libguile.h>
|
||||
#include "libqof/qof/qof.h"
|
||||
#include "qof.h"
|
||||
#include "gnc-prefs-p.h"
|
||||
|
||||
#include <libxml/xmlmemory.h>
|
||||
|
||||
@ -1,15 +1,15 @@
|
||||
|
||||
SET(APP_UTILS_TEST_INCLUDE_DIRS
|
||||
${CMAKE_SOURCE_DIR}/src/app-utils
|
||||
${CMAKE_SOURCE_DIR}/src/libqof/qof # for qof.h
|
||||
${CMAKE_SOURCE_DIR}/src/test-core
|
||||
${CMAKE_SOURCE_DIR}/src/engine # for qof.h
|
||||
${CMAKE_SOURCE_DIR}/src/engine/test-core
|
||||
${CMAKE_BINARY_DIR}/src # for config.h
|
||||
${GLIB2_INCLUDE_DIRS}
|
||||
${GUILE_INCLUDE_DIRS}
|
||||
)
|
||||
|
||||
SET(APP_UTILS_TEST_LIBS gncmod-app-utils gncmod-test-engine gnc-qof test-core ${GUILE_LDFLAGS})
|
||||
SET(APP_UTILS_TEST_LIBS gncmod-app-utils gncmod-test-engine test-core ${GUILE_LDFLAGS})
|
||||
|
||||
SET(test_app_utils_SOURCES test-app-utils.c test-option-util.cpp test-gnc-ui-util.c)
|
||||
|
||||
|
||||
@ -23,7 +23,6 @@ GNC_TEST_DEPS = --gnc-module-dir ${top_builddir}/src/engine \
|
||||
--guile-load-dir ${top_builddir}/src/engine \
|
||||
--guile-load-dir ${top_builddir}/src/scm \
|
||||
--guile-load-dir ${top_builddir}/src/app-utils \
|
||||
--library-dir ${top_builddir}/src/libqof/qof \
|
||||
--library-dir ${top_builddir}/src/core-utils \
|
||||
--library-dir ${top_builddir}/src/gnc-module \
|
||||
--library-dir ${top_builddir}/src/engine \
|
||||
@ -39,7 +38,6 @@ TESTS_ENVIRONMENT = \
|
||||
$(shell ${abs_top_srcdir}/src/gnc-test-env.pl --noexports ${GNC_TEST_DEPS})
|
||||
|
||||
LDADD = \
|
||||
${top_builddir}/src/libqof/qof/libgnc-qof.la \
|
||||
${top_builddir}/src/core-utils/libgnc-core-utils.la \
|
||||
${top_builddir}/src/engine/libgncmod-engine.la \
|
||||
${top_builddir}/src/gnc-module/libgnc-module.la \
|
||||
@ -61,7 +59,6 @@ AM_CPPFLAGS = \
|
||||
-I${top_srcdir}/src/app-utils \
|
||||
-I${top_srcdir}/src/gnc-module \
|
||||
-I${top_srcdir}/src/core-utils \
|
||||
-I${top_srcdir}/src/libqof/qof \
|
||||
${GUILE_CFLAGS} \
|
||||
${GLIB_CFLAGS} \
|
||||
${BOOST_CPPFLAGS}
|
||||
|
||||
@ -21,7 +21,7 @@
|
||||
* 51 Franklin Street, Fifth Floor Fax: +1-617-542-2652 *
|
||||
* Boston, MA 02110-1301, USA gnu@gnu.org *
|
||||
********************************************************************/
|
||||
#include <kvp_frame.hpp>
|
||||
#include <kvp-frame.hpp>
|
||||
#include <gmp.h>
|
||||
extern "C"
|
||||
{
|
||||
|
||||
@ -34,7 +34,7 @@ SET(WINSOCK_LIB "")
|
||||
IF(MINGW64)
|
||||
SET(WINSOCK_LIB "-lws2_32")
|
||||
ENDIF(MINGW64)
|
||||
TARGET_LINK_LIBRARIES(gncmod-backend-dbi gnc-backend-sql gncmod-engine gnc-qof ${GTK2_LDFLAGS} ${Boost_REGEX_LIBRARY} ${LIBDBI_LIBRARY} ${WINSOCK_LIB})
|
||||
TARGET_LINK_LIBRARIES(gncmod-backend-dbi gnc-backend-sql gncmod-engine ${GTK2_LDFLAGS} ${Boost_REGEX_LIBRARY} ${LIBDBI_LIBRARY} ${WINSOCK_LIB})
|
||||
|
||||
TARGET_COMPILE_DEFINITIONS(gncmod-backend-dbi PRIVATE -DG_LOG_DOMAIN=\"gnc.backend.dbi\")
|
||||
|
||||
|
||||
@ -14,7 +14,6 @@ AM_CPPFLAGS = \
|
||||
-I${top_srcdir}/src/engine \
|
||||
-I${top_srcdir}/src/core-utils \
|
||||
-I${top_srcdir}/lib/libc \
|
||||
-I${top_srcdir}/src/libqof/qof \
|
||||
-I${top_srcdir}/src \
|
||||
${GLIB_CFLAGS} \
|
||||
${BOOST_CPPFLAGS} \
|
||||
@ -39,7 +38,6 @@ libgncmod_backend_dbi_la_LIBADD = \
|
||||
${top_builddir}/src/backend/sql/libgnc-backend-sql.la \
|
||||
${top_builddir}/src/engine/libgncmod-engine.la \
|
||||
${top_builddir}/src/core-utils/libgnc-core-utils.la \
|
||||
${top_builddir}/src/libqof/qof/libgnc-qof.la \
|
||||
${BOOST_LDFLAGS} -lboost_regex \
|
||||
${LIBDBI_LIBS}
|
||||
|
||||
|
||||
@ -4,14 +4,13 @@ SET(BACKEND_DBI_TEST_INCLUDE_DIRS
|
||||
${CMAKE_SOURCE_DIR}/src/core-utils
|
||||
${CMAKE_SOURCE_DIR}/src/backend/dbi/test
|
||||
${CMAKE_SOURCE_DIR}/src/backend/sql
|
||||
${CMAKE_SOURCE_DIR}/src/libqof/qof # for qof.h
|
||||
${CMAKE_SOURCE_DIR}/src/engine
|
||||
${CMAKE_SOURCE_DIR}/src/engine/test-core
|
||||
${CMAKE_SOURCE_DIR}/src/test-core
|
||||
${LIBDBI_INCLUDE_PATH}
|
||||
${GLIB2_INCLUDE_DIRS}
|
||||
)
|
||||
SET(BACKEND_DBI_TEST_LIBS gnc-backend-sql gncmod-engine gncmod-test-engine gnc-qof test-core ${Boost_REGEX_LIBRARY} ${LIBDBI_LIBRARY})
|
||||
SET(BACKEND_DBI_TEST_LIBS gnc-backend-sql gncmod-engine gncmod-test-engine test-core ${Boost_REGEX_LIBRARY} ${LIBDBI_LIBRARY})
|
||||
|
||||
SET(test_dbi_backend_SOURCES
|
||||
test-backend-dbi.cpp
|
||||
|
||||
@ -10,7 +10,6 @@ AM_CPPFLAGS = \
|
||||
-I${top_srcdir}/src/test-core \
|
||||
-I${top_srcdir}/src/engine \
|
||||
-I${top_srcdir}/src/engine/test-core \
|
||||
-I${top_srcdir}/src/libqof/qof \
|
||||
-I${top_srcdir}/src/backend/sql \
|
||||
-DTEST_MYSQL_URL=\"${TEST_MYSQL_URL}\" \
|
||||
-DTEST_PGSQL_URL=\"${TEST_PGSQL_URL}\" \
|
||||
@ -23,7 +22,6 @@ LDADD = ${top_builddir}/src/test-core/libtest-core.la \
|
||||
${top_builddir}/src/engine/libgncmod-engine.la \
|
||||
${top_builddir}/src/engine/test-core/libgncmod-test-engine.la \
|
||||
${top_builddir}/src/core-utils/libgnc-core-utils.la \
|
||||
${top_builddir}/src/libqof/qof/libgnc-qof.la \
|
||||
${top_builddir}/src/backend/sql/libgnc-backend-sql.la \
|
||||
${top_builddir}/src/backend/xml/libgnc-backend-xml-utils.la \
|
||||
${top_builddir}/lib/libc/libc-missing.la
|
||||
@ -31,7 +29,6 @@ LDADD = ${top_builddir}/src/test-core/libtest-core.la \
|
||||
GNC_TEST_DEPS = \
|
||||
--gnc-module-dir ${top_builddir}/src/engine \
|
||||
--guile-load-dir ${top_builddir}/src/engine \
|
||||
--library-dir ${top_builddir}/src/libqof/qof \
|
||||
--library-dir ${top_builddir}/src/core-utils \
|
||||
--library-dir ${top_builddir}/src/gnc-module \
|
||||
--library-dir ${top_builddir}/src/engine \
|
||||
|
||||
@ -24,7 +24,7 @@
|
||||
* *
|
||||
\********************************************************************/
|
||||
|
||||
#include <kvp_frame.hpp>
|
||||
#include <kvp-frame.hpp>
|
||||
|
||||
extern "C"
|
||||
{
|
||||
|
||||
@ -38,7 +38,7 @@ extern "C"
|
||||
#include <gnc-lot.h>
|
||||
}
|
||||
|
||||
#include <kvp_frame.hpp>
|
||||
#include <kvp-frame.hpp>
|
||||
#include "../gnc-backend-dbi.hpp"
|
||||
|
||||
G_GNUC_UNUSED static QofLogModule log_module = "test-dbi";
|
||||
|
||||
@ -69,7 +69,7 @@ ADD_LIBRARY (gnc-backend-sql
|
||||
${backend_sql_noinst_HEADERS}
|
||||
)
|
||||
|
||||
TARGET_LINK_LIBRARIES(gnc-backend-sql gncmod-engine gnc-qof)
|
||||
TARGET_LINK_LIBRARIES(gnc-backend-sql gncmod-engine)
|
||||
|
||||
TARGET_COMPILE_DEFINITIONS (gnc-backend-sql PRIVATE -DG_LOG_DOMAIN=\"gnc.backend.sql\")
|
||||
|
||||
|
||||
@ -14,7 +14,6 @@ AM_CPPFLAGS = \
|
||||
-I${top_srcdir}/src/engine \
|
||||
-I${top_srcdir}/src/core-utils\
|
||||
-I${top_srcdir}/lib/libc\
|
||||
-I${top_srcdir}/src/libqof/qof \
|
||||
${GLIB_CFLAGS} \
|
||||
${GUILE_CFLAGS} \
|
||||
${WARN_CFLAGS} \
|
||||
@ -78,8 +77,7 @@ noinst_HEADERS = \
|
||||
libgnc_backend_sql_la_LIBADD = \
|
||||
${GLIB_LIBS} \
|
||||
${GUILE_LIBS} \
|
||||
${top_builddir}/src/engine/libgncmod-engine.la \
|
||||
${top_builddir}/src/libqof/qof/libgnc-qof.la
|
||||
${top_builddir}/src/engine/libgncmod-engine.la
|
||||
|
||||
AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.backend.sql\"
|
||||
|
||||
|
||||
@ -49,7 +49,7 @@ extern "C"
|
||||
#include "gnc-sql-column-table-entry.hpp"
|
||||
#include "gnc-slots-sql.h"
|
||||
|
||||
#include <kvp_frame.hpp>
|
||||
#include <kvp-frame.hpp>
|
||||
|
||||
static QofLogModule log_module = G_LOG_DOMAIN;
|
||||
|
||||
|
||||
@ -2,7 +2,6 @@
|
||||
SET(BACKEND_SQL_TEST_INCLUDE_DIRS
|
||||
${CMAKE_BINARY_DIR}/src # for config.h
|
||||
${CMAKE_SOURCE_DIR}/src/backend/sql
|
||||
${CMAKE_SOURCE_DIR}/src/libqof/qof # for qof.
|
||||
${CMAKE_SOURCE_DIR}/src/engine
|
||||
${CMAKE_SOURCE_DIR}/src/test-core
|
||||
${GLIB2_INCLUDE_DIRS}
|
||||
@ -10,7 +9,7 @@ SET(BACKEND_SQL_TEST_INCLUDE_DIRS
|
||||
|
||||
SET(test_backend_sql_SOURCES test-sqlbe.cpp utest-gnc-backend-sql.cpp)
|
||||
|
||||
SET(BACKEND_SQL_TEST_LIBS gnc-backend-sql gncmod-engine gnc-qof test-core)
|
||||
SET(BACKEND_SQL_TEST_LIBS gnc-backend-sql gncmod-engine test-core)
|
||||
|
||||
SET_DIST_LIST(test_backend_sql_DIST ${test_backend_sql_SOURCES} CMakeLists.txt
|
||||
Makefile.am test-column-types.cpp)
|
||||
@ -23,4 +22,4 @@ GNC_ADD_TEST(test-column-types test-column-types.cpp
|
||||
GNC_ADD_TEST(test-sqlbe "${test_backend_sql_SOURCES}"
|
||||
BACKEND_SQL_TEST_INCLUDE_DIRS BACKEND_SQL_TEST_LIBS
|
||||
)
|
||||
TARGET_COMPILE_DEFINITIONS(test-sqlbe PRIVATE TESTPROG=test_sqlbe)
|
||||
TARGET_COMPILE_DEFINITIONS(test-sqlbe PRIVATE TESTPROG=test_sqlbe)
|
||||
|
||||
@ -15,7 +15,6 @@ TESTS = ${check_PROGRAMS}
|
||||
GNC_TEST_DEPS = \
|
||||
--gnc-module-dir ${top_builddir}/src/engine \
|
||||
--guile-load-dir ${top_builddir}/src/engine \
|
||||
--library-dir ${top_builddir}/src/libqof/qof \
|
||||
--library-dir ${top_builddir}/src/core-utils \
|
||||
--library-dir ${top_builddir}/src/gnc-module \
|
||||
--library-dir ${top_builddir}/src/engine \
|
||||
@ -32,7 +31,6 @@ LDADD = ${top_builddir}/src/test-core/libtest-core.la \
|
||||
${top_builddir}/src/engine/libgncmod-engine.la \
|
||||
${top_builddir}/src/engine/test-core/libgncmod-test-engine.la \
|
||||
${top_builddir}/src/core-utils/libgnc-core-utils.la \
|
||||
${top_builddir}/src/libqof/qof/libgnc-qof.la \
|
||||
${top_builddir}/lib/libc/libc-missing.la
|
||||
|
||||
AM_CPPFLAGS = \
|
||||
@ -44,7 +42,6 @@ AM_CPPFLAGS = \
|
||||
-I${top_srcdir}/src/engine \
|
||||
-I${top_srcdir}/src/engine/test-core \
|
||||
-I${top_srcdir}/src/backend/sql \
|
||||
-I${top_srcdir}/src/libqof/qof \
|
||||
${GLIB_CFLAGS} \
|
||||
${GUILE_CFLAGS}
|
||||
|
||||
@ -58,7 +55,7 @@ test_sqlbe_SOURCES = \
|
||||
|
||||
test_sqlbe_LDADD = \
|
||||
$(top_builddir)/$(MODULEPATH)/libgnc-backend-sql.la \
|
||||
$(top_builddir)/src/libqof/qof/libgnc-qof.la \
|
||||
$(top_builddir)/src/engine/libgncmod-engine.la \
|
||||
$(top_builddir)/src/test-core/libtest-core.la \
|
||||
$(top_builddir)/src/core-utils/libgnc-core-utils.la \
|
||||
$(GLIB_LIBS)
|
||||
@ -68,7 +65,7 @@ test_sqlbe_CFLAGS = \
|
||||
$(DEFAULT_INCLUDES) \
|
||||
-I$(top_srcdir)/$(MODULEPATH)/ \
|
||||
-I$(top_srcdir)/src/backend/dbi/ \
|
||||
-I$(top_srcdir)/src/libqof/qof/ \
|
||||
-I$(top_srcdir)/src/engine/ \
|
||||
-I$(top_srcdir)/src/test-core/ \
|
||||
$(GLIB_CFLAGS)
|
||||
|
||||
|
||||
@ -13,7 +13,6 @@ AM_CPPFLAGS = \
|
||||
-I${top_srcdir}/src/core-utils \
|
||||
-I${top_srcdir}/src/gnc-module \
|
||||
-I${top_srcdir}/lib/libc\
|
||||
-I${top_srcdir}/src/libqof/qof \
|
||||
-I$(top_srcdir)/src \
|
||||
${LIBXML2_CFLAGS} \
|
||||
${GLIB_CFLAGS} \
|
||||
@ -92,8 +91,7 @@ libgnc_backend_xml_utils_la_LIBADD = \
|
||||
${LIBXML2_LIBS} \
|
||||
${ZLIB_LIBS} \
|
||||
${top_builddir}/src/engine/libgncmod-engine.la \
|
||||
${top_builddir}/src/core-utils/libgnc-core-utils.la \
|
||||
${top_builddir}/src/libqof/qof/libgnc-qof.la
|
||||
${top_builddir}/src/core-utils/libgnc-core-utils.la
|
||||
|
||||
libgncmod_backend_xml_la_LDFLAGS = -module -avoid-version
|
||||
libgncmod_backend_xml_la_LIBADD = \
|
||||
@ -102,8 +100,7 @@ libgncmod_backend_xml_la_LIBADD = \
|
||||
${ZLIB_LIBS} \
|
||||
${top_builddir}/src/engine/libgncmod-engine.la \
|
||||
${top_builddir}/src/core-utils/libgnc-core-utils.la \
|
||||
libgnc-backend-xml-utils.la \
|
||||
${top_builddir}/src/libqof/qof/libgnc-qof.la
|
||||
libgnc-backend-xml-utils.la
|
||||
|
||||
AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.backend.xml\"
|
||||
|
||||
|
||||
@ -53,7 +53,7 @@ extern "C"
|
||||
#include "sixtp-parsers.h"
|
||||
#include "sixtp-utils.h"
|
||||
|
||||
#include <kvp_frame.hpp>
|
||||
#include <kvp-frame.hpp>
|
||||
|
||||
/* from Transaction-xml-parser-v1.c */
|
||||
static sixtp* gnc_transaction_parser_new (void);
|
||||
|
||||
@ -34,7 +34,7 @@ extern "C"
|
||||
#include "sixtp-dom-generators.h"
|
||||
#include "sixtp-utils.h"
|
||||
|
||||
#include <kvp_frame.hpp>
|
||||
#include <kvp-frame.hpp>
|
||||
|
||||
static QofLogModule log_module = GNC_MOD_IO;
|
||||
|
||||
|
||||
@ -33,7 +33,7 @@ extern "C"
|
||||
|
||||
#include "sixtp-utils.h"
|
||||
#include "sixtp-dom-parsers.h"
|
||||
#include <kvp_frame.hpp>
|
||||
#include <kvp-frame.hpp>
|
||||
|
||||
static QofLogModule log_module = GNC_MOD_IO;
|
||||
|
||||
|
||||
@ -6,7 +6,6 @@ SET(XML_TEST_INCLUDE_DIRS
|
||||
${CMAKE_SOURCE_DIR}/src/backend/xml/test
|
||||
${CMAKE_SOURCE_DIR}/src/engine
|
||||
${CMAKE_SOURCE_DIR}/src/engine/test-core
|
||||
${CMAKE_SOURCE_DIR}/src/libqof/qof # for qof.h
|
||||
${CMAKE_BINARY_DIR}/src # for config.h
|
||||
${CMAKE_SOURCE_DIR}/src/test-core # for unittest-support.h
|
||||
${GLIB2_INCLUDE_DIRS}
|
||||
@ -15,7 +14,7 @@ SET(XML_TEST_INCLUDE_DIRS
|
||||
)
|
||||
|
||||
|
||||
SET(XML_TEST_LIBS gncmod-engine gnc-qof gncmod-test-engine test-core ${LIBXML2_LDFLAGS} -lz)
|
||||
SET(XML_TEST_LIBS gncmod-engine gncmod-test-engine test-core ${LIBXML2_LDFLAGS} -lz)
|
||||
|
||||
FUNCTION(ADD_XML_TEST _TARGET _SOURCE_FILES)
|
||||
GNC_ADD_TEST(${_TARGET} "${_SOURCE_FILES}" XML_TEST_INCLUDE_DIRS XML_TEST_LIBS ${ARGN})
|
||||
|
||||
@ -211,7 +211,6 @@ GNC_TEST_DEPS = \
|
||||
--gnc-module-dir ${top_builddir}/src/engine \
|
||||
--guile-load-dir ${top_builddir}/src/gnc-module \
|
||||
--guile-load-dir ${top_builddir}/src/engine \
|
||||
--library-dir ${top_builddir}/src/libqof/qof \
|
||||
--library-dir ${top_builddir}/src/core-utils \
|
||||
--library-dir ${top_builddir}/src/gnc-module \
|
||||
--library-dir ${top_builddir}/src/engine \
|
||||
@ -250,7 +249,6 @@ check_PROGRAMS = \
|
||||
noinst_HEADERS = test-file-stuff.h
|
||||
|
||||
LDADD = \
|
||||
${top_builddir}/src/libqof/qof/libgnc-qof.la \
|
||||
${top_builddir}/src/test-core/libtest-core.la \
|
||||
${top_builddir}/src/gnc-module/libgnc-module.la \
|
||||
${top_builddir}/src/engine/libgncmod-engine.la \
|
||||
@ -270,7 +268,6 @@ AM_CPPFLAGS = \
|
||||
-I${top_srcdir}/src/engine \
|
||||
-I${top_srcdir}/src/engine/test-core \
|
||||
-I${top_srcdir}/src/backend/xml \
|
||||
-I${top_srcdir}/src/libqof/qof \
|
||||
-DU_SHOW_CPLUSPLUS_API=0 \
|
||||
${LIBXML2_CFLAGS} \
|
||||
${GLIB_CFLAGS} \
|
||||
|
||||
@ -20,7 +20,7 @@
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
|
||||
* 02110-1301, USA.
|
||||
*/
|
||||
#include <kvp_frame.hpp>
|
||||
#include <kvp-frame.hpp>
|
||||
|
||||
extern "C"
|
||||
{
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
#include <kvp_frame.hpp>
|
||||
#include <kvp-frame.hpp>
|
||||
|
||||
extern "C"
|
||||
{
|
||||
|
||||
@ -24,7 +24,7 @@ TARGET_COMPILE_DEFINITIONS(gnucash PRIVATE -DG_LOG_DOMAIN=\"gnc.bin\")
|
||||
|
||||
TARGET_LINK_LIBRARIES (gnucash
|
||||
gncmod-ledger-core gncmod-report-gnome gnc-gnome gncmod-gnome-utils gncmod-app-utils
|
||||
gncmod-engine gnc-module gnc-core-utils gnc-qof gncmod-report-system
|
||||
gncmod-engine gnc-module gnc-core-utils gncmod-report-system
|
||||
${GUILE_LDFLAGS} ${GLIB2_LDFLAGS} ${GTK3_LDFLAGS} ${GTK_MAC_LDFLAGS}
|
||||
)
|
||||
|
||||
|
||||
@ -18,7 +18,6 @@ AM_CPPFLAGS = -I${top_builddir} ${GLIB_CFLAGS} ${GNOME_CFLAGS} ${GTK_CFLAGS} \
|
||||
-I${top_builddir}/src \
|
||||
-I${top_builddir}/src/core-utils \
|
||||
-I${top_srcdir}/src/gnc-module \
|
||||
-I${top_srcdir}/src/libqof/qof \
|
||||
-I${top_srcdir}/src/report/report-system \
|
||||
${GUILE_CFLAGS} \
|
||||
${GTK_MAC_CFLAGS}
|
||||
@ -55,7 +54,6 @@ gnucash_LDADD = \
|
||||
${top_builddir}/src/engine/libgncmod-engine.la \
|
||||
${top_builddir}/src/gnc-module/libgnc-module.la \
|
||||
${top_builddir}/src/core-utils/libgnc-core-utils.la \
|
||||
${top_builddir}/src/libqof/qof/libgnc-qof.la \
|
||||
${top_builddir}/src/report/report-system/libgncmod-report-system.la \
|
||||
${GUILE_LIBS} \
|
||||
${GLIB_LIBS} \
|
||||
|
||||
@ -66,7 +66,6 @@ eval `${top_srcdir}/src/gnc-test-env.pl \
|
||||
--guile-load-dir ${top_builddir}/src/report/stylesheets \
|
||||
--guile-load-dir ${top_builddir}/src/import-export/qif-import \
|
||||
--library-dir ${top_builddir}/src/test-core \
|
||||
--library-dir ${top_builddir}/src/libqof/qof \
|
||||
--library-dir ${top_builddir}/src/core-utils \
|
||||
--library-dir ${top_builddir}/src/calculation \
|
||||
--library-dir ${top_builddir}/src/app-utils \
|
||||
|
||||
@ -9,7 +9,7 @@ MACRO (GNC_ADD_SWIG_COMMAND _target _output _input)
|
||||
ADD_CUSTOM_COMMAND (
|
||||
OUTPUT ${_output}
|
||||
DEPENDS ${_input} ${CMAKE_SOURCE_DIR}/src/base-typemaps.i ${ARGN}
|
||||
COMMAND ${SWIG_EXECUTABLE} -guile ${SWIG_ARGS} -Linkage module -I${CMAKE_SOURCE_DIR}/src/libqof/qof -I${CMAKE_SOURCE_DIR}/src -o ${_output} ${_input}
|
||||
COMMAND ${SWIG_EXECUTABLE} -guile ${SWIG_ARGS} -Linkage module -I${CMAKE_SOURCE_DIR}/src/engine -I${CMAKE_SOURCE_DIR}/src -o ${_output} ${_input}
|
||||
)
|
||||
|
||||
ADD_CUSTOM_TARGET(${_target} DEPENDS ${_output})
|
||||
@ -22,7 +22,7 @@ MACRO (GNC_ADD_SWIG_PYTHON_COMMAND _target _output _input)
|
||||
ADD_CUSTOM_COMMAND(OUTPUT ${_output}
|
||||
|
||||
COMMAND ${SWIG_EXECUTABLE} -python -Wall -Werror ${SWIG_ARGS}
|
||||
-I${CMAKE_SOURCE_DIR}/src/libqof/qof -I${CMAKE_SOURCE_DIR}/src
|
||||
-I${CMAKE_SOURCE_DIR}/src
|
||||
-I${CMAKE_SOURCE_DIR}/src/engine -I${CMAKE_SOURCE_DIR}/src/app-utils
|
||||
-o ${_output} ${_input}
|
||||
DEPENDS ${_input} ${CMAKE_SOURCE_DIR}/src/base-typemaps.i ${ARGN}
|
||||
|
||||
@ -117,11 +117,12 @@ SET(core_utils_noinst_HEADERS
|
||||
)
|
||||
|
||||
SET(core_utils_ALL_SOURCES ${core_utils_SOURCES} ${core_utils_noinst_HEADERS})
|
||||
SET(core_utils_ALL_LIBRARIES gnc-qof ${GUILE_LDFLAGS} ${GLIB2_LDFLAGS} ${GOBJECT_LDFLAGS} ${GTK_MAC_LDFLAGS})
|
||||
SET(core_utils_ALL_LIBRARIES ${GUILE_LDFLAGS} ${GLIB2_LDFLAGS} ${GOBJECT_LDFLAGS} ${GTK_MAC_LDFLAGS})
|
||||
SET(core_utils_ALL_INCLUDES
|
||||
${CMAKE_SOURCE_DIR}/src
|
||||
${CMAKE_CURRENT_BINARY_DIR}
|
||||
${CMAKE_SOURCE_DIR}/src/libqof/qof
|
||||
${CMAKE_CURRENT_SOURCE_DIR}
|
||||
${GLIB2_INCLUDE_DIRS}
|
||||
${GUILE_INCLUDE_DIRS}
|
||||
${GTK_MAC_INCLUDE_DIRS})
|
||||
|
||||
|
||||
@ -1,4 +1,6 @@
|
||||
SUBDIRS = . test
|
||||
# No SUBDIR variable here...
|
||||
# The 'test' subdir is added via src/Makefile to handle
|
||||
# it's dependency on src/engine
|
||||
|
||||
lib_LTLIBRARIES = libgnc-core-utils.la
|
||||
|
||||
@ -19,8 +21,7 @@ libgnc_core_utils_la_LIBADD = \
|
||||
${GUILE_LIBS} \
|
||||
${GLIB_LIBS} \
|
||||
${BINRELOC_LIBS} \
|
||||
${GTK_MAC_LIBS} \
|
||||
${QOF_LIBS}
|
||||
${GTK_MAC_LIBS}
|
||||
|
||||
|
||||
noinst_HEADERS = \
|
||||
@ -56,8 +57,6 @@ AM_CPPFLAGS = \
|
||||
${GUILE_CFLAGS} \
|
||||
${GLIB_CFLAGS} \
|
||||
${GTK_MAC_CFLAGS} \
|
||||
${QOF_CFLAGS} \
|
||||
-I${top_srcdir}/src/libqof/qof \
|
||||
-I${top_builddir}/src \
|
||||
-I${top_srcdir}/src
|
||||
|
||||
@ -84,9 +83,7 @@ libgnc_core_utils_python_la_LIBADD = \
|
||||
libgnc_core_utils_python_la_CPPFLAGS = \
|
||||
${GLIB_CFLAGS} \
|
||||
${GTK_MAC_CFLAGS} \
|
||||
${QOF_CFLAGS} \
|
||||
${PYTHON_CPPFLAGS} \
|
||||
-I${top_srcdir}/src/libqof/qof \
|
||||
-I${top_builddir}/src \
|
||||
-I${top_srcdir}/src
|
||||
|
||||
@ -108,8 +105,7 @@ endif
|
||||
|
||||
if GNC_HAVE_GUILE_2
|
||||
GUILE_COMPILE_ENV = \
|
||||
--library-dir ${top_builddir}/src/core-utils \
|
||||
--library-dir ${top_builddir}/src/libqof/qof
|
||||
--library-dir ${top_builddir}/src/core-utils
|
||||
|
||||
%.go : %.scm .scm-links $(lib_LTLIBRARIES)
|
||||
GNC_UNINSTALLED=yes \
|
||||
|
||||
@ -50,17 +50,12 @@
|
||||
|
||||
#include "gnc-path.h"
|
||||
#include "gnc-filepath-utils.h"
|
||||
#include "libqof/qof/qof.h"
|
||||
|
||||
#ifdef _MSC_VER
|
||||
#include <glib/gwin32.h>
|
||||
#define PATH_MAX MAXPATHLEN
|
||||
#endif
|
||||
|
||||
/* This static indicates the debugging module that this .o belongs to. */
|
||||
static QofLogModule log_module = G_LOG_DOMAIN;
|
||||
|
||||
|
||||
/**
|
||||
* Scrubs a filename by changing "strange" chars (e.g. those that are not
|
||||
* valid in a win32 file name) to "_".
|
||||
@ -220,7 +215,7 @@ gnc_path_find_localized_html_file_internal (const gchar * file_name)
|
||||
for (i = 0; dirs[i]; i++)
|
||||
{
|
||||
full_path = g_build_filename (dirs[i], file_name, (gchar *)NULL);
|
||||
DEBUG ("Checking for existence of %s", full_path);
|
||||
g_debug ("Checking for existence of %s", full_path);
|
||||
full_path = check_path_return_if_valid (full_path);
|
||||
if (full_path != NULL)
|
||||
return full_path;
|
||||
|
||||
@ -61,10 +61,6 @@
|
||||
#endif
|
||||
|
||||
#include "gnc-gkeyfile-utils.h"
|
||||
#include "qof.h"
|
||||
|
||||
/* This static indicates the debugging module that this .o belongs to. */
|
||||
static QofLogModule log_module = G_LOG_DOMAIN;
|
||||
|
||||
GKeyFile *
|
||||
gnc_key_file_load_from_file (const gchar *filename,
|
||||
@ -118,7 +114,7 @@ gnc_key_file_save_to_file (const gchar *filename,
|
||||
g_return_val_if_fail(*error == NULL, FALSE);
|
||||
|
||||
contents = g_key_file_to_data(key_file, NULL, NULL);
|
||||
DEBUG("Keyfile data:\n%s", contents);
|
||||
g_debug ("Keyfile data:\n%s", contents);
|
||||
length = strlen(contents);
|
||||
fd = g_open(filename, O_WRONLY | O_CREAT | O_TRUNC, 0666);
|
||||
if (fd == -1)
|
||||
|
||||
@ -23,13 +23,9 @@
|
||||
#include "swig-runtime.h"
|
||||
#include <libguile.h>
|
||||
|
||||
#include "qof.h"
|
||||
#include "gnc-guile-utils.h"
|
||||
#include "guile-mappings.h"
|
||||
|
||||
/* This static indicates the debugging module this .o belongs to. */
|
||||
static QofLogModule log_module = G_LOG_DOMAIN;
|
||||
|
||||
|
||||
/********************************************************************\
|
||||
* gnc_scm_to_utf8_string *
|
||||
@ -54,7 +50,7 @@ gchar *gnc_scm_to_utf8_string(SCM scm_string)
|
||||
}
|
||||
|
||||
/* Unable to extract string from the symbol...*/
|
||||
PERR("bad value\n");
|
||||
g_error ("bad value\n");
|
||||
return NULL;
|
||||
}
|
||||
|
||||
@ -86,7 +82,7 @@ gchar *gnc_scm_to_locale_string(SCM scm_string)
|
||||
}
|
||||
|
||||
/* Unable to extract string from the symbol...*/
|
||||
PERR("bad value\n");
|
||||
g_error ("bad value\n");
|
||||
return NULL;
|
||||
}
|
||||
|
||||
@ -117,7 +113,7 @@ gnc_scm_symbol_to_locale_string(SCM symbol_value)
|
||||
}
|
||||
|
||||
/* Unable to extract string from the symbol...*/
|
||||
PERR("bad value\n");
|
||||
g_error ("bad value\n");
|
||||
return NULL;
|
||||
}
|
||||
|
||||
@ -146,12 +142,12 @@ gnc_scm_call_1_to_string(SCM func, SCM arg)
|
||||
}
|
||||
else
|
||||
{
|
||||
PERR("bad value\n");
|
||||
g_error ("bad value\n");
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
PERR("not a procedure\n");
|
||||
g_error ("not a procedure\n");
|
||||
}
|
||||
|
||||
return NULL;
|
||||
@ -180,7 +176,7 @@ gnc_scm_call_1_symbol_to_string(SCM func, SCM arg)
|
||||
}
|
||||
else
|
||||
{
|
||||
PERR("not a procedure\n");
|
||||
g_error ("not a procedure\n");
|
||||
}
|
||||
|
||||
return NULL;
|
||||
@ -209,12 +205,12 @@ gnc_scm_call_1_to_procedure(SCM func, SCM arg)
|
||||
return value;
|
||||
else
|
||||
{
|
||||
PERR("bad value\n");
|
||||
g_error ("bad value\n");
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
PERR("not a procedure\n");
|
||||
g_error ("not a procedure\n");
|
||||
}
|
||||
|
||||
return SCM_UNDEFINED;
|
||||
@ -243,12 +239,12 @@ gnc_scm_call_1_to_list(SCM func, SCM arg)
|
||||
return value;
|
||||
else
|
||||
{
|
||||
PERR("bad value\n");
|
||||
g_error ("bad value\n");
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
PERR("not a procedure\n");
|
||||
g_error ("not a procedure\n");
|
||||
}
|
||||
|
||||
return SCM_UNDEFINED;
|
||||
@ -277,12 +273,12 @@ gnc_scm_call_1_to_vector(SCM func, SCM arg)
|
||||
return value;
|
||||
else
|
||||
{
|
||||
PERR("bad value\n");
|
||||
g_error ("bad value\n");
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
PERR("not a procedure\n");
|
||||
g_error ("not a procedure\n");
|
||||
}
|
||||
|
||||
return SCM_UNDEFINED;
|
||||
|
||||
@ -22,11 +22,11 @@
|
||||
*/
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <glib.h>
|
||||
#include "config.h"
|
||||
#include "gnc-prefs.h"
|
||||
#include "gnc-prefs-p.h"
|
||||
#include "gnc-version.h"
|
||||
#include "libqof/qof/qof.h"
|
||||
|
||||
static gchar *namespace_regexp = NULL;
|
||||
static gboolean is_debugging = FALSE;
|
||||
@ -37,9 +37,6 @@ static gint file_retention_days = 30; // This is also the default in the pre
|
||||
|
||||
PrefsBackend *prefsbackend = NULL;
|
||||
|
||||
/* This static indicates the debugging module that this .o belongs to. */
|
||||
static QofLogModule log_module = G_LOG_DOMAIN;
|
||||
|
||||
const gchar *
|
||||
gnc_prefs_get_namespace_regexp(void)
|
||||
{
|
||||
@ -130,18 +127,11 @@ gulong gnc_prefs_register_cb (const char *group,
|
||||
gpointer func,
|
||||
gpointer user_data)
|
||||
{
|
||||
ENTER("group %s; pref_name %s, prefsbackend->register_cb %p", group, pref_name,
|
||||
prefsbackend ? prefsbackend->register_cb : NULL);
|
||||
if (prefsbackend && prefsbackend->register_cb)
|
||||
{
|
||||
LEAVE("");
|
||||
return (prefsbackend->register_cb) (group, pref_name, func, user_data);
|
||||
}
|
||||
else
|
||||
{
|
||||
LEAVE("no backend loaded, or the backend doesn't define register_cb, returning 0");
|
||||
g_warning ("no backend loaded, or the backend doesn't define register_cb, returning 0");
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -4,10 +4,9 @@ SET(CORE_UTILS_TEST_INCLUDE_DIRS
|
||||
${CMAKE_BINARY_DIR}/src # for config.h
|
||||
${CMAKE_SOURCE_DIR}/src/core-utils
|
||||
${CMAKE_SOURCE_DIR}/src/test-core
|
||||
${CMAKE_SOURCE_DIR}/src/libqof/qof # for qof.h
|
||||
${GLIB2_INCLUDE_DIRS}
|
||||
)
|
||||
SET(CORE_UTILS_TEST_LIBS gnc-core-utils gnc-qof test-core)
|
||||
SET(CORE_UTILS_TEST_LIBS gnc-core-utils test-core)
|
||||
|
||||
MACRO(ADD_CORE_UTILS_TEST _TARGET _SOURCE_FILES)
|
||||
GNC_ADD_TEST(${_TARGET} "${_SOURCE_FILES}" CORE_UTILS_TEST_INCLUDE_DIRS CORE_UTILS_TEST_LIBS)
|
||||
|
||||
@ -1,17 +1,18 @@
|
||||
include $(top_srcdir)/test-templates/Makefile.decl
|
||||
MODULEPATH = src/core-utils
|
||||
|
||||
# We add src/engine here, just to load qof.h, which
|
||||
# is pulled in via test-core
|
||||
AM_CPPFLAGS = \
|
||||
-I${top_srcdir} \
|
||||
-I${top_srcdir}/src \
|
||||
-I${top_srcdir}/src/test-core \
|
||||
-I${top_srcdir}/src/libqof/qof \
|
||||
-I${top_srcdir}/src/core-utils \
|
||||
-I${top_srcdir}/src/engine \
|
||||
${GUILE_CFLAGS} \
|
||||
${GLIB_CFLAGS}
|
||||
|
||||
LDADD = \
|
||||
${top_builddir}/src/libqof/qof/libgnc-qof.la \
|
||||
../libgnc-core-utils.la \
|
||||
${top_builddir}/src/test-core/libtest-core.la \
|
||||
${GLIB_LIBS}
|
||||
@ -25,7 +26,6 @@ TESTS = \
|
||||
test-gnc-glib-utils
|
||||
|
||||
GNC_TEST_DEPS = \
|
||||
--library-dir ${top_builddir}/src/libqof/qof \
|
||||
--library-dir ${top_builddir}/src/core-utils
|
||||
|
||||
TESTS_ENVIRONMENT = \
|
||||
@ -39,7 +39,6 @@ test_gnc_glib_utils_SOURCES = \
|
||||
test-gnc-glib-utils.c
|
||||
|
||||
test_gnc_glib_utils_LDADD = \
|
||||
${top_builddir}/src/libqof/qof/libgnc-qof.la \
|
||||
${top_builddir}/src/test-core/libtest-core.la \
|
||||
$(GLIB_LIBS)
|
||||
|
||||
|
||||
@ -26,7 +26,6 @@
|
||||
#include <string.h>
|
||||
|
||||
#include <glib.h>
|
||||
#include "qof.h"
|
||||
#include "test-stuff.h"
|
||||
#include "gnc-filepath-utils.h"
|
||||
|
||||
@ -59,8 +58,6 @@ main(int argc, char **argv)
|
||||
{
|
||||
int i;
|
||||
|
||||
qof_init();
|
||||
|
||||
for (i = 0; strs[i].input != NULL; i++)
|
||||
{
|
||||
char *daout;
|
||||
|
||||
@ -653,7 +653,7 @@ WARN_LOGFILE = doxygen.log
|
||||
# with spaces.
|
||||
|
||||
INPUT = @-top_srcdir-@/src \
|
||||
@-top_srcdir-@/src/libqof/
|
||||
@-top_srcdir-@/src/engine/
|
||||
|
||||
# This tag can be used to specify the character encoding of the source files
|
||||
# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
|
||||
|
||||
@ -10,11 +10,21 @@ SET(engine_noinst_HEADERS
|
||||
SX-book.h
|
||||
SX-ttinfo.h
|
||||
TransactionP.h
|
||||
gnc-backend-prov.hpp
|
||||
gnc-date-p.h
|
||||
gnc-hooks-scm.h
|
||||
gnc-int128.hpp
|
||||
gnc-lot.h
|
||||
gnc-lot-p.h
|
||||
gnc-pricedb-p.h
|
||||
policy-p.h
|
||||
qofbook-p.h
|
||||
qofclass-p.h
|
||||
qofevent-p.h
|
||||
qofobject-p.h
|
||||
qofquery-p.h
|
||||
qofquerycore-p.h
|
||||
qofsession.hpp
|
||||
)
|
||||
|
||||
SET (engine_HEADERS
|
||||
@ -37,17 +47,48 @@ SET (engine_HEADERS
|
||||
engine-helpers.h
|
||||
engine-helpers-guile.h
|
||||
glib-helpers.h
|
||||
gnc-aqbanking-templates.h
|
||||
gnc-budget.h
|
||||
gnc-commodity.h
|
||||
gnc-date.h
|
||||
gnc-datetime.hpp
|
||||
gnc-engine.h
|
||||
gnc-event.h
|
||||
gnc-features.h
|
||||
gnc-hooks.h
|
||||
gnc-numeric.h
|
||||
gnc-numeric.hpp
|
||||
gnc-pricedb.h
|
||||
gnc-rational.hpp
|
||||
gnc-rational-rounding.hpp
|
||||
gnc-session.h
|
||||
gnc-timezone.hpp
|
||||
gnc-uri-utils.h
|
||||
guid.h
|
||||
kvp-frame.hpp
|
||||
kvp-scm.h
|
||||
kvp-value.hpp
|
||||
policy.h
|
||||
qof.h
|
||||
qof-backend.hpp
|
||||
qofbackend.h
|
||||
qofbook.h
|
||||
qofbookslots.h
|
||||
qofchoice.h
|
||||
qofclass.h
|
||||
qofevent.h
|
||||
qofid-p.h
|
||||
qofid.h
|
||||
qofinstance-p.h
|
||||
qofinstance.h
|
||||
qoflog.h
|
||||
qofobject.h
|
||||
qofquery.h
|
||||
qofquerycore.h
|
||||
qofsession.h
|
||||
qofutil.h
|
||||
qof-gobject.h
|
||||
qof-string-cache.h
|
||||
gncAddress.h
|
||||
gncAddressP.h
|
||||
gncBillTerm.h
|
||||
@ -109,20 +150,28 @@ SET (engine_SOURCES
|
||||
Transaction.c
|
||||
cap-gains.c
|
||||
cashobjects.c
|
||||
gnc-aqbanking-templates.cpp
|
||||
gnc-budget.c
|
||||
gnc-commodity.c
|
||||
gnc-date.cpp
|
||||
gnc-datetime.cpp
|
||||
gnc-engine.c
|
||||
gnc-event.c
|
||||
gnc-features.c
|
||||
gnc-hooks.c
|
||||
gnc-int128.cpp
|
||||
gnc-lot.c
|
||||
gnc-numeric.cpp
|
||||
gnc-pricedb.c
|
||||
gnc-rational.cpp
|
||||
gnc-session.c
|
||||
gnc-timezone.cpp
|
||||
gnc-uri-utils.c
|
||||
gncmod-engine.c
|
||||
kvp-scm.cpp
|
||||
engine-helpers.c
|
||||
glib-helpers.c
|
||||
guid.cpp
|
||||
policy.c
|
||||
gncAddress.c
|
||||
gncBillTerm.c
|
||||
@ -138,6 +187,22 @@ SET (engine_SOURCES
|
||||
gncOwner.c
|
||||
gncTaxTable.c
|
||||
gncVendor.c
|
||||
kvp-frame.cpp
|
||||
kvp-value.cpp
|
||||
qof-backend.cpp
|
||||
qofbook.cpp
|
||||
qofchoice.cpp
|
||||
qofclass.cpp
|
||||
qofevent.cpp
|
||||
qofid.cpp
|
||||
qofinstance.cpp
|
||||
qoflog.cpp
|
||||
qofobject.cpp
|
||||
qofquery.cpp
|
||||
qofquerycore.cpp
|
||||
qofsession.cpp
|
||||
qofutil.cpp
|
||||
qof-string-cache.cpp
|
||||
)
|
||||
|
||||
# Add dependency on config.h
|
||||
@ -158,13 +223,20 @@ ADD_LIBRARY (gncmod-engine
|
||||
${engine_noinst_HEADERS}
|
||||
)
|
||||
|
||||
TARGET_LINK_LIBRARIES(gncmod-engine gnc-core-utils gnc-module gnc-qof ${GUILE_LDFLAGS} ${GLIB2_LDFLAGS})
|
||||
TARGET_LINK_LIBRARIES(gncmod-engine gnc-core-utils gnc-module ${Boost_DATE_TIME_LIBRARIES} ${Boost_REGEX_LIBRARIES} ${REGEX_LDFLAGS} ${GMODULE_LDFLAGS} ${GLIB2_LDFLAGS} ${GOBJECT_LDFLAGS} ${GUILE_LDFLAGS})
|
||||
|
||||
TARGET_COMPILE_DEFINITIONS (gncmod-engine PRIVATE -DG_LOG_DOMAIN=\"gnc.engine\")
|
||||
|
||||
TARGET_INCLUDE_DIRECTORIES (gncmod-engine
|
||||
PRIVATE ${CMAKE_CURRENT_BINARY_DIR} # for iso-4217-currencies.c
|
||||
PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}
|
||||
PUBLIC
|
||||
${CMAKE_CURRENT_SOURCE_DIR}
|
||||
${CMAKE_BINARY_DIR}/src # for config.h
|
||||
${CMAKE_SOURCE_DIR}/src # for platform.h
|
||||
${GLIB2_INCLUDE_DIRS}
|
||||
${LIBINTL_INCLUDE_PATH}
|
||||
${REGEX_INCLUDE_PATH}
|
||||
${CMAKE_SOURCE_DIR}/lib/libc # for strptime.h
|
||||
)
|
||||
|
||||
INSTALL(TARGETS gncmod-engine
|
||||
@ -174,6 +246,16 @@ INSTALL(TARGETS gncmod-engine
|
||||
|
||||
INSTALL(FILES ${engine_HEADERS} DESTINATION include/gnucash)
|
||||
|
||||
SET(qof_test_HEADERS
|
||||
kvp-frame.hpp
|
||||
qofbook.h
|
||||
qofinstance.h
|
||||
qofobject.h
|
||||
qofsession.h
|
||||
)
|
||||
|
||||
INSTALL(FILES ${qof_test_HEADERS} DESTINATION libexec/gnucash/src/engine/test)
|
||||
|
||||
# Scheme
|
||||
|
||||
SET (engine_SCHEME_0
|
||||
@ -194,6 +276,11 @@ IF (NOT WIN32)
|
||||
LIST(APPEND BACKEND_DEPENDS gncmod-backend-dbi-link)
|
||||
ENDIF(WITH_SQL)
|
||||
ELSE (NOT WIN32)
|
||||
ADD_DEFINITIONS (-DOS_WIN32)
|
||||
SET (engine_SOURCES ${engine_SOURCES}
|
||||
qof-win32.cpp
|
||||
../../lib/libc/strptime.c
|
||||
)
|
||||
SET(BACKEND_DEPENDS gncmod-backend-xml)
|
||||
IF (WITH_SQL)
|
||||
LIST(APPEND BACKEND_DEPENDS gncmod-backend-dbi)
|
||||
|
||||
@ -1,4 +1,7 @@
|
||||
SUBDIRS = . test-core test
|
||||
# Note the test subdirectory is added in src/Makefile.am rather
|
||||
# than here. This is because we need it to build after src/test-core
|
||||
# but that directory requires src/engine to be built already...
|
||||
SUBDIRS = . test-core
|
||||
|
||||
pkglib_LTLIBRARIES = libgncmod-engine.la
|
||||
|
||||
@ -8,7 +11,6 @@ AM_CPPFLAGS = \
|
||||
-I${top_srcdir}/src \
|
||||
-I${top_builddir}/src \
|
||||
-I${top_srcdir}/src/gnc-module \
|
||||
-I${top_srcdir}/src/libqof/qof \
|
||||
${GLIB_CFLAGS} \
|
||||
${GUILE_CFLAGS} \
|
||||
$(BOOST_CPPFLAGS)
|
||||
@ -30,19 +32,29 @@ libgncmod_engine_la_SOURCES = \
|
||||
Transaction.c \
|
||||
cap-gains.c \
|
||||
cashobjects.c \
|
||||
gnc-aqbanking-templates.cpp \
|
||||
gnc-budget.c \
|
||||
gnc-commodity.c \
|
||||
gnc-date.cpp \
|
||||
gnc-datetime.cpp \
|
||||
gnc-engine.c \
|
||||
gnc-event.c \
|
||||
gnc-features.c \
|
||||
gnc-hooks.c \
|
||||
gnc-int128.cpp \
|
||||
gnc-lot.c \
|
||||
gnc-numeric.cpp \
|
||||
gnc-pricedb.c \
|
||||
gnc-rational.cpp \
|
||||
gnc-session.c \
|
||||
gnc-timezone.cpp \
|
||||
gnc-uri-utils.c \
|
||||
gncmod-engine.c \
|
||||
guid.cpp \
|
||||
swig-engine.c \
|
||||
kvp-frame.cpp \
|
||||
kvp-scm.cpp \
|
||||
kvp-value.cpp \
|
||||
engine-helpers.c \
|
||||
glib-helpers.c \
|
||||
policy.c \
|
||||
@ -59,7 +71,27 @@ libgncmod_engine_la_SOURCES = \
|
||||
gncOwner.c \
|
||||
gncTaxTable.c \
|
||||
gncIDSearch.c \
|
||||
gncVendor.c
|
||||
gncVendor.c \
|
||||
qof-backend.cpp \
|
||||
qofbook.cpp \
|
||||
qofchoice.cpp \
|
||||
qofclass.cpp \
|
||||
qofevent.cpp \
|
||||
qofid.cpp \
|
||||
qofinstance.cpp \
|
||||
qoflog.cpp \
|
||||
qofobject.cpp \
|
||||
qofquery.cpp \
|
||||
qofquerycore.cpp \
|
||||
qofsession.cpp \
|
||||
qof-string-cache.cpp \
|
||||
qofutil.cpp
|
||||
|
||||
if OS_WIN32
|
||||
libgncmod_engine_la_SOURCES += qof-win32.cpp
|
||||
else
|
||||
WIN32_EXTRA_DIST = qof-win32.cpp
|
||||
endif
|
||||
|
||||
EXTRA_libgncmod_engine_la_SOURCES = iso-4217-currencies.c
|
||||
|
||||
@ -84,16 +116,28 @@ gncinclude_HEADERS = \
|
||||
engine-helpers.h \
|
||||
engine-helpers-guile.h \
|
||||
glib-helpers.h \
|
||||
gnc-aqbanking-templates.h \
|
||||
gnc-budget.h \
|
||||
gnc-commodity.h \
|
||||
gnc-date-p.h \
|
||||
gnc-date.h \
|
||||
gnc-datetime.hpp \
|
||||
gnc-engine.h \
|
||||
gnc-event.h \
|
||||
gnc-features.h \
|
||||
gnc-hooks.h \
|
||||
gnc-numeric.h \
|
||||
gnc-numeric.hpp \
|
||||
gnc-pricedb.h \
|
||||
gnc-rational.hpp \
|
||||
gnc-rational-rounding.hpp \
|
||||
gnc-session.h \
|
||||
gnc-timezone.hpp \
|
||||
gnc-uri-utils.h \
|
||||
guid.h \
|
||||
kvp-frame.hpp \
|
||||
kvp-scm.h \
|
||||
kvp-value.hpp \
|
||||
policy.h \
|
||||
gncAddress.h \
|
||||
gncAddressP.h \
|
||||
@ -119,7 +163,28 @@ gncinclude_HEADERS = \
|
||||
gncTaxTableP.h \
|
||||
gncIDSearch.h \
|
||||
gncVendor.h \
|
||||
gncVendorP.h
|
||||
gncVendorP.h \
|
||||
qof.h \
|
||||
qof-backend.hpp \
|
||||
qofbackend.h \
|
||||
qofbook.h \
|
||||
qofbookslots.h \
|
||||
qofchoice.h \
|
||||
qofclass.h \
|
||||
qofevent.h \
|
||||
qofid-p.h \
|
||||
qofid.h \
|
||||
qofinstance-p.h \
|
||||
qofinstance.h \
|
||||
qoflog.h \
|
||||
qofobject.h \
|
||||
qofquery.h \
|
||||
qofquerycore.h \
|
||||
qofsession.h \
|
||||
qofsession.hpp \
|
||||
qof-string-cache.h \
|
||||
qofutil.h \
|
||||
qof-gobject.h
|
||||
|
||||
noinst_HEADERS = \
|
||||
AccountP.h \
|
||||
@ -128,11 +193,18 @@ noinst_HEADERS = \
|
||||
SX-book.h \
|
||||
SX-ttinfo.h \
|
||||
TransactionP.h \
|
||||
gnc-backend-prov.hpp \
|
||||
gnc-hooks-scm.h \
|
||||
gnc-lot.h \
|
||||
gnc-lot-p.h \
|
||||
gnc-pricedb-p.h \
|
||||
policy-p.h
|
||||
policy-p.h \
|
||||
qofclass-p.h \
|
||||
qofevent-p.h \
|
||||
gnc-int128.hpp \
|
||||
qofobject-p.h \
|
||||
qofquery-p.h \
|
||||
qofquerycore-p.h
|
||||
|
||||
libgncmod_engine_la_LDFLAGS = -avoid-version
|
||||
if PLATFORM_WIN32
|
||||
@ -146,10 +218,10 @@ endif
|
||||
libgncmod_engine_la_LIBADD = \
|
||||
../gnc-module/libgnc-module.la \
|
||||
../core-utils/libgnc-core-utils.la \
|
||||
${top_builddir}/src/libqof/qof/libgnc-qof.la \
|
||||
${GUILE_LIBS} \
|
||||
${REGEX_LIBS} \
|
||||
${GLIB_LIBS} \
|
||||
${BOOST_LDFLAGS} -lboost_regex \
|
||||
${top_builddir}/lib/libc/libc-missing.la
|
||||
|
||||
gncscmmoddir = ${GNC_SCM_INSTALL_DIR}/gnucash
|
||||
@ -176,7 +248,8 @@ EXTRA_DIST = \
|
||||
business-core.i \
|
||||
${gncscmmod_DATA} \
|
||||
${gncscm_DATA} \
|
||||
CMakeLists.txt
|
||||
CMakeLists.txt \
|
||||
${WIN32_EXTRA_DIST}
|
||||
|
||||
if GNUCASH_SEPARATE_BUILDDIR
|
||||
#For executing test cases
|
||||
@ -204,8 +277,7 @@ GUILE_COMPILE_ENV = \
|
||||
--guile-load-dir ${top_builddir}/src/gnc-module \
|
||||
--library-dir ${top_builddir}/src/engine \
|
||||
--library-dir ${top_builddir}/src/gnc-module \
|
||||
--library-dir ${top_builddir}/src/core-utils \
|
||||
--library-dir ${top_builddir}/src/libqof/qof
|
||||
--library-dir ${top_builddir}/src/core-utils
|
||||
|
||||
%.go : %.scm .scm-links $(pkglib_LTLIBRARIES)
|
||||
GNC_UNINSTALLED=yes \
|
||||
@ -224,18 +296,10 @@ noinst_DATA = .scm-links
|
||||
|
||||
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
|
||||
# subsequently.
|
||||
QOFHEADERS = \
|
||||
$(top_srcdir)/src/libqof/qof/qofbook.h \
|
||||
$(top_srcdir)/src/libqof/qof/qofbookslots.h
|
||||
|
||||
swig-engine.c: engine.i $(top_srcdir)/src/base-typemaps.i \
|
||||
$(QOFHEADERS) \
|
||||
$(gncinclude_HEADERS) $(noinst_HEADERS)
|
||||
$(SWIG) -guile $(SWIG_ARGS) -Linkage module \
|
||||
-I${top_srcdir}/src/libqof/qof -I${top_srcdir}/src -o $@ $<
|
||||
-I${top_srcdir}/src -o $@ $<
|
||||
if ! OS_WIN32
|
||||
if ! SWIG_DIST_FAIL
|
||||
if ! `grep "define scm_from_utf8_string" $@ > /dev/null 2>&1`; then \
|
||||
|
||||
@ -129,7 +129,7 @@ GLIST_HELPER_INOUT(OwnerList, SWIGTYPE_p__gncOwner);
|
||||
#endif
|
||||
/* Import query bindings for the below invoice query functions (but
|
||||
* don't generate bindings for them). */
|
||||
%import <libqof/qof/qofquery.h>
|
||||
%import <qofquery.h>
|
||||
|
||||
#define URL_TYPE_CUSTOMER GNC_ID_CUSTOMER
|
||||
#define URL_TYPE_VENDOR GNC_ID_VENDOR
|
||||
|
||||
@ -33,7 +33,7 @@ extern "C"
|
||||
#include "qofinstance-p.h"
|
||||
}
|
||||
|
||||
#include "kvp_frame.hpp"
|
||||
#include "kvp-frame.hpp"
|
||||
#include "gnc-rational.hpp"
|
||||
|
||||
namespace {
|
||||
@ -29,7 +29,7 @@
|
||||
#include <sys/stat.h>
|
||||
#include <sys/types.h>
|
||||
|
||||
#include "libqof/qof/qof.h"
|
||||
#include "qof.h"
|
||||
#include "gnc-features.h"
|
||||
|
||||
typedef struct
|
||||
|
||||
@ -36,7 +36,7 @@
|
||||
#ifndef GNC_FEATURES_H
|
||||
#define GNC_FEATURES_H
|
||||
|
||||
#include "libqof/qof/qof.h"
|
||||
#include "qof.h"
|
||||
|
||||
/** @name Defined features
|
||||
@{
|
||||
|
||||
@ -33,7 +33,7 @@ extern "C"
|
||||
}
|
||||
|
||||
#include "kvp-value.hpp"
|
||||
#include "kvp_frame.hpp"
|
||||
#include "kvp-frame.hpp"
|
||||
#include <typeinfo>
|
||||
#include <sstream>
|
||||
#include <algorithm>
|
||||
@ -1,5 +1,5 @@
|
||||
#include <guid.hpp>
|
||||
#include <kvp_frame.hpp>
|
||||
#include <kvp-frame.hpp>
|
||||
#include <libguile.h>
|
||||
|
||||
extern "C"
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
\********************************************************************/
|
||||
|
||||
#include "kvp-value.hpp"
|
||||
#include "kvp_frame.hpp"
|
||||
#include "kvp-frame.hpp"
|
||||
#include <cmath>
|
||||
|
||||
#include <sstream>
|
||||
@ -57,7 +57,7 @@ extern "C"
|
||||
#include "qofid-p.h"
|
||||
#include "qofobject-p.h"
|
||||
#include "qofbookslots.h"
|
||||
#include "kvp_frame.hpp"
|
||||
#include "kvp-frame.hpp"
|
||||
|
||||
static QofLogModule log_module = QOF_MOD_ENGINE;
|
||||
#define AB_KEY "hbci"
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user