From da572687e3baa21035d4e4ba75f31cfa4e06c91e Mon Sep 17 00:00:00 2001 From: Dave Peticolas Date: Tue, 12 Sep 2000 21:32:50 +0000 Subject: [PATCH] Temporary fix for gnc-prices. Add swig conversion for gboolean. git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@2835 57a11ea4-9604-0410-9ed3-97b8803252fd --- src/engine/date.h | 2 +- src/optional/swig/Makefile.am | 12 +++-- src/optional/swig/Makefile.in | 51 ++++++++++++++++------ src/optional/swig/perl5_swig_annotations.i | 10 +++++ src/quotes/gnc-prices.in | 4 +- 5 files changed, 60 insertions(+), 19 deletions(-) diff --git a/src/engine/date.h b/src/engine/date.h index 9508c7342d..a0a2fe16f4 100644 --- a/src/engine/date.h +++ b/src/engine/date.h @@ -112,7 +112,7 @@ const char * gnc_print_date(Timespec ts); * * Globals: global dateFormat value */ -void scanDate (const char *buff, int *day, int *monty, int *year); +void scanDate (const char *buff, int *day, int *month, int *year); /** * dateSeparator diff --git a/src/optional/swig/Makefile.am b/src/optional/swig/Makefile.am index 45d9bfbd88..87ff66aea5 100644 --- a/src/optional/swig/Makefile.am +++ b/src/optional/swig/Makefile.am @@ -1,4 +1,8 @@ +docdir = ${GNC_DOC_INSTALL_DIR} +doc_DATA = \ + gnucash.engine_wrap.doc + perlsharedir = ${GNC_SHAREDIR}/perl perlshare_DATA = gnucash.pm @@ -80,7 +84,7 @@ install-data-local: libgncswig.la uninstall-local: rm -f ${DESTDIR}${perllibdir}/gnucash.so -gnucash.engine.i: ${SWIG_INPUT_HDRS} perl5_swig_annotations.i +gnucash.engine.i: ${SWIG_INPUT_HDRS} perl5_swig_annotations.i @echo Making $@. @echo "%module gnucash" > $@ @echo "%include perl5_swig_annotations.i" >> $@ @@ -95,11 +99,11 @@ gnucash.engine.i: ${SWIG_INPUT_HDRS} perl5_swig_annotations.i echo "%include `basename $$file`" >> $@; \ done -CLEANFILES += gnucash.engine.i gnucash.engine_wrap.doc +CLEANFILES += gnucash.engine.i -gnucash-engine-perl5_wrap_int.c: gnucash.engine.i +gnucash.engine_wrap.doc gnucash-engine-perl5_wrap_int.c: gnucash.engine.i ${SWIG} -perl5 -I.. -I${top_srcdir}/src/engine -o $@ $< -CLEANFILES += gnucash-engine-perl5_wrap_int.c +CLEANFILES += gnucash.engine_wrap.doc gnucash-engine-perl5_wrap_int.c gnucash-engine-perl5_wrap.c: gnucash-swig-defines.c \ gnucash-engine-perl5_wrap_int.c diff --git a/src/optional/swig/Makefile.in b/src/optional/swig/Makefile.in index 4b62a48eb7..f6899f379f 100644 --- a/src/optional/swig/Makefile.in +++ b/src/optional/swig/Makefile.in @@ -116,6 +116,10 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ l = @l@ +docdir = ${GNC_DOC_INSTALL_DIR} +doc_DATA = gnucash.engine_wrap.doc + + perlsharedir = ${GNC_SHAREDIR}/perl perlshare_DATA = gnucash.pm @@ -177,7 +181,7 @@ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CF LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ -DATA = $(perlshare_DATA) +DATA = $(doc_DATA) $(perlshare_DATA) HEADERS = $(noinst_HEADERS) @@ -263,6 +267,25 @@ maintainer-clean-libtool: libgncswig.la: $(libgncswig_la_OBJECTS) $(libgncswig_la_DEPENDENCIES) $(LINK) -rpath $(perllibdir) $(libgncswig_la_LDFLAGS) $(libgncswig_la_OBJECTS) $(libgncswig_la_LIBADD) $(LIBS) +install-docDATA: $(doc_DATA) + @$(NORMAL_INSTALL) + $(mkinstalldirs) $(DESTDIR)$(docdir) + @list='$(doc_DATA)'; for p in $$list; do \ + if test -f $(srcdir)/$$p; then \ + echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(docdir)/$$p"; \ + $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(docdir)/$$p; \ + else if test -f $$p; then \ + echo " $(INSTALL_DATA) $$p $(DESTDIR)$(docdir)/$$p"; \ + $(INSTALL_DATA) $$p $(DESTDIR)$(docdir)/$$p; \ + fi; fi; \ + done + +uninstall-docDATA: + @$(NORMAL_UNINSTALL) + list='$(doc_DATA)'; for p in $$list; do \ + rm -f $(DESTDIR)$(docdir)/$$p; \ + done + install-perlshareDATA: $(perlshare_DATA) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(perlsharedir) @@ -376,22 +399,23 @@ installcheck: installcheck-am install-exec-am: install-exec: install-exec-am -install-data-am: install-perllibLTLIBRARIES install-perlshareDATA \ - install-data-local +install-data-am: install-perllibLTLIBRARIES install-docDATA \ + install-perlshareDATA install-data-local install-data: install-data-am install-am: all-am @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am install: install-am -uninstall-am: uninstall-perllibLTLIBRARIES uninstall-perlshareDATA \ - uninstall-local +uninstall-am: uninstall-perllibLTLIBRARIES uninstall-docDATA \ + uninstall-perlshareDATA uninstall-local uninstall: uninstall-am all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS) all-redirect: all-am install-strip: $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: - $(mkinstalldirs) $(DESTDIR)$(perllibdir) $(DESTDIR)$(perlsharedir) + $(mkinstalldirs) $(DESTDIR)$(perllibdir) $(DESTDIR)$(docdir) \ + $(DESTDIR)$(perlsharedir) mostlyclean-generic: @@ -436,11 +460,12 @@ clean-perllibLTLIBRARIES maintainer-clean-perllibLTLIBRARIES \ uninstall-perllibLTLIBRARIES install-perllibLTLIBRARIES \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile mostlyclean-libtool distclean-libtool \ -clean-libtool maintainer-clean-libtool uninstall-perlshareDATA \ -install-perlshareDATA tags mostlyclean-tags distclean-tags clean-tags \ -maintainer-clean-tags distdir mostlyclean-depend distclean-depend \ -clean-depend maintainer-clean-depend info-am info dvi-am dvi check \ -check-am installcheck-am installcheck install-exec-am install-exec \ +clean-libtool maintainer-clean-libtool uninstall-docDATA \ +install-docDATA uninstall-perlshareDATA install-perlshareDATA tags \ +mostlyclean-tags distclean-tags clean-tags maintainer-clean-tags \ +distdir mostlyclean-depend distclean-depend clean-depend \ +maintainer-clean-depend info-am info dvi-am dvi check check-am \ +installcheck-am installcheck install-exec-am install-exec \ install-data-local install-data-am install-data install-am install \ uninstall-local uninstall-am uninstall all-redirect all-am all \ installdirs mostlyclean-generic distclean-generic clean-generic \ @@ -462,7 +487,7 @@ install-data-local: libgncswig.la uninstall-local: rm -f ${DESTDIR}${perllibdir}/gnucash.so -gnucash.engine.i: ${SWIG_INPUT_HDRS} perl5_swig_annotations.i +gnucash.engine.i: ${SWIG_INPUT_HDRS} perl5_swig_annotations.i @echo Making $@. @echo "%module gnucash" > $@ @echo "%include perl5_swig_annotations.i" >> $@ @@ -477,7 +502,7 @@ gnucash.engine.i: ${SWIG_INPUT_HDRS} perl5_swig_annotations.i echo "%include `basename $$file`" >> $@; \ done -gnucash-engine-perl5_wrap_int.c: gnucash.engine.i +gnucash.engine_wrap.doc gnucash-engine-perl5_wrap_int.c: gnucash.engine.i ${SWIG} -perl5 -I.. -I${top_srcdir}/src/engine -o $@ $< gnucash-engine-perl5_wrap.c: gnucash-swig-defines.c \ diff --git a/src/optional/swig/perl5_swig_annotations.i b/src/optional/swig/perl5_swig_annotations.i index 47a99820d3..aa1938be9a 100644 --- a/src/optional/swig/perl5_swig_annotations.i +++ b/src/optional/swig/perl5_swig_annotations.i @@ -39,6 +39,16 @@ // printf ("Info: time_t input arg is %ld \n", * ($target)); } +/* Convert gboolean values */ +%typemap(perl5, in) gboolean *(gboolean temp) { + temp = (gboolean) SvIV($source); + $target = &temp; +} + +%typemap(perl5, out) gboolean { + $target = newSViv ((IV) *($source)); +} + /* --------------------------------------------------------- */ #ifdef DOESNT_WORK_DONT_KNOW_WHY diff --git a/src/quotes/gnc-prices.in b/src/quotes/gnc-prices.in index 73aed4526c..4181caccb0 100644 --- a/src/quotes/gnc-prices.in +++ b/src/quotes/gnc-prices.in @@ -109,7 +109,9 @@ sub setprice $trans = gnucash::xaccMallocTransaction(); gnucash::xaccTransBeginEdit ($trans, 1); gnucash::xaccTransSetDescription ($trans, "Price"); - gnucash::xaccTransSetDateStr ($trans,$dayte); + + # Temporary hack until we get rid of this file + gnucash::xaccTransSetDateToday ($trans); $split = gnucash::xaccTransGetSplit ($trans, 0); gnucash::xaccSplitSetSharePriceAndAmount ($split, $price, 0.0);