[sword-cvs] sword/tests Makefile.in,1.22,1.23 filtertest.cpp,1.16,1.17
sword@www.crosswire.org
sword@www.crosswire.org
Wed, 30 Apr 2003 13:45:23 -0700
Update of /usr/local/cvsroot/sword/tests
In directory www:/tmp/cvs-serv10422/tests
Modified Files:
Makefile.in filtertest.cpp
Log Message:
Index: Makefile.in
===================================================================
RCS file: /usr/local/cvsroot/sword/tests/Makefile.in,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** Makefile.in 27 Feb 2003 23:34:22 -0000 1.22
--- Makefile.in 30 Apr 2003 20:45:18 -0000 1.23
***************
*** 1,6 ****
! # Makefile.in generated by automake 1.7.3 from Makefile.am.
# @configure_input@
! # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
# Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
--- 1,6 ----
! # Makefile.in generated by automake 1.6.3 from Makefile.am.
# @configure_input@
! # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
# Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
***************
*** 14,21 ****
--- 14,37 ----
@SET_MAKE@
+ SHELL = @SHELL@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
+
+ bindir = @bindir@
+ sbindir = @sbindir@
+ libexecdir = @libexecdir@
+ datadir = @datadir@
+ sysconfdir = @sysconfdir@
+ sharedstatedir = @sharedstatedir@
+ localstatedir = @localstatedir@
+ libdir = @libdir@
+ infodir = @infodir@
+ mandir = @mandir@
+ includedir = @includedir@
+ oldincludedir = /usr/include
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
***************
*** 23,33 ****
top_builddir = ..
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
INSTALL_HEADER = $(INSTALL_DATA)
! transform = $(program_transform_name)
NORMAL_INSTALL = :
PRE_INSTALL = :
--- 39,57 ----
top_builddir = ..
+ ACLOCAL = @ACLOCAL@
+ AUTOCONF = @AUTOCONF@
+ AUTOMAKE = @AUTOMAKE@
+ AUTOHEADER = @AUTOHEADER@
+
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_DATA = @INSTALL_DATA@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_HEADER = $(INSTALL_DATA)
! transform = @program_transform_name@
NORMAL_INSTALL = :
PRE_INSTALL = :
***************
*** 36,161 ****
PRE_UNINSTALL = :
POST_UNINSTALL = :
host_triplet = @host@
! ACLOCAL = @ACLOCAL@
! AMDEP_FALSE = @AMDEP_FALSE@
! AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
! AUTOCONF = @AUTOCONF@
! AUTOHEADER = @AUTOHEADER@
! AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
- BUILDEXAMPLES_FALSE = @BUILDEXAMPLES_FALSE@
- BUILDEXAMPLES_TRUE = @BUILDEXAMPLES_TRUE@
- BUILDTESTS_FALSE = @BUILDTESTS_FALSE@
- BUILDTESTS_TRUE = @BUILDTESTS_TRUE@
- BUILDUTILS_FALSE = @BUILDUTILS_FALSE@
- BUILDUTILS_TRUE = @BUILDUTILS_TRUE@
CC = @CC@
- CCDEPMODE = @CCDEPMODE@
- CFLAGS = @CFLAGS@
- CONFDEF_FALSE = @CONFDEF_FALSE@
- CONFDEF_TRUE = @CONFDEF_TRUE@
- CPPFLAGS = @CPPFLAGS@
CURL_CFLAGS = @CURL_CFLAGS@
CURL_CONFIG = @CURL_CONFIG@
CURL_LIBS = @CURL_LIBS@
CXX = @CXX@
- CXXCPP = @CXXCPP@
- CXXDEPMODE = @CXXDEPMODE@
- CXXFLAGS = @CXXFLAGS@
- CYGPATH_W = @CYGPATH_W@
- DEFS = @DEFS@
DEPDIR = @DEPDIR@
ECHO = @ECHO@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
GENCCODE = @GENCCODE@
GENCMN = @GENCMN@
GENRB = @GENRB@
- ICUSWORD_FALSE = @ICUSWORD_FALSE@
- ICUSWORD_TRUE = @ICUSWORD_TRUE@
- ICU_FALSE = @ICU_FALSE@
- ICU_TRUE = @ICU_TRUE@
- INSTALLMGR_FALSE = @INSTALLMGR_FALSE@
- INSTALLMGR_TRUE = @INSTALLMGR_TRUE@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTCONF_FALSE = @INSTCONF_FALSE@
- INSTCONF_TRUE = @INSTCONF_TRUE@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
! MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
! MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
! MAKEINFO = @MAKEINFO@
! MINGW_FALSE = @MINGW_FALSE@
! MINGW_TRUE = @MINGW_TRUE@
! OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
- PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
- PACKAGE_NAME = @PACKAGE_NAME@
- PACKAGE_STRING = @PACKAGE_STRING@
- PACKAGE_TARNAME = @PACKAGE_TARNAME@
- PACKAGE_VERSION = @PACKAGE_VERSION@
- PATH_SEPARATOR = @PATH_SEPARATOR@
PKGDATA = @PKGDATA@
RANLIB = @RANLIB@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
- ZLIB_FALSE = @ZLIB_FALSE@
- ZLIB_TRUE = @ZLIB_TRUE@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_RANLIB = @ac_ct_RANLIB@
- ac_ct_STRIP = @ac_ct_STRIP@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
- am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
- am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
- am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
am__include = @am__include@
- am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
- bindir = @bindir@
- build = @build@
- build_alias = @build_alias@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- datadir = @datadir@
dir_confdef = @dir_confdef@
enable_debug = @enable_debug@
enable_profile = @enable_profile@
- exec_prefix = @exec_prefix@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
- includedir = @includedir@
- infodir = @infodir@
install_sh = @install_sh@
- libdir = @libdir@
- libexecdir = @libexecdir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- oldincludedir = @oldincludedir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
target_cpu = @target_cpu@
target_mingw32 = @target_mingw32@
--- 60,99 ----
PRE_UNINSTALL = :
POST_UNINSTALL = :
+ host_alias = @host_alias@
host_triplet = @host@
!
! EXEEXT = @EXEEXT@
! OBJEXT = @OBJEXT@
! PATH_SEPARATOR = @PATH_SEPARATOR@
AMTAR = @AMTAR@
! AS = @AS@
AWK = @AWK@
CC = @CC@
CURL_CFLAGS = @CURL_CFLAGS@
CURL_CONFIG = @CURL_CONFIG@
CURL_LIBS = @CURL_LIBS@
CXX = @CXX@
DEPDIR = @DEPDIR@
+ DLLTOOL = @DLLTOOL@
ECHO = @ECHO@
GENCCODE = @GENCCODE@
GENCMN = @GENCMN@
GENRB = @GENRB@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
MAINT = @MAINT@
! OBJDUMP = @OBJDUMP@
PACKAGE = @PACKAGE@
PKGDATA = @PKGDATA@
RANLIB = @RANLIB@
STRIP = @STRIP@
VERSION = @VERSION@
am__include = @am__include@
am__quote = @am__quote@
dir_confdef = @dir_confdef@
enable_debug = @enable_debug@
enable_profile = @enable_profile@
install_sh = @install_sh@
target_cpu = @target_cpu@
target_mingw32 = @target_mingw32@
***************
*** 183,189 ****
@ICU_TRUE@tlitmgrtest_SOURCES = tlitmgrtest.cpp
@ICU_TRUE@tlitmgrtest_LDADD = -lustdio
- @ZLIB_FALSE@ZLIBPROG =
@ZLIB_TRUE@ZLIBPROG = compzip
@ZLIB_TRUE@compzip_SOURCES = compzip.cpp
--- 121,127 ----
@ICU_TRUE@tlitmgrtest_SOURCES = tlitmgrtest.cpp
@ICU_TRUE@tlitmgrtest_LDADD = -lustdio
@ZLIB_TRUE@ZLIBPROG = compzip
+ @ZLIB_FALSE@ZLIBPROG =
@ZLIB_TRUE@compzip_SOURCES = compzip.cpp
***************
*** 283,287 ****
compnone_DEPENDENCIES =
compnone_LDFLAGS =
- am__compzip_SOURCES_DIST = compzip.cpp
@ZLIB_TRUE@am_compzip_OBJECTS = compzip.$(OBJEXT)
compzip_OBJECTS = $(am_compzip_OBJECTS)
--- 221,224 ----
***************
*** 304,308 ****
genbooktest_DEPENDENCIES =
genbooktest_LDFLAGS =
- am__icutest_SOURCES_DIST = icutest.cpp
@ICU_TRUE@am_icutest_OBJECTS = icutest.$(OBJEXT)
icutest_OBJECTS = $(am_icutest_OBJECTS)
--- 241,244 ----
***************
*** 385,389 ****
testblocks_DEPENDENCIES =
testblocks_LDFLAGS =
- am__tlitmgrtest_SOURCES_DIST = tlitmgrtest.cpp
@ICU_TRUE@am_tlitmgrtest_OBJECTS = tlitmgrtest.$(OBJEXT)
tlitmgrtest_OBJECTS = $(am_tlitmgrtest_OBJECTS)
--- 321,324 ----
***************
*** 391,395 ****
@ICU_FALSE@tlitmgrtest_DEPENDENCIES =
tlitmgrtest_LDFLAGS =
- am__translittest_SOURCES_DIST = translittest.cpp
@ICU_TRUE@am_translittest_OBJECTS = translittest.$(OBJEXT)
translittest_OBJECTS = $(am_translittest_OBJECTS)
--- 326,329 ----
***************
*** 403,407 ****
--- 337,345 ----
treeidxtest_LDFLAGS =
+ DEFS = @DEFS@
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+ CPPFLAGS = @CPPFLAGS@
+ LDFLAGS = @LDFLAGS@
+ LIBS = @LIBS@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
***************
*** 429,436 ****
CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
DIST_SOURCES = $(casttest_SOURCES) $(complzss_SOURCES) \
! $(compnone_SOURCES) $(am__compzip_SOURCES_DIST) \
! $(configtest_SOURCES) $(filtertest_SOURCES) \
! $(genbooktest_SOURCES) $(am__icutest_SOURCES_DIST) \
$(indextest_SOURCES) $(introtest_SOURCES) $(keycast_SOURCES) \
$(keytest_SOURCES) $(lextest_SOURCES) $(listtest_SOURCES) \
--- 367,374 ----
CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
+ CXXFLAGS = @CXXFLAGS@
DIST_SOURCES = $(casttest_SOURCES) $(complzss_SOURCES) \
! $(compnone_SOURCES) $(compzip_SOURCES) $(configtest_SOURCES) \
! $(filtertest_SOURCES) $(genbooktest_SOURCES) $(icutest_SOURCES) \
$(indextest_SOURCES) $(introtest_SOURCES) $(keycast_SOURCES) \
$(keytest_SOURCES) $(lextest_SOURCES) $(listtest_SOURCES) \
***************
*** 438,443 ****
$(parsekey_SOURCES) $(rawldidxtest_SOURCES) \
$(romantest_SOURCES) $(swaptest_SOURCES) $(swbuftest_SOURCES) \
! $(testblocks_SOURCES) $(am__tlitmgrtest_SOURCES_DIST) \
! $(am__translittest_SOURCES_DIST) $(treeidxtest_SOURCES)
DIST_COMMON = Makefile.am Makefile.in
SOURCES = $(casttest_SOURCES) $(complzss_SOURCES) $(compnone_SOURCES) $(compzip_SOURCES) $(configtest_SOURCES) $(filtertest_SOURCES) $(genbooktest_SOURCES) $(icutest_SOURCES) $(indextest_SOURCES) $(introtest_SOURCES) $(keycast_SOURCES) $(keytest_SOURCES) $(lextest_SOURCES) $(listtest_SOURCES) $(localetest_SOURCES) $(mgrtest_SOURCES) $(modtest_SOURCES) $(parsekey_SOURCES) $(rawldidxtest_SOURCES) $(romantest_SOURCES) $(swaptest_SOURCES) $(swbuftest_SOURCES) $(testblocks_SOURCES) $(tlitmgrtest_SOURCES) $(translittest_SOURCES) $(treeidxtest_SOURCES)
--- 376,381 ----
$(parsekey_SOURCES) $(rawldidxtest_SOURCES) \
$(romantest_SOURCES) $(swaptest_SOURCES) $(swbuftest_SOURCES) \
! $(testblocks_SOURCES) $(tlitmgrtest_SOURCES) \
! $(translittest_SOURCES) $(treeidxtest_SOURCES)
DIST_COMMON = Makefile.am Makefile.in
SOURCES = $(casttest_SOURCES) $(complzss_SOURCES) $(compnone_SOURCES) $(compzip_SOURCES) $(configtest_SOURCES) $(filtertest_SOURCES) $(genbooktest_SOURCES) $(icutest_SOURCES) $(indextest_SOURCES) $(introtest_SOURCES) $(keycast_SOURCES) $(keytest_SOURCES) $(lextest_SOURCES) $(listtest_SOURCES) $(localetest_SOURCES) $(mgrtest_SOURCES) $(modtest_SOURCES) $(parsekey_SOURCES) $(rawldidxtest_SOURCES) $(romantest_SOURCES) $(swaptest_SOURCES) $(swbuftest_SOURCES) $(testblocks_SOURCES) $(tlitmgrtest_SOURCES) $(translittest_SOURCES) $(treeidxtest_SOURCES)
***************
*** 449,453 ****
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
cd $(top_srcdir) && \
! $(AUTOMAKE) --foreign tests/Makefile
Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
--- 387,391 ----
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
cd $(top_srcdir) && \
! $(AUTOMAKE) --gnu tests/Makefile
Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
***************
*** 575,609 ****
.cpp.o:
! @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
! @am__fastdepCXX_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
! @am__fastdepCXX_TRUE@ then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
! @am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
! @am__fastdepCXX_TRUE@ fi
! @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
! @AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
! @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
! @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
.cpp.obj:
! @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
! @am__fastdepCXX_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
! @am__fastdepCXX_TRUE@ then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
! @am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
! @am__fastdepCXX_TRUE@ fi
! @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
! @AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
! @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
! @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
.cpp.lo:
! @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
! @am__fastdepCXX_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
! @am__fastdepCXX_TRUE@ then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
! @am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
! @am__fastdepCXX_TRUE@ fi
! @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
! @AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
! @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
! @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
mostlyclean-libtool:
--- 513,533 ----
.cpp.o:
! @AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
! @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
! @AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
! $(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
.cpp.obj:
! @AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
! @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
! @AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
! $(CXXCOMPILE) -c -o $@ `cygpath -w $<`
.cpp.lo:
! @AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
! @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
! @AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
! $(LTCXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
! CXXDEPMODE = @CXXDEPMODE@
mostlyclean-libtool:
***************
*** 620,626 ****
ETAGSFLAGS =
- CTAGS = ctags
- CTAGSFLAGS =
-
tags: TAGS
--- 544,547 ----
***************
*** 648,666 ****
$$tags $$unique
- ctags: CTAGS
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
-
GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
--- 569,572 ----
***************
*** 669,673 ****
distclean-tags:
! -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--- 575,579 ----
distclean-tags:
! -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
***************
*** 676,686 ****
distdir: $(DISTFILES)
! @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
! topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
! list='$(DISTFILES)'; for file in $$list; do \
! case $$file in \
! $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
! $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
! esac; \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
--- 582,586 ----
distdir: $(DISTFILES)
! @list='$(DISTFILES)'; for file in $$list; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
***************
*** 769,793 ****
mostlyclean-libtool
- pdf: pdf-am
-
- pdf-am:
-
- ps: ps-am
-
- ps-am:
-
uninstall-am: uninstall-info-am
! .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
! clean-libtool clean-noinstPROGRAMS ctags distclean \
! distclean-compile distclean-depend distclean-generic \
! distclean-libtool distclean-tags distdir dvi dvi-am info \
! info-am install install-am install-data install-data-am \
! install-exec install-exec-am install-info install-info-am \
! install-man install-strip installcheck installcheck-am \
! installdirs maintainer-clean maintainer-clean-generic \
! mostlyclean mostlyclean-compile mostlyclean-generic \
! mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
! uninstall-am uninstall-info-am
# Tell versions [3.59,3.63) of GNU make to not export all variables.
--- 669,684 ----
mostlyclean-libtool
uninstall-am: uninstall-info-am
! .PHONY: GTAGS all all-am check check-am clean clean-generic \
! clean-libtool clean-noinstPROGRAMS distclean distclean-compile \
! distclean-depend distclean-generic distclean-libtool \
! distclean-tags distdir dvi dvi-am info info-am install \
! install-am install-data install-data-am install-exec \
! install-exec-am install-info install-info-am install-man \
! install-strip installcheck installcheck-am installdirs \
! maintainer-clean maintainer-clean-generic mostlyclean \
! mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
! tags uninstall uninstall-am uninstall-info-am
# Tell versions [3.59,3.63) of GNU make to not export all variables.
Index: filtertest.cpp
===================================================================
RCS file: /usr/local/cvsroot/sword/tests/filtertest.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** filtertest.cpp 20 Feb 2003 03:12:37 -0000 1.16
--- filtertest.cpp 30 Apr 2003 20:45:18 -0000 1.17
***************
*** 1,4 ****
--- 1,15 ----
+ #ifndef __GNUC__
+ #include <io.h>
+ #else
+ #include <unistd.h>
+ #endif
+ #ifndef O_BINARY
+ #define O_BINARY 0
+ #endif
+ #include <fcntl.h>
+ #include <errno.h>
#include <iostream>
#include <thmlhtmlhref.h>
+ #include <unicodertf.h>
#include <thmlosis.h>
#include <gbfosis.h>
***************
*** 13,17 ****
--- 24,71 ----
#define MAXBUF 30000
+ char readline(int fd, char **buf) {
+ char ch;
+ if (*buf)
+ delete [] *buf;
+ *buf = 0;
+ int len;
+
+
+ long index = lseek(fd, 0, SEEK_CUR);
+ // clean up any preceding white space
+ while ((len = read(fd, &ch, 1)) == 1) {
+ if ((ch != 13) && (ch != ' ') && (ch != '\t'))
+ break;
+ else index++;
+ }
+
+
+ while (ch != 10) {
+ if ((len = read(fd, &ch, 1)) != 1)
+ break;
+ }
+
+ int size = (lseek(fd, 0, SEEK_CUR) - index) - 1;
+
+ *buf = new char [ size + 1 ];
+
+ if (size > 0) {
+ lseek(fd, index, SEEK_SET);
+ read(fd, *buf, size);
+ read(fd, &ch, 1); //pop terminating char
+ (*buf)[size] = 0;
+
+ // clean up any trailing junk on buf
+ for (char *it = *buf+(strlen(*buf)-1); it > *buf; it--) {
+ if ((*it != 10) && (*it != 13) && (*it != ' ') && (*it != '\t'))
+ break;
+ else *it = 0;
+ }
+ }
+ else **buf = 0;
+ return !len;
+ }
int main(int argc, char **argv) {
+ /*
SWMgr mgr(0, 0, true, new MarkupFilterMgr(FMT_HTMLHREF, ENC_RTF));
mgr.setGlobalOption("Strong's Numbers", "on");
***************
*** 20,26 ****
if (!module)
module = mgr.Modules.begin()->second;
//ThMLOSIS filter;
! module->Key() = ((argc > 1) ? argv[1] : "john 1:1");
/*
char *buf = new char [ MAXBUF ];
--- 74,93 ----
if (!module)
module = mgr.Modules.begin()->second;
+ */
//ThMLOSIS filter;
! int fd = open(argv[1], O_RDONLY|O_BINARY);
! if (fd < 0) {
! fprintf(stderr, "error: %s: couldn't open input file: %s \n", argv[0], argv[2]);
! exit(-2);
! }
! UnicodeRTF filter;
! char *buffer = 0;
! while (!readline(fd, &buffer)) {
! SWBuf buf = buffer;
! filter.processText(buf);
! cout << buf << "\n";
! }
! // module->Key() = ((argc > 1) ? argv[1] : "john 1:1");
/*
char *buf = new char [ MAXBUF ];
***************
*** 34,40 ****
std::cout << buf << "\n\n+++++++\n";
delete [] buf;
- */
cout << module->Name() << " : " << module->KeyText() << "\n";
cout << module->RenderText() << "\n";
return 0;
}
--- 101,107 ----
std::cout << buf << "\n\n+++++++\n";
delete [] buf;
cout << module->Name() << " : " << module->KeyText() << "\n";
cout << module->RenderText() << "\n";
+ */
return 0;
}