Hi,
With this cumulative patch (relative to aspell-0.60.5 only, not
the CVS head or branch head), I'm able to run "make distcheck" to check
distribution/packaging on aspell.
Patch breakdown:
Makefile.am: In addition to $(srcdir) references for VPATH building
(mentioned in previous thread), I've expanded wildcards in
EXTRA_DIST names to facilitate distcheck-ing.
common/string_map.cpp: explicit template instantiation of ::erase()
Guarantees symbol generation with more inline optimizations.
manual/oo-only.texi: as noted on the branch, this file was missing
from the distribution, preventing info regeneration during
dist building. This is the same as the copy at the tip of
the branch. (-r 1.1.2.1)
manual/Makefile.am:
Added oo-only.texi. Looks like branch also contains this already.
Again, I omitted Makefile.in and oo-only.info to let the developers
regenerate them automatically. The last two sections are probably not
needed for those already on the tip of the release branch in CVS.
Hope this is of some use.
And thanks for working on aspell.
Over and out.
Fang
David Fang
Computer Systems Laboratory
Electrical & Computer Engineering
Cornell University
http://www.csl.cornell.edu/~fang/
-- (2400 baud? Netscape 3.0?? lynx??? No problem!)
diff -u -r -N aspell-0.60.5/Makefile.am aspell-0.60.5-patched/Makefile.am
--- aspell-0.60.5/Makefile.am 2006-12-10 22:36:41.000000000 -0500
+++ aspell-0.60.5-patched/Makefile.am 2007-01-06 15:03:48.000000000 -0500
@@ -12,7 +12,7 @@
PERLPROG = @PERLPROG@
-AM_CPPFLAGS = -I${srcdir}/gen -I${srcdir}/common \
+AM_CPPFLAGS = -Igen -I${srcdir}/common \
-I${srcdir}/interfaces/cc/ -I${srcdir}/modules/speller/default/
SUFFIXES = .info
@@ -112,9 +112,95 @@
endif
-EXTRA_DIST += common/*.hpp common/*.h\
- modules/speller/default/*.hpp\
- lib/*.hpp
+# expanded below:
+# EXTRA_DIST += common/*.hpp common/*.h\
+# modules/speller/default/*.hpp\
+# lib/*.hpp
+
+EXTRA_DIST += \
+ common/gettext.h \
+ common/asc_ctype.hpp \
+ common/basic_list.hpp \
+ common/block_slist-t.hpp \
+ common/block_slist.hpp \
+ common/cache-t.hpp \
+ common/cache.hpp \
+ common/can_have_error.hpp \
+ common/char_vector.hpp \
+ common/clone_ptr-t.hpp \
+ common/clone_ptr.hpp \
+ common/config.hpp \
+ common/convert.hpp \
+ common/copy_ptr.hpp \
+ common/document_checker.hpp \
+ common/enumeration.hpp \
+ common/error.hpp \
+ common/errors.hpp \
+ common/file_data_util.hpp \
+ common/file_util.hpp \
+ common/filter.hpp \
+ common/filter_char.hpp \
+ common/filter_char_vector.hpp \
+ common/filter_debug.hpp \
+ common/fstream.hpp \
+ common/generic_copy_ptr-t.hpp \
+ common/generic_copy_ptr.hpp \
+ common/getdata.hpp \
+ common/hash-t.hpp \
+ common/hash.hpp \
+ common/hash_fun.hpp \
+ common/indiv_filter.hpp \
+ common/info.hpp \
+ common/iostream.hpp \
+ common/istream.hpp \
+ common/itemize.hpp \
+ common/key_info.hpp \
+ common/lock.hpp \
+ common/lsort.hpp \
+ common/mutable_container.hpp \
+ common/mutable_string.hpp \
+ common/objstack.hpp \
+ common/ostream.hpp \
+ common/parm_string.hpp \
+ common/posib_err.hpp \
+ common/simple_string.hpp \
+ common/speller.hpp \
+ common/stack_ptr.hpp \
+ common/string.hpp \
+ common/string_enumeration.hpp \
+ common/string_list.hpp \
+ common/string_map.hpp \
+ common/string_pair.hpp \
+ common/string_pair_enumeration.hpp \
+ common/strtonum.hpp \
+ common/tokenizer.hpp \
+ common/type_id.hpp \
+ common/vararray.hpp \
+ common/vector.hpp \
+ common/word_list.hpp \
+ lib/filter_entry.hpp \
+ modules/speller/default/affix.hpp \
+ modules/speller/default/asuggest.hpp \
+ modules/speller/default/block_vector.hpp \
+ modules/speller/default/check_list.hpp \
+ modules/speller/default/data.hpp \
+ modules/speller/default/data_id.hpp \
+ modules/speller/default/data_util.hpp \
+ modules/speller/default/editdist.hpp \
+ modules/speller/default/editdist2.hpp \
+ modules/speller/default/language.hpp \
+ modules/speller/default/leditdist.hpp \
+ modules/speller/default/matrix.hpp \
+ modules/speller/default/phonet.hpp \
+ modules/speller/default/phonetic.hpp \
+ modules/speller/default/primes.hpp \
+ modules/speller/default/speller_impl.hpp \
+ modules/speller/default/suggest.hpp \
+ modules/speller/default/typo_editdist.hpp \
+ modules/speller/default/vector_hash-t.hpp \
+ modules/speller/default/vector_hash.hpp \
+ modules/speller/default/weights.hpp \
+ modules/speller/default/wordinfo.hpp
########################################################################
#
@@ -133,7 +219,10 @@
prezip_bin_SOURCES = prog/prezip.c
-EXTRA_DIST += prog/*.hpp
+# EXTRA_DIST += prog/*.hpp
+EXTRA_DIST += \
+ prog/check_funs.hpp \
+ prog/checker_string.hpp
########################################################################
#
@@ -237,15 +326,18 @@
opt_DATA = $(dynamic_optfiles)
filter_DATA = $(fltfiles)
+PREPEND_SRCDIR_AWK = $(AWK) '{ ntoks=split($$0,toks); for(i=0;i<ntoks;++i)
print "$(srcdir)/" toks[i]; }'
+
# settings.h added as a dependency so it will get recreated if
# the COMPILE_IN_FILTERS option changes
-gen/static_filters.src.cpp: ${static_optfiles} gen/mk-static-filter.pl
gen/settings.h
- ${PERLPROG} gen/mk-static-filter.pl ${static_optfiles}
+gen/static_filters.src.cpp: ${static_optfiles}
$(srcdir)/gen/mk-static-filter.pl gen/settings.h
+ ${PERLPROG} $(srcdir)/gen/mk-static-filter.pl \
+ `echo "${static_optfiles}" | $(PREPEND_SRCDIR_AWK)`
lib/new_filter.cpp: gen/static_filters.src.cpp
-gen/filter.pot: gen/mk-filter-pot.pl ${static_optfiles} ${dynamic_optfiles}
- ${PERLPROG} gen/mk-filter-pot.pl
+gen/filter.pot: $(srcdir)/gen/mk-filter-pot.pl ${static_optfiles}
${dynamic_optfiles}
+ ${PERLPROG} $(srcdir)/gen/mk-filter-pot.pl
EXTRA_DIST += ${static_optfiles} ${dynamic_optfiles} ${fltfiles} \
gen/mk-static-filter.pl gen/mk-filter-pot.pl\
@@ -260,8 +352,8 @@
common/config.cpp: gen/dirs.h
-gen/dirs.h: gen/mk-dirs_h.pl
- cd gen; perl mk-dirs_h.pl ${prefix} ${pkgdatadir} ${pkglibdir}
${sysconfdir} > dirs.h
+gen/dirs.h: $(srcdir)/gen/mk-dirs_h.pl
+ ${PERLPROG} $(srcdir)/gen/mk-dirs_h.pl ${prefix} ${pkgdatadir}
${pkglibdir} ${sysconfdir} > $@
EXTRA_DIST += gen/mk-dirs_h.pl
CLEANFILES += gen/dirs.h
@@ -371,8 +463,41 @@
data/koi8-u.cmap data/koi8-u.cset \
data/dvorak.kbd data/split.kbd data/standard.kbd
-EXTRA_DIST += config.rpath README ${pkgdata_DATA} m4/*.m4 \
+EXTRA_DIST += config.rpath README ${pkgdata_DATA} \
misc/po-filter.c
+EXTRA_DIST += \
+ m4/codeset.m4 \
+ m4/gettext.m4 \
+ m4/glibc2.m4 \
+ m4/glibc21.m4 \
+ m4/iconv.m4 \
+ m4/intdiv0.m4 \
+ m4/intl.m4 \
+ m4/intldir.m4 \
+ m4/intmax.m4 \
+ m4/inttypes-h.m4 \
+ m4/inttypes-pri.m4 \
+ m4/inttypes_h.m4 \
+ m4/lcmessage.m4 \
+ m4/lib-ld.m4 \
+ m4/lib-link.m4 \
+ m4/lib-prefix.m4 \
+ m4/lock.m4 \
+ m4/longdouble.m4 \
+ m4/longlong.m4 \
+ m4/nls.m4 \
+ m4/po.m4 \
+ m4/printf-posix.m4 \
+ m4/progtest.m4 \
+ m4/signed.m4 \
+ m4/size_max.m4 \
+ m4/stdint_h.m4 \
+ m4/uintmax_t.m4 \
+ m4/ulonglong.m4 \
+ m4/visibility.m4 \
+ m4/wchar_t.m4 \
+ m4/wint_t.m4 \
+ m4/xsize.m4
README: manual/readme.texi
makeinfo --no-validate --no-headers $< > README
@@ -382,10 +507,17 @@
xargs grep -l "Automatically generated file." |\
xargs rm
-dist-hook:
- mkdir $(distdir)/maintainer
- cp autogen config-opt config-debug TODO FIXMEs README-CVS \
- $(distdir)/maintainer
+# dist-hook:
+# mkdir $(distdir)/maintainer
+# cp autogen config-opt config-debug TODO FIXMEs README-CVS \
+# $(distdir)/maintainer
+EXTRA_DIST += \
+ maintainer/FIXMEs \
+ maintainer/README-CVS \
+ maintainer/TODO \
+ maintainer/autogen \
+ maintainer/config-debug \
+ maintainer/config-opt
ACLOCAL_AMFLAGS = -I m4
diff -u -r -N aspell-0.60.5/common/string_map.cpp
aspell-0.60.5-patched/common/string_map.cpp
--- aspell-0.60.5/common/string_map.cpp 2006-01-22 08:04:46.000000000 -0500
+++ aspell-0.60.5-patched/common/string_map.cpp 2007-01-06 03:47:54.000000000
-0500
@@ -23,6 +23,8 @@
HashTable<StringMap::Parms>::insert(const StringPair &);
template void HashTable<StringMap::Parms>::init(unsigned int);
template void HashTable<StringMap::Parms>::del(void);
+ template HashTable<StringMap::Parms>::size_type
+ HashTable<StringMap::Parms>::erase(char const* const&);
template void BlockSList<StringPair>::clear(void);
void StringMap::copy(const StringMap & other)
diff -u -r -N aspell-0.60.5/manual/Makefile.am
aspell-0.60.5-patched/manual/Makefile.am
--- aspell-0.60.5/manual/Makefile.am 2005-10-21 08:18:23.000000000 -0400
+++ aspell-0.60.5-patched/manual/Makefile.am 2007-01-06 15:36:23.000000000
-0500
@@ -4,7 +4,7 @@
MAKEINFOFLAGS = --enable-encoding
aspell_TEXINFOS = readme.texi fdl.texi lgpl.texi \
- lang-supported.texi lang-unsupported.texi crubadan.texi
+ lang-supported.texi lang-unsupported.texi crubadan.texi oo-only.texi
aspell_dev_TEXINFOS = mksrc.texi fdl.texi
man_MANS = aspell.1 pspell-config.1 word-list-compress.1\
diff -u -r -N aspell-0.60.5/manual/oo-only.texi
aspell-0.60.5-patched/manual/oo-only.texi
--- aspell-0.60.5/manual/oo-only.texi 1969-12-31 19:00:00.000000000 -0500
+++ aspell-0.60.5-patched/manual/oo-only.texi 2007-01-06 15:35:19.000000000
-0500
@@ -0,0 +1,18 @@
[EMAIL PROTECTED]
[EMAIL PROTECTED] Coptic (cop)
[EMAIL PROTECTED] Fijian (fj)
[EMAIL PROTECTED] Friulian (fur)
[EMAIL PROTECTED] Dyula (dyu)
[EMAIL PROTECTED] Fulah (ff)
[EMAIL PROTECTED] Mossi (mos)
[EMAIL PROTECTED] Nepali (ne)
[EMAIL PROTECTED] South Ndebele (nr)
[EMAIL PROTECTED] Northern Sotho (nso)
[EMAIL PROTECTED] Swati (ss)
[EMAIL PROTECTED] Southern Sotho (st)
[EMAIL PROTECTED] Tsonga (ts)
[EMAIL PROTECTED] Venda (ve)
[EMAIL PROTECTED] Xhosa (xh)
[EMAIL PROTECTED] Khmer (km)
[EMAIL PROTECTED] Luxembourgish (lb)
[EMAIL PROTECTED] itemize
diff -u -r -N aspell-0.60.5/myspell/Makefile.am
aspell-0.60.5-patched/myspell/Makefile.am
--- aspell-0.60.5/myspell/Makefile.am 2007-01-06 15:50:45.000000000 -0500
+++ aspell-0.60.5-patched/myspell/Makefile.am 2007-01-06 14:52:55.000000000
-0500
@@ -2,5 +2,12 @@
munch_SOURCES = munch.c
-EXTRA_DIST = README* en_US.aff *.h
+# EXTRA_DIST = README* en_US.aff *.h
+EXTRA_DIST = \
+ README \
+ README.munch \
+ README.replacetable \
+ README_en_US.txt \
+ en_US.aff \
+ munch.h
_______________________________________________
Aspell-devel mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/aspell-devel
