Skip to content

Commit 90e3f2a

Browse files
committed
Replace the now-incompatible-with-core contrib/tsearch2 module with a
compatibility package. This supports importing dumps from past versions using tsearch2, and provides the old names and API for most functions that were changed. (rewrite(ARRAY[...]) is a glaring omission, though.) Pavel Stehule and Tom Lane
1 parent 4ea3210 commit 90e3f2a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

85 files changed

+1207
-24507
lines changed

contrib/tsearch2/Makefile

Lines changed: 4 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,10 @@
1-
# $PostgreSQL: pgsql/contrib/tsearch2/Makefile,v 1.19 2007/06/26 22:05:03 tgl Exp $
1+
# $PostgreSQL: pgsql/contrib/tsearch2/Makefile,v 1.20 2007/11/13 21:02:28 tgl Exp $
22

3-
MODULE_big = tsearch2
4-
OBJS = dict_ex.o dict.o snmap.o stopword.o common.o prs_dcfg.o \
5-
dict_snowball.o dict_ispell.o dict_syn.o dict_thesaurus.o \
6-
wparser.o wparser_def.o \
7-
ts_cfg.o tsvector.o query_cleanup.o crc32.o query.o gistidx.o \
8-
tsvector_op.o rank.o ts_stat.o \
9-
query_util.o query_support.o query_rewrite.o query_gist.o \
10-
ts_locale.o ts_lexize.o ginidx.o
11-
12-
SUBDIRS = snowball ispell wordparser
13-
SUBDIROBJS = $(SUBDIRS:%=%/SUBSYS.o)
14-
15-
OBJS += $(SUBDIROBJS)
16-
17-
PG_CPPFLAGS = -I$(srcdir)/snowball -I$(srcdir)/ispell -I$(srcdir)/wordparser
18-
19-
DATA = stopword/english.stop stopword/russian.stop stopword/russian.stop.utf8 thesaurus
20-
DATA_built = tsearch2.sql uninstall_tsearch2.sql
21-
DOCS = README.tsearch2
3+
MODULES = tsearch2
4+
DATA_built = tsearch2.sql
5+
DATA = uninstall_tsearch2.sql
226
REGRESS = tsearch2
237

24-
SHLIB_LINK += $(filter -lm, $(LIBS))
25-
26-
278
ifdef USE_PGXS
289
PG_CONFIG = pg_config
2910
PGXS := $(shell $(PG_CONFIG) --pgxs)
@@ -34,23 +15,3 @@ top_builddir = ../..
3415
include $(top_builddir)/src/Makefile.global
3516
include $(top_srcdir)/contrib/contrib-global.mk
3617
endif
37-
38-
39-
$(SUBDIROBJS): $(SUBDIRS:%=%-recursive) ;
40-
41-
.PHONY: $(SUBDIRS:%=%-recursive)
42-
43-
$(SUBDIRS:%=%-recursive):
44-
$(MAKE) -C $(subst -recursive,,$@) SUBSYS.o
45-
46-
tsearch2.sql: tsearch.sql.in
47-
sed -e 's,MODULE_PATHNAME,$$libdir/$(MODULE_big),g' $< >$@
48-
49-
uninstall_tsearch2.sql: untsearch.sql.in
50-
cp $< $@
51-
52-
.PHONY: subclean
53-
clean: subclean
54-
55-
subclean:
56-
for dir in $(SUBDIRS); do $(MAKE) -C $$dir clean || exit; done

contrib/tsearch2/README.tsearch2

Lines changed: 0 additions & 210 deletions
This file was deleted.

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy