r14983 - gnucash/branches/swig-redo/src - Remove all uses of gwrap related to the engine module.
Chris Shoemaker
chris at cvs.gnucash.org
Mon Oct 9 20:12:41 EDT 2006
Author: chris
Date: 2006-10-09 20:12:40 -0400 (Mon, 09 Oct 2006)
New Revision: 14983
Trac: http://svn.gnucash.org/trac/changeset/14983
Modified:
gnucash/branches/swig-redo/src/app-utils/Makefile.am
gnucash/branches/swig-redo/src/app-utils/test/Makefile.am
gnucash/branches/swig-redo/src/backend/file/test/Makefile.am
gnucash/branches/swig-redo/src/backend/postgres/test/Makefile.am
gnucash/branches/swig-redo/src/business/business-core/businessmod-core.c
gnucash/branches/swig-redo/src/business/business-core/test/Makefile.am
gnucash/branches/swig-redo/src/engine/Makefile.am
gnucash/branches/swig-redo/src/engine/Query.c
gnucash/branches/swig-redo/src/engine/Query.h
gnucash/branches/swig-redo/src/engine/engine.scm
gnucash/branches/swig-redo/src/engine/gncmod-engine.c
gnucash/branches/swig-redo/src/engine/test-core/Makefile.am
gnucash/branches/swig-redo/src/engine/test/Makefile.am
gnucash/branches/swig-redo/src/gnome-utils/Makefile.am
gnucash/branches/swig-redo/src/gnome/Makefile.am
Log:
Remove all uses of gwrap related to the engine module.
Remove some unneeded functions and temporary code.
Modified: gnucash/branches/swig-redo/src/app-utils/Makefile.am
===================================================================
--- gnucash/branches/swig-redo/src/app-utils/Makefile.am 2006-10-10 00:12:06 UTC (rev 14982)
+++ gnucash/branches/swig-redo/src/app-utils/Makefile.am 2006-10-10 00:12:40 UTC (rev 14983)
@@ -68,7 +68,6 @@
libgncmod_app_utils_la_LIBADD = \
${top_builddir}/src/gnc-module/libgncmodule.la \
${top_builddir}/src/engine/libgncmod-engine.la \
- ${top_builddir}/src/engine/libgw-engine.la \
${top_builddir}/src/calculation/libgncmod-calculation.la \
${top_builddir}/src/core-utils/libcore-utils.la \
${GCONF_LIBS} \
Modified: gnucash/branches/swig-redo/src/app-utils/test/Makefile.am
===================================================================
--- gnucash/branches/swig-redo/src/app-utils/test/Makefile.am 2006-10-10 00:12:06 UTC (rev 14982)
+++ gnucash/branches/swig-redo/src/app-utils/test/Makefile.am 2006-10-10 00:12:40 UTC (rev 14983)
@@ -38,7 +38,6 @@
${top_builddir}/src/engine/libgncmod-engine.la \
${top_builddir}/src/gnc-module/libgncmodule.la \
${top_builddir}/src/app-utils/libgncmod-app-utils.la \
- ${top_builddir}/src/engine/libgw-engine.la \
${top_builddir}/src/test-core/libgncmod-test.la \
${top_builddir}/src/engine/test-core/libgncmod-test-engine.la \
${top_builddir}/src/core-utils/libcore-utils.la \
Modified: gnucash/branches/swig-redo/src/backend/file/test/Makefile.am
===================================================================
--- gnucash/branches/swig-redo/src/backend/file/test/Makefile.am 2006-10-10 00:12:06 UTC (rev 14982)
+++ gnucash/branches/swig-redo/src/backend/file/test/Makefile.am 2006-10-10 00:12:40 UTC (rev 14983)
@@ -217,8 +217,6 @@
LDADD = ${top_builddir}/src/test-core/libgncmod-test.la \
${top_builddir}/src/gnc-module/libgncmodule.la \
${top_builddir}/src/engine/libgncmod-engine.la \
- ${top_builddir}/src/engine/libgw-engine.la \
- ${top_builddir}/src/engine/libgw-kvp.la \
${top_builddir}/src/engine/test-core/libgncmod-test-engine.la \
${top_builddir}/src/core-utils/libcore-utils.la \
./libgnc-test-file-stuff.la \
Modified: gnucash/branches/swig-redo/src/backend/postgres/test/Makefile.am
===================================================================
--- gnucash/branches/swig-redo/src/backend/postgres/test/Makefile.am 2006-10-10 00:12:06 UTC (rev 14982)
+++ gnucash/branches/swig-redo/src/backend/postgres/test/Makefile.am 2006-10-10 00:12:40 UTC (rev 14983)
@@ -26,8 +26,6 @@
${top_builddir}/src/gnc-module/libgncmodule.la \
${top_builddir}/src/engine/libgncmod-engine.la \
${top_builddir}/src/engine/libgncmod-engine.la \
- ${top_builddir}/src/engine/libgw-engine.la \
- ${top_builddir}/src/engine/libgw-kvp.la \
${top_builddir}/src/engine/test-core/libgncmod-test-engine.la \
-lltdl \
-lpq
Modified: gnucash/branches/swig-redo/src/business/business-core/businessmod-core.c
===================================================================
--- gnucash/branches/swig-redo/src/business/business-core/businessmod-core.c 2006-10-10 00:12:06 UTC (rev 14982)
+++ gnucash/branches/swig-redo/src/business/business-core/businessmod-core.c 2006-10-10 00:12:40 UTC (rev 14983)
@@ -42,7 +42,6 @@
#include "gncOwnerP.h"
#include "gncTaxTableP.h"
#include "gncVendorP.h"
-#include "g-wrap-wct.h" //temp
extern SCM scm_init_sw_business_core_module (void);
@@ -100,23 +99,6 @@
scm_c_eval_string("(use-modules (sw_business_core))");
scm_c_eval_string("(use-modules (gnucash business-core))");
- // temp code until gnc:id-type is wrapped
- {
- SCM wct_gnc_id_type = scm_c_eval_string("<gnc:id-type>");
- SCM tmp;
-
- tmp = gw_wcp_assimilate_ptr(INVOICE_FROM_TXN, wct_gnc_id_type);
- scm_c_define("gnc:invoice-from-txn", tmp);
- tmp = gw_wcp_assimilate_ptr(INVOICE_FROM_LOT, wct_gnc_id_type);
- scm_c_define("gnc:invoice-from-lot", tmp);
- tmp = gw_wcp_assimilate_ptr(INVOICE_OWNER, wct_gnc_id_type);
- scm_c_define("gnc:invoice-owner", tmp);
- tmp = gw_wcp_assimilate_ptr(OWNER_PARENTG, wct_gnc_id_type);
- scm_c_define("gnc:owner-parentg", tmp);
- tmp = gw_wcp_assimilate_ptr(OWNER_FROM_LOT, wct_gnc_id_type);
- scm_c_define("gnc:owner-from-lot", tmp);
- }
-
return TRUE;
}
Modified: gnucash/branches/swig-redo/src/business/business-core/test/Makefile.am
===================================================================
--- gnucash/branches/swig-redo/src/business/business-core/test/Makefile.am 2006-10-10 00:12:06 UTC (rev 14982)
+++ gnucash/branches/swig-redo/src/business/business-core/test/Makefile.am 2006-10-10 00:12:40 UTC (rev 14983)
@@ -13,7 +13,6 @@
${top_builddir}/src/gnc-module/libgncmodule.la \
${top_builddir}/src/test-core/libgncmod-test.la \
${top_builddir}/src/engine/libgncmod-engine.la \
- ${top_builddir}/src/engine/libgw-engine.la \
../libgncmod-business-core.la \
${GLIB_LIBS} \
${QOF_LIBS} \
Modified: gnucash/branches/swig-redo/src/engine/Makefile.am
===================================================================
--- gnucash/branches/swig-redo/src/engine/Makefile.am 2006-10-10 00:12:06 UTC (rev 14982)
+++ gnucash/branches/swig-redo/src/engine/Makefile.am 2006-10-10 00:12:40 UTC (rev 14983)
@@ -1,7 +1,7 @@
SUBDIRS = . test-core test
PWD := $(shell pwd)
-pkglib_LTLIBRARIES = libgncmod-engine.la libgw-engine.la libgw-kvp.la
+pkglib_LTLIBRARIES = libgncmod-engine.la
AM_CFLAGS = \
-I${top_srcdir}/lib/libc \
@@ -116,25 +116,6 @@
${GNUCASH_ENGINE_BASE_LIBS} \
${top_builddir}/lib/libc/libc-missing.la
-libgw_kvp_la_SOURCES = kvp-scm.c
-nodist_libgw_kvp_la_SOURCES = gw-kvp.c
-libgw_kvp_la_LDFLAGS = \
- ${G_WRAP_LINK_ARGS} \
- ${QOF_LIBS} \
- ${GLIB_LIBS}
-libgw_kvp_la_LIBADD = \
- libgncmod-engine.la \
- libgw-engine.la
-
-libgw_engine_la_SOURCES = engine-helpers.c glib-helpers.c
-nodist_libgw_engine_la_SOURCES = gw-engine.c
-libgw_engine_la_LDFLAGS = \
- ${G_WRAP_LINK_ARGS} \
- ${QOF_LIBS} \
- ${GLIB_LIBS}
-libgw_engine_la_LIBADD = \
- libgncmod-engine.la
-
gncmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash
gncmod_DATA = engine.scm
@@ -145,14 +126,6 @@
engine-utilities.scm \
gnc-numeric.scm
-gwmoddir = ${GNC_GWRAP_LIBDIR}
-gwmod_DATA = \
- gw-engine-spec.scm \
- gw-kvp-spec.scm
-nodist_gwmod_DATA = \
- gw-engine.scm \
- gw-kvp.scm
-
EXTRA_DIST = \
README.query-api \
design.txt \
@@ -163,12 +136,11 @@
kvp_doc.txt \
SX-book-p.h \
${gncmod_DATA} \
- ${gncscm_DATA} \
- ${gwmod_DATA}
+ ${gncscm_DATA}
if GNUCASH_SEPARATE_BUILDDIR
#For compiling
-SCM_FILE_LINKS = gw-engine-spec.scm gw-kvp-spec.scm iso-4217-currencies.scm
+SCM_FILE_LINKS = iso-4217-currencies.scm
#For executing test cases
SCM_FILE_LINKS += \
${gncmod_DATA} \
@@ -194,22 +166,6 @@
-chmod u+x ${srcdir}/iso-currencies-to-c
GUILE_LOAD_PATH=@GNC_SRFI_LOAD_PATH@:${GUILE_LOAD_PATH} srcdir=${srcdir} ${srcdir}/iso-currencies-to-c
-gw-engine.scm gw-engine.c gw-engine.h: \
- .scm-links gw-engine-spec.scm ${top_builddir}/config.status
- FLAVOR=gnome $(GUILE) -c \
- "(set! %load-path (cons \"${G_WRAP_MODULE_DIR}\" %load-path)) \
- (set! %load-path (cons \"${PWD}\" %load-path)) \
- (primitive-load \"./gw-engine-spec.scm\") \
- (gw:generate-wrapset \"gw-engine\")"
-
-gw-kvp.scm gw-kvp.c gw-kvp.h: \
- .scm-links gw-kvp-spec.scm ${top_builddir}/config.status
- FLAVOR=gnome $(GUILE) -c \
- "(set! %load-path (cons \"${G_WRAP_MODULE_DIR}\" %load-path)) \
- (set! %load-path (cons \"${PWD}\" %load-path)) \
- (primitive-load \"./gw-kvp-spec.scm\") \
- (gw:generate-wrapset \"gw-kvp\")"
-
gncla-dir.h: gncla-dir.h.in ${top_builddir}/config.status
rm -f $@.tmp
sed < $< > $@.tmp \
@@ -217,8 +173,7 @@
mv $@.tmp $@
BUILT_SOURCES = iso-4217-currencies.c \
- gw-engine.scm gw-engine.c gw-engine.h \
- gw-kvp.scm gw-kvp.c gw-kvp.h gncla-dir.h swig-engine.c
+ gncla-dir.h swig-engine.c
-CLEANFILES = $(BUILT_SOURCES) gnucash g-wrapped .scm-links gncla-dir.h \
- ${SCM_FILE_LINKS} gw-engine.html gw-kvp.html
+CLEANFILES = $(BUILT_SOURCES) gnucash .scm-links gncla-dir.h \
+ ${SCM_FILE_LINKS}
Modified: gnucash/branches/swig-redo/src/engine/Query.c
===================================================================
--- gnucash/branches/swig-redo/src/engine/Query.c 2006-10-10 00:12:06 UTC (rev 14982)
+++ gnucash/branches/swig-redo/src/engine/Query.c 2006-10-10 00:12:40 UTC (rev 14983)
@@ -534,22 +534,6 @@
}
void
-xaccQueryAddGUIDMatchGL (QofQuery *q, GList *param_list,
- GUID guid, QofQueryOp op)
-{
- GSList *params = NULL;
- GList *node;
-
- for (node = param_list; node; node = node->next)
- params = g_slist_prepend (params, node->data);
-
- params = g_slist_reverse (params);
- g_list_free (param_list);
-
- qof_query_add_guid_match (q, params, &guid, op);
-}
-
-void
xaccQueryAddKVPMatch(QofQuery *q, GSList *path, const KvpValue *value,
QofQueryCompare how, QofIdType id_type,
QofQueryOp op)
Modified: gnucash/branches/swig-redo/src/engine/Query.h
===================================================================
--- gnucash/branches/swig-redo/src/engine/Query.h 2006-10-10 00:12:06 UTC (rev 14982)
+++ gnucash/branches/swig-redo/src/engine/Query.h 2006-10-10 00:12:40 UTC (rev 14983)
@@ -196,8 +196,6 @@
void xaccQueryAddClearedMatch(Query * q, cleared_match_t how, QofQueryOp op);
void xaccQueryAddGUIDMatch(Query * q, const GUID *guid,
QofIdType id_type, QofQueryOp op);
-void xaccQueryAddGUIDMatchGL (QofQuery *q, GList *param_list,
- GUID guid, QofQueryOp op);
/** given kvp value is on right side of comparison */
void xaccQueryAddKVPMatch(Query *q, GSList *path, const KvpValue *value,
Modified: gnucash/branches/swig-redo/src/engine/engine.scm
===================================================================
--- gnucash/branches/swig-redo/src/engine/engine.scm 2006-10-10 00:12:06 UTC (rev 14982)
+++ gnucash/branches/swig-redo/src/engine/engine.scm 2006-10-10 00:12:40 UTC (rev 14983)
@@ -3,8 +3,6 @@
(use-modules (g-wrap gw-wct))
(use-modules (sw_engine))
-(use-modules (g-wrapped gw-engine))
-
(export GNC-RND-FLOOR)
(export GNC-RND-CEIL)
(export GNC-RND-TRUNC)
Modified: gnucash/branches/swig-redo/src/engine/gncmod-engine.c
===================================================================
--- gnucash/branches/swig-redo/src/engine/gncmod-engine.c 2006-10-10 00:12:06 UTC (rev 14982)
+++ gnucash/branches/swig-redo/src/engine/gncmod-engine.c 2006-10-10 00:12:40 UTC (rev 14983)
@@ -55,11 +55,6 @@
scm_c_eval_string("(use-modules (sw_engine))");
scm_c_eval_string("(use-modules (gnucash engine))");
- scm_c_eval_string("(use-modules (g-wrap gw-glib))");
-
- scm_c_eval_string("(use-modules (g-wrapped gw-kvp))");
- scm_c_eval_string("(use-modules (g-wrapped gw-engine))");
-
return TRUE;
}
Modified: gnucash/branches/swig-redo/src/engine/test/Makefile.am
===================================================================
--- gnucash/branches/swig-redo/src/engine/test/Makefile.am 2006-10-10 00:12:06 UTC (rev 14982)
+++ gnucash/branches/swig-redo/src/engine/test/Makefile.am 2006-10-10 00:12:40 UTC (rev 14983)
@@ -14,8 +14,6 @@
${top_builddir}/src/gnc-module/libgncmodule.la \
${top_builddir}/src/test-core/libgncmod-test.la \
../libgncmod-engine.la \
- ../libgw-engine.la \
- ../libgw-kvp.la \
../test-core/libgncmod-test-engine.la \
${top_builddir}/src/core-utils/libcore-utils.la \
${GLIB_LIBS} \
Modified: gnucash/branches/swig-redo/src/engine/test-core/Makefile.am
===================================================================
--- gnucash/branches/swig-redo/src/engine/test-core/Makefile.am 2006-10-10 00:12:06 UTC (rev 14982)
+++ gnucash/branches/swig-redo/src/engine/test-core/Makefile.am 2006-10-10 00:12:40 UTC (rev 14983)
@@ -3,8 +3,6 @@
LDADD = \
${top_builddir}/src/gnc-module/libgncmodule.la \
../libgncmod-engine.la \
- ../libgw-engine.la \
- ../libgw-kvp.la \
${GLIB_LIBS} \
${QOF_LIBS} \
-lltdl
@@ -14,8 +12,6 @@
libgncmod_test_engine_la_LIBADD = \
${top_builddir}/src/gnc-module/libgncmodule.la \
../libgncmod-engine.la \
- ../libgw-engine.la \
- ../libgw-kvp.la \
${QOF_LIBS} \
${GLIB_LIBS}
Modified: gnucash/branches/swig-redo/src/gnome/Makefile.am
===================================================================
--- gnucash/branches/swig-redo/src/gnome/Makefile.am 2006-10-10 00:12:06 UTC (rev 14982)
+++ gnucash/branches/swig-redo/src/gnome/Makefile.am 2006-10-10 00:12:40 UTC (rev 14983)
@@ -12,7 +12,6 @@
${top_builddir}/src/gnome-utils/libgncmod-gnome-utils.la \
${top_builddir}/src/backend/file/libgnc-backend-file-utils.la \
${top_builddir}/src/app-utils/libgncmod-app-utils.la \
- ${top_builddir}/src/engine/libgw-engine.la \
${top_builddir}/src/engine/libgncmod-engine.la \
${top_builddir}/src/calculation/libgncmod-calculation.la \
${top_builddir}/src/core-utils/libcore-utils.la \
Modified: gnucash/branches/swig-redo/src/gnome-utils/Makefile.am
===================================================================
--- gnucash/branches/swig-redo/src/gnome-utils/Makefile.am 2006-10-10 00:12:06 UTC (rev 14982)
+++ gnucash/branches/swig-redo/src/gnome-utils/Makefile.am 2006-10-10 00:12:40 UTC (rev 14983)
@@ -176,7 +176,6 @@
${top_builddir}/src/core-utils/libcore-utils.la \
${top_builddir}/src/gnc-module/libgncmodule.la \
${top_builddir}/src/engine/libgncmod-engine.la \
- ${top_builddir}/src/engine/libgw-engine.la \
${top_builddir}/src/backend/file/libgnc-backend-file-utils.la \
${top_builddir}/src/calculation/libgncmod-calculation.la \
${top_builddir}/src/network-utils/libgncmod-network-utils.la \
More information about the gnucash-changes
mailing list