r15026 - gnucash/trunk/src - Factor out some common typemaps into src/base-typemaps.i
Chris Shoemaker
chris at cvs.gnucash.org
Sun Oct 15 23:35:57 EDT 2006
Author: chris
Date: 2006-10-15 23:35:56 -0400 (Sun, 15 Oct 2006)
New Revision: 15026
Trac: http://svn.gnucash.org/trac/changeset/15026
Added:
gnucash/trunk/src/base-typemaps.i
Modified:
gnucash/trunk/src/Makefile.am
gnucash/trunk/src/app-utils/Makefile.am
gnucash/trunk/src/app-utils/app-utils.i
gnucash/trunk/src/business/business-core/Makefile.am
gnucash/trunk/src/business/business-core/business-core.i
gnucash/trunk/src/business/dialog-tax-table/Makefile.am
gnucash/trunk/src/business/dialog-tax-table/dialog-tax-table.i
gnucash/trunk/src/core-utils/Makefile.am
gnucash/trunk/src/core-utils/core-utils.i
gnucash/trunk/src/engine/Makefile.am
gnucash/trunk/src/engine/engine.i
gnucash/trunk/src/gnc-module/Makefile.am
gnucash/trunk/src/gnc-module/gnc-module.i
gnucash/trunk/src/gnome-utils/Makefile.am
gnucash/trunk/src/gnome-utils/gnome-utils.i
gnucash/trunk/src/gnome/Makefile.am
gnucash/trunk/src/gnome/gnome.i
gnucash/trunk/src/report/report-gnome/Makefile.am
gnucash/trunk/src/report/report-gnome/report-gnome.i
gnucash/trunk/src/report/report-system/Makefile.am
gnucash/trunk/src/report/report-system/report-system.i
Log:
Factor out some common typemaps into src/base-typemaps.i
Modified: gnucash/trunk/src/Makefile.am
===================================================================
--- gnucash/trunk/src/Makefile.am 2006-10-16 01:28:08 UTC (rev 15025)
+++ gnucash/trunk/src/Makefile.am 2006-10-16 03:35:56 UTC (rev 15026)
@@ -47,6 +47,7 @@
MAINTAINERCLEANFILES = swig-runtime.h
EXTRA_DIST = \
+ base-typemaps.i \
README.modules \
gnc-test-env \
valgrind-gnucash.supp \
Modified: gnucash/trunk/src/app-utils/Makefile.am
===================================================================
--- gnucash/trunk/src/app-utils/Makefile.am 2006-10-16 01:28:08 UTC (rev 15025)
+++ gnucash/trunk/src/app-utils/Makefile.am 2006-10-16 03:35:56 UTC (rev 15026)
@@ -76,9 +76,9 @@
${GLIB_LIBS}
if BUILDING_FROM_SVN
-swig-app-utils.c: app-utils.i ${gncinclude_HEADERS}
+swig-app-utils.c: app-utils.i
$(SWIG) -guile $(SWIG_ARGS) -Linkage module \
- -I${top_srcdir}/src/engine -I${top_srcdir}/lib/libqof/qof -o $@ $<
+ -I${top_srcdir}/src -o $@ $<
endif
gncmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash
Modified: gnucash/trunk/src/app-utils/app-utils.i
===================================================================
--- gnucash/trunk/src/app-utils/app-utils.i 2006-10-16 01:28:08 UTC (rev 15025)
+++ gnucash/trunk/src/app-utils/app-utils.i 2006-10-16 03:35:56 UTC (rev 15026)
@@ -17,30 +17,8 @@
SCM scm_init_sw_app_utils_module (void);
%}
-//%import "engine.i"
+%import "base-typemaps.i"
-%typemap(in) GNCPrintAmountInfo "$1 = gnc_scm2printinfo($input);"
-%typemap(out) GNCPrintAmountInfo "$result = gnc_printinfo2scm($1);"
-
-%typemap(out) GncCommodityList {
- SCM list = SCM_EOL;
- GList *node;
-
- for (node = $1; node; node = node->next)
- list = scm_cons(gnc_quoteinfo2scm(node->data), list);
-
- $result = scm_reverse(list);
-}
-
-// Temporary SWIG<->G-wrap converters for engine types
-%typemap(in) gboolean "$1 = SCM_NFALSEP($input) ? TRUE : FALSE;"
-%typemap(out) gboolean "$result = $1 ? SCM_BOOL_T : SCM_BOOL_F;"
-
-%typemap(in) gnc_numeric "$1 = gnc_scm_to_numeric($input);"
-%typemap(out) gnc_numeric "$result = gnc_numeric_to_scm($1);"
-
-// End of temporary typemaps.
-
typedef void (*GNCOptionChangeCallback) (gpointer user_data);
typedef int GNCOptionDBHandle;
@@ -55,6 +33,16 @@
void gnc_option_db_set_option_selectable_by_name(SCM guile_option,
const char *section, const char *name, gboolean selectable);
+%typemap(out) GncCommodityList {
+ SCM list = SCM_EOL;
+ GList *node;
+
+ for (node = $1; node; node = node->next)
+ list = scm_cons(gnc_quoteinfo2scm(node->data), list);
+
+ $result = scm_reverse(list);
+}
+
%inline %{
typedef GList GncCommodityList;
@@ -89,8 +77,6 @@
gnc_numeric gnc_convert_from_euro(const gnc_commodity * currency,
gnc_numeric value);
-
-typedef int time_t;
time_t gnc_accounting_period_fiscal_start(void);
time_t gnc_accounting_period_fiscal_end(void);
Added: gnucash/trunk/src/base-typemaps.i
===================================================================
--- gnucash/trunk/src/base-typemaps.i 2006-10-16 01:28:08 UTC (rev 15025)
+++ gnucash/trunk/src/base-typemaps.i 2006-10-16 03:35:56 UTC (rev 15026)
@@ -0,0 +1,64 @@
+%typemap(in) gboolean "$1 = SCM_NFALSEP($input) ? TRUE : FALSE;"
+%typemap(out) gboolean "$result = $1 ? SCM_BOOL_T : SCM_BOOL_F;"
+
+%typemap(in) Timespec "$1 = gnc_timepair2timespec($input);"
+%typemap(out) Timespec "$result = gnc_timespec2timepair($1);"
+
+%typemap(in) GUID "$1 = gnc_scm2guid($input);"
+%typemap(out) GUID "$result = gnc_guid2scm($1);"
+%typemap(in) GUID * (GUID g) " g = gnc_scm2guid($input); $1 = &g; "
+%typemap(out) GUID * " $result = ($1) ? gnc_guid2scm(*($1)): SCM_UNDEFINED; "
+
+%typemap(in) gnc_numeric "$1 = gnc_scm_to_numeric($input);"
+%typemap(out) gnc_numeric "$result = gnc_numeric_to_scm($1);"
+
+%typemap(in) gint64 " $1 = gnc_scm_to_gint64($input); "
+%typemap(out) gint64 " $result = gnc_gint64_to_scm($1); "
+
+/* Not sure why SWIG doesn't figure this out. */
+typedef void * gpointer;
+typedef int gint;
+typedef int time_t;
+typedef unsigned int guint;
+typedef char * URLType;
+typedef char gchar;
+
+%typemap(newfree) gchar * "g_free($1);"
+
+%typemap(in) GNCPrintAmountInfo "$1 = gnc_scm2printinfo($input);"
+%typemap(out) GNCPrintAmountInfo "$result = gnc_printinfo2scm($1);"
+
+
+%define GLIST_HELPER_INOUT(ListType, ElemSwigType)
+%typemap(in) ListType * {
+ SCM list = $input;
+ GList *c_list = NULL;
+
+ while (!SCM_NULLP(list)) {
+ Account *p;
+
+ SCM p_scm = SCM_CAR(list);
+ if (SCM_FALSEP(p_scm) || SCM_NULLP(p_scm))
+ p = NULL;
+ else
+ p = SWIG_MustGetPtr(p_scm, ElemSwigType, 1, 0);
+
+ c_list = g_list_prepend(c_list, p);
+ list = SCM_CDR(list);
+ }
+
+ $1 = g_list_reverse(c_list);
+}
+%typemap(out) ListType * {
+ SCM list = SCM_EOL;
+ GList *node;
+
+ for (node = $1; node; node = node->next)
+ list = scm_cons(SWIG_NewPointerObj(node->data,
+ ElemSwigType, 0), list);
+
+ $result = scm_reverse(list);
+}
+%enddef
+
+
Modified: gnucash/trunk/src/business/business-core/Makefile.am
===================================================================
--- gnucash/trunk/src/business/business-core/Makefile.am 2006-10-16 01:28:08 UTC (rev 15025)
+++ gnucash/trunk/src/business/business-core/Makefile.am 2006-10-16 03:35:56 UTC (rev 15026)
@@ -68,7 +68,7 @@
if BUILDING_FROM_SVN
swig-business-core.c: business-core.i ${noinst_HEADERS}
$(SWIG) -guile $(SWIG_ARGS) -Linkage module \
- -I${top_srcdir}/src/engine -o $@ $<
+ -I${top_srcdir}/src -o $@ $<
endif
gncmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash
Modified: gnucash/trunk/src/business/business-core/business-core.i
===================================================================
--- gnucash/trunk/src/business/business-core/business-core.i 2006-10-16 01:28:08 UTC (rev 15025)
+++ gnucash/trunk/src/business/business-core/business-core.i 2006-10-16 03:35:56 UTC (rev 15026)
@@ -20,22 +20,8 @@
SCM scm_init_sw_business_core_module (void);
%}
-// Temporary SWIG<->G-wrap converters for engine types
-%typemap(in) gboolean "$1 = SCM_NFALSEP($input) ? TRUE : FALSE;"
-%typemap(out) gboolean "$result = $1 ? SCM_BOOL_T : SCM_BOOL_F;"
+%import "base-typemaps.i"
-%typemap(in) Timespec "$1 = gnc_timepair2timespec($input);"
-%typemap(out) Timespec "$result = gnc_timespec2timepair($1);"
-
-%typemap(in) GUID "$1 = gnc_scm2guid($input);"
-%typemap(out) GUID "$result = gnc_guid2scm($1);"
-
-%typemap(in) gnc_numeric "$1 = gnc_scm_to_numeric($input);"
-%typemap(out) gnc_numeric "$result = gnc_numeric_to_scm($1);"
-
-// End of temporary typemaps.
-
-
%rename(gncOwnerReturnGUID) gncOwnerRetGUID;
%inline %{
@@ -77,33 +63,14 @@
%}
-%typemap(out) EntryList * {
- SCM list = SCM_EOL;
- GList *node;
+GLIST_HELPER_INOUT(EntryList, SWIGTYPE_p__gncEntry);
+GLIST_HELPER_INOUT(AccountValueList, SWIGTYPE_p__gncAccountValue);
- for (node = $1; node; node = node->next)
- list = scm_cons(SWIG_NewPointerObj(node->data,
- SWIGTYPE_p__gncEntry, 0), list);
-
- $result = scm_reverse(list);
-}
-
-%typemap(out) AccountValueList * {
- SCM list = SCM_EOL;
- GList *node;
-
- for (node = $1; node; node = node->next)
- list = scm_cons(SWIG_NewPointerObj(node->data,
- SWIGTYPE_p__gncAccountValue, 0), list);
-
- $result = scm_reverse(list);
-}
-
%typemap(in) GncAccountValue * "$1 = gnc_scm_to_account_value_ptr($input);"
%typemap(out) GncAccountValue * "$result = gnc_account_value_ptr_to_scm($1);"
-/* Parse the header file to generate wrappers */
+/* Parse the header files to generate wrappers */
%include <gncAddress.h>
%include <gncBillTerm.h>
%include <gncCustomer.h>
Modified: gnucash/trunk/src/business/dialog-tax-table/Makefile.am
===================================================================
--- gnucash/trunk/src/business/dialog-tax-table/Makefile.am 2006-10-16 01:28:08 UTC (rev 15025)
+++ gnucash/trunk/src/business/dialog-tax-table/Makefile.am 2006-10-16 03:35:56 UTC (rev 15026)
@@ -41,8 +41,9 @@
${EFENCE_LIBS}
if BUILDING_FROM_SVN
-swig-dialog-tax-table.c: dialog-tax-table.i ${noinst_HEADERS}
- $(SWIG) -guile $(SWIG_ARGS) -Linkage module -o $@ $<
+swig-dialog-tax-table.c: dialog-tax-table.i
+ $(SWIG) -guile $(SWIG_ARGS) -Linkage module \
+ -I${top_srcdir}/src -o $@ $<
endif
gncmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash
Modified: gnucash/trunk/src/business/dialog-tax-table/dialog-tax-table.i
===================================================================
--- gnucash/trunk/src/business/dialog-tax-table/dialog-tax-table.i 2006-10-16 01:28:08 UTC (rev 15025)
+++ gnucash/trunk/src/business/dialog-tax-table/dialog-tax-table.i 2006-10-16 03:35:56 UTC (rev 15026)
@@ -7,4 +7,6 @@
SCM scm_init_sw_dialog_tax_table_module (void);
%}
+%import "base-typemaps.i"
+
TaxTableWindow * gnc_ui_tax_table_window_new (GNCBook *book);
Modified: gnucash/trunk/src/core-utils/Makefile.am
===================================================================
--- gnucash/trunk/src/core-utils/Makefile.am 2006-10-16 01:28:08 UTC (rev 15025)
+++ gnucash/trunk/src/core-utils/Makefile.am 2006-10-16 03:35:56 UTC (rev 15026)
@@ -26,7 +26,8 @@
if BUILDING_FROM_SVN
swig-core-utils.c: core-utils.i
- $(SWIG) -guile $(SWIG_ARGS) -Linkage module -o $@ $<
+ $(SWIG) -guile $(SWIG_ARGS) -Linkage module \
+ -I${top_srcdir}/src -o $@ $<
endif
AM_CFLAGS = \
Modified: gnucash/trunk/src/core-utils/core-utils.i
===================================================================
--- gnucash/trunk/src/core-utils/core-utils.i 2006-10-16 01:28:08 UTC (rev 15025)
+++ gnucash/trunk/src/core-utils/core-utils.i 2006-10-16 03:35:56 UTC (rev 15026)
@@ -1,6 +1,5 @@
%module sw_core_utils
%{
-//#include <gnc-gconf-utils.h>
#include <gnc-glib-utils.h>
#include <gnc-main.h>
#include <glib.h>
@@ -8,13 +7,8 @@
SCM scm_init_sw_core_utils_module (void);
%}
-typedef char gchar;
-%typemap(newfree) gchar * "g_free($1);"
-%typemap(in) gboolean " $1 = SCM_NFALSEP($input) ? TRUE : FALSE; "
-%typemap(out) gboolean " $result = $1 ? SCM_BOOL_T : SCM_BOOL_F; "
+%import "base-typemaps.i"
-
-
%newobject g_find_program_in_path;
gchar * g_find_program_in_path(const gchar *);
Modified: gnucash/trunk/src/engine/Makefile.am
===================================================================
--- gnucash/trunk/src/engine/Makefile.am 2006-10-16 01:28:08 UTC (rev 15025)
+++ gnucash/trunk/src/engine/Makefile.am 2006-10-16 03:35:56 UTC (rev 15026)
@@ -170,7 +170,7 @@
if BUILDING_FROM_SVN
swig-engine.c: engine.i ${gncinclude_HEADERS} ${noinst_HEADERS}
$(SWIG) -guile $(SWIG_ARGS) -Linkage module \
- -I${top_srcdir}/lib/libqof/qof -o $@ $<
+ -I${top_srcdir}/lib/libqof/qof -I${top_srcdir}/src -o $@ $<
endif
iso-4217-currencies.c: iso-4217-currencies.scm iso-currencies-to-c
Modified: gnucash/trunk/src/engine/engine.i
===================================================================
--- gnucash/trunk/src/engine/engine.i 2006-10-16 01:28:08 UTC (rev 15025)
+++ gnucash/trunk/src/engine/engine.i 2006-10-16 03:35:56 UTC (rev 15026)
@@ -22,66 +22,9 @@
SCM scm_init_sw_engine_module (void);
%}
-/* Not sure why SWIG doesn't figure this out. */
-typedef unsigned int guint;
-typedef char gchar;
-typedef void * gpointer;
-typedef int gint;
-//%import "glib.h"
+%import "base-typemaps.i"
-//typedef const gchar * QofIdType;
-//%import "qofid.h"
-%typemap(in) gint64 " $1 = gnc_scm_to_gint64($input); "
-%typemap(out) gint64 " $result = gnc_gint64_to_scm($1); "
-
-%typemap(in) gboolean " $1 = SCM_NFALSEP($input) ? TRUE : FALSE; "
-%typemap(out) gboolean " $result = $1 ? SCM_BOOL_T : SCM_BOOL_F; "
-
-%typemap(in) Timespec " $1 = gnc_timepair2timespec($input); "
-%typemap(out) Timespec " $result = gnc_timespec2timepair($1); "
-
-%typemap(in) GUID " $1 = gnc_scm2guid($input); "
-%typemap(out) GUID " $result = gnc_guid2scm($1); "
-%typemap(in) GUID * (GUID g) " g = gnc_scm2guid($input); $1 = &g; "
-%typemap(out) GUID * " $result = ($1) ? gnc_guid2scm(*($1)): SCM_UNDEFINED; "
-
-
-%typemap(in) gnc_numeric " $1 = gnc_scm_to_numeric($input); "
-%typemap(out) gnc_numeric " $result = gnc_numeric_to_scm($1); "
-
-%define GLIST_HELPER_INOUT(ListType, ElemSwigType)
-%typemap(in) ListType * {
- SCM list = $input;
- GList *c_list = NULL;
-
- while (!SCM_NULLP(list)) {
- Account *p;
-
- SCM p_scm = SCM_CAR(list);
- if (SCM_FALSEP(p_scm) || SCM_NULLP(p_scm))
- p = NULL;
- else
- p = SWIG_MustGetPtr(p_scm, ElemSwigType, 1, 0);
-
- c_list = g_list_prepend(c_list, p);
- list = SCM_CDR(list);
- }
-
- $1 = g_list_reverse(c_list);
-}
-%typemap(out) ListType * {
- SCM list = SCM_EOL;
- GList *node;
-
- for (node = $1; node; node = node->next)
- list = scm_cons(SWIG_NewPointerObj(node->data,
- ElemSwigType, 0), list);
-
- $result = scm_reverse(list);
-}
-%enddef
-
GLIST_HELPER_INOUT(SplitList, SWIGTYPE_p_Split);
GLIST_HELPER_INOUT(TransList, SWIGTYPE_p_Transaction);
GLIST_HELPER_INOUT(LotList, SWIGTYPE_p_GNCLot);
@@ -113,8 +56,10 @@
%typemap(newfree) gchar * "g_free($1);"
-/* NB: Should cover all the functions currently used, but not all that
- * are wrapped */
+/* NB: The object ownership annotations should already cover all the
+functions currently used in guile, but not all the functions that are
+wrapped. So, we should contract the interface to wrap only the used
+functions. */
%newobject xaccGroupGetSubAccountsSorted;
%newobject xaccGroupGetAccountListSorted;
@@ -138,7 +83,6 @@
%newobject gnc_build_book_path;
/* Parse the header file to generate wrappers */
-//#define QOF_ID_BOOK "Book"
%inline {
static QofIdType QOF_ID_BOOK_SCM (void) { return QOF_ID_BOOK; }
}
Modified: gnucash/trunk/src/gnc-module/Makefile.am
===================================================================
--- gnucash/trunk/src/gnc-module/Makefile.am 2006-10-16 01:28:08 UTC (rev 15025)
+++ gnucash/trunk/src/gnc-module/Makefile.am 2006-10-16 03:35:56 UTC (rev 15026)
@@ -28,7 +28,8 @@
if BUILDING_FROM_SVN
swig-gnc-module.c: gnc-module.i
- $(SWIG) -guile $(SWIG_ARGS) -Linkage module -o $@ $<
+ $(SWIG) -guile $(SWIG_ARGS) -Linkage module \
+ -I${top_srcdir}/src -o $@ $<
endif
EXTRA_DIST = \
Modified: gnucash/trunk/src/gnc-module/gnc-module.i
===================================================================
--- gnucash/trunk/src/gnc-module/gnc-module.i 2006-10-16 01:28:08 UTC (rev 15025)
+++ gnucash/trunk/src/gnc-module/gnc-module.i 2006-10-16 03:35:56 UTC (rev 15026)
@@ -5,8 +5,7 @@
SCM scm_init_sw_gnc_module_module (void);
%}
-typedef char gchar;
-typedef int gint;
+%import "base-typemaps.i"
void gnc_module_system_init(void);
void gnc_module_system_refresh(void);
Modified: gnucash/trunk/src/gnome/Makefile.am
===================================================================
--- gnucash/trunk/src/gnome/Makefile.am 2006-10-16 01:28:08 UTC (rev 15025)
+++ gnucash/trunk/src/gnome/Makefile.am 2006-10-16 03:35:56 UTC (rev 15026)
@@ -89,9 +89,9 @@
window-reconcile.h
if BUILDING_FROM_SVN
-swig-gnome.c: gnome.i ${noinst_HEADERS}
+swig-gnome.c: gnome.i dialog-progress.h
$(SWIG) -guile $(SWIG_ARGS) -Linkage module \
- -I${top_srcdir}/src/engine -o $@ $<
+ -I${top_srcdir}/src -o $@ $<
endif
EXTRA_DIST = \
Modified: gnucash/trunk/src/gnome/gnome.i
===================================================================
--- gnucash/trunk/src/gnome/gnome.i 2006-10-16 01:28:08 UTC (rev 15025)
+++ gnucash/trunk/src/gnome/gnome.i 2006-10-16 03:35:56 UTC (rev 15026)
@@ -8,10 +8,7 @@
SCM scm_init_sw_gnome_module (void);
%}
-// Temporary SWIG<->G-wrap converters for engine types
-%typemap(in) gboolean "$1 = SCM_NFALSEP($input) ? TRUE : FALSE;"
-%typemap(out) gboolean "$result = $1 ? SCM_BOOL_T : SCM_BOOL_F;"
-// End of temporary typemaps.
+%import "base-typemaps.i"
/* Parse the header file to generate wrappers */
%include <dialog-progress.h>
Modified: gnucash/trunk/src/gnome-utils/Makefile.am
===================================================================
--- gnucash/trunk/src/gnome-utils/Makefile.am 2006-10-16 01:28:08 UTC (rev 15025)
+++ gnucash/trunk/src/gnome-utils/Makefile.am 2006-10-16 03:35:56 UTC (rev 15026)
@@ -189,9 +189,9 @@
${LIBXML2_LIBS}
if BUILDING_FROM_SVN
-swig-gnome-utils.c: gnome-utils.i ${noinst_HEADERS} ${gncinclude_HEADERS}
+swig-gnome-utils.c: gnome-utils.i gnc-html.h print-session.h
$(SWIG) -guile $(SWIG_ARGS) -Linkage module \
- -I${top_srcdir}/src/engine -o $@ $<
+ -I${top_srcdir}/src -o $@ $<
endif
gncmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash
Modified: gnucash/trunk/src/gnome-utils/gnome-utils.i
===================================================================
--- gnucash/trunk/src/gnome-utils/gnome-utils.i 2006-10-16 01:28:08 UTC (rev 15025)
+++ gnucash/trunk/src/gnome-utils/gnome-utils.i 2006-10-16 03:35:56 UTC (rev 15026)
@@ -9,7 +9,6 @@
#include <gnc-amount-edit.h>
#include <gnc-date-edit.h>
#include <gnc-file.h>
-//#include <gnc-gconf-utils.h>
#include <gnc-gnome-utils.h>
#include <gnc-gui-query.h>
#include <gnc-html.h>
@@ -24,18 +23,11 @@
SCM scm_init_sw_gnome_utils_module (void);
%}
-// Temporary SWIG<->G-wrap converters for engine types
-%typemap(in) gboolean "$1 = SCM_NFALSEP($input) ? TRUE : FALSE;"
-%typemap(out) gboolean "$result = $1 ? SCM_BOOL_T : SCM_BOOL_F;"
+%import "base-typemaps.i"
-// End of temporary typemaps.
-typedef char * URLType;
-typedef char gchar;
-
-//%include "gnc-main-window.h"
+/* Parse the header file to generate wrappers */
%include "gnc-html.h"
-/* Parse the header file to generate wrappers */
GNCOptionWin * gnc_options_dialog_new(gchar *title);
void gnc_options_dialog_destroy(GNCOptionWin * win);
@@ -60,11 +52,7 @@
gnc_info_dialog(GtkWidget *parent,
const char *format, ...);
-
void gnc_add_scm_extension (SCM extension);
-//char * gnc_html_encode_string(const char * str);
-//char * gnc_build_url (const gchar * type, const gchar * location,
-// const gchar * label);
void gnc_set_busy_cursor (GtkWidget *w, gboolean update_now);
void gnc_unset_busy_cursor (GtkWidget *w);
Modified: gnucash/trunk/src/report/report-gnome/Makefile.am
===================================================================
--- gnucash/trunk/src/report/report-gnome/Makefile.am 2006-10-16 01:28:08 UTC (rev 15025)
+++ gnucash/trunk/src/report/report-gnome/Makefile.am 2006-10-16 03:35:56 UTC (rev 15026)
@@ -51,9 +51,9 @@
${GLIB_LIBS}
if BUILDING_FROM_SVN
-swig-report-gnome.c: report-gnome.i ${gncinclude_HEADERS}
+swig-report-gnome.c: report-gnome.i
$(SWIG) -guile $(SWIG_ARGS) -Linkage module \
- -I${top_srcdir}/src/engine -o $@ $<
+ -I${top_srcdir}/src -o $@ $<
endif
gncmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash/report
Modified: gnucash/trunk/src/report/report-gnome/report-gnome.i
===================================================================
--- gnucash/trunk/src/report/report-gnome/report-gnome.i 2006-10-16 01:28:08 UTC (rev 15025)
+++ gnucash/trunk/src/report/report-gnome/report-gnome.i 2006-10-16 03:35:56 UTC (rev 15026)
@@ -10,6 +10,8 @@
SCM scm_init_sw_report_gnome_module (void);
%}
+%import "base-typemaps.i"
+
void gnc_report_raise_editor(SCM report);
void gnc_main_window_open_report(int report_id, GncMainWindow *window);
GtkWidget * gnc_report_window_default_params_editor(SCM options, SCM report);
Modified: gnucash/trunk/src/report/report-system/Makefile.am
===================================================================
--- gnucash/trunk/src/report/report-system/Makefile.am 2006-10-16 01:28:08 UTC (rev 15025)
+++ gnucash/trunk/src/report/report-system/Makefile.am 2006-10-16 03:35:56 UTC (rev 15026)
@@ -18,8 +18,9 @@
${GLIB_LIBS}
if BUILDING_FROM_SVN
-swig-report-system.c: report-system.i ${gncinclude_HEADERS}
- $(SWIG) -guile $(SWIG_ARGS) -Linkage module -o $@ $<
+swig-report-system.c: report-system.i
+ $(SWIG) -guile $(SWIG_ARGS) -Linkage module \
+ -I${top_srcdir}/src -o $@ $<
endif
AM_CFLAGS = \
Modified: gnucash/trunk/src/report/report-system/report-system.i
===================================================================
--- gnucash/trunk/src/report/report-system/report-system.i 2006-10-16 01:28:08 UTC (rev 15025)
+++ gnucash/trunk/src/report/report-system/report-system.i 2006-10-16 03:35:56 UTC (rev 15026)
@@ -7,7 +7,7 @@
SCM scm_init_sw_report_system_module (void);
%}
-typedef int gint;
+%import "base-typemaps.i"
SCM gnc_report_find(gint id);
gint gnc_report_add(SCM report);
More information about the gnucash-changes
mailing list