@@ -20,7 +20,6 @@ OBJS += src/healpix.o src/moc.o src/process_moc.o \
2020endif
2121
2222DATA_built =$(RELEASE_SQL ) \
23- pg_sphere--unpackaged--1.1.5beta0gavo.sql\
2423 pg_sphere--1.0--1.0_gavo.sql\
2524 pg_sphere--1.0_gavo--1.1.5beta0gavo.sql\
2625 pg_sphere--1.1.5beta0gavo--1.1.5beta2gavo.sql\
@@ -116,69 +115,22 @@ pg_sphere.test.sql: $(RELEASE_SQL) $(shlib)
116115$(RELEASE_SQL ) $(addsuffix .in,$(PGS_SQL ) )
117116cat$^ > $@
118117
119- # for "create extension from unpacked*":
120-
121- UPGRADE_UNP_COMMON = pgs_types.sql pgs_point.sql pgs_euler.sql pgs_circle.sql\
122- pgs_line.sql pgs_ellipse.sql pgs_polygon.sql pgs_path.sql\
123- pgs_box.sql pgs_contains_ops_compat.sql pgs_gist.sql\
124- pgs_gist_contains_ops.sql contains-ops-fixes-1.sql
125-
126- AUGMENT_UNP_COMMON = upgrade_scripts/pgs_pre111.sql pgs_contains_ops.sql\
127- gnomo.sql
128- # for vanilla 1.1.1 users:
129- AUGMENT_UNP_111 =$(AUGMENT_UNP_COMMON ) pgs_gist_pointkey.sql
130-
131- # for 1.1.2+ users: 'from unpacked_1.1.2plus'
132- AUGMENT_UNP_FOR_112plus =$(AUGMENT_UNP_COMMON )
133- UPGRADE_UNP_FOR_112plus = pgs_gist_pointkey.sql pgs_gist_drop_spoint2.sql.in
134-
135- # for "alter extension":
136-
137- # TODO: add dynamic pl/pgsql to do perform an additional
138- # "ALTER EXTENSION pg_sphere UPDATE TO '1.1.5_from_before_2016-02-07';"
139- # if required.
140- #
141118# default 1.0 (after 2016-02-07) -> 1.1.5
142119UPGRADE_1_0_PRE_xxxxxx = contains-ops-fixes-2.sql
143120# '1.1.5_from_2015-08-31'
144121AUGMENT_1_0_PRE_AAF2D5 = pgs_contains_ops.sql gnomo.sql
145122UPGRADE_1_0_PRE_AAF2D5 = contains-ops-fixes-1.sql pgs_gist_drop_spoint2.sql.in\
146123pgs_gist_contains_ops.sql
147124
148- # vanilla 'create from unpackaged' must assume 1.1.1
149- # ...
150-
151- # create "create extension from unpacked*" files
152-
153- # create "alter extension" files
154-
155- # local stuff follows here
156- AUGMENT_GAVO_111 =$(AUGMENT_UNP_111 ) # for vanilla 1.1.1 users
157- ifneq ($(USE_HEALPIX ) ,0)
158- AUGMENT_GAVO_111 += healpix.sql
159- endif
160- UPGRADE_GAVO_111 =$(UPGRADE_UNP_COMMON )
161-
162125# add new HEALPix functions and experimental spoint3
163126ifneq ($(USE_HEALPIX ) ,0)
164127AUGMENT_FROM_GAVO = healpix.sql
165128endif
166129AUGMENT_FROM_GAVO += pgs_gist_spoint3.sql
167130
168- AUGMENT_UNP_115B0G =$(AUGMENT_UNP_111 ) $(AUGMENT_FROM_GAVO )
169- UPGRADE_UNP_115B0G =$(UPGRADE_UNP_COMMON )
170-
171131AUGMENT_1_0_115B0G =$(AUGMENT_FROM_GAVO )
172132UPGRADE_1_0_115B0G = contains-ops-fixes-2.sql pgs_gist_drop_spoint2.sql
173133
174- # test installation 0
175- pg_sphere--unpackaged--1.1.5beta0gavo.sql :$(addsuffix .in, \
176- $(AUGMENT_GAVO_111 ) \
177- $(addprefix upgrade_scripts/,$(UPGRADE_GAVO_111 ) ) )
178- cat upgrade_scripts/$@ .in$^ > $@
179-
180- # (The upgrade of test installation A has been completed.)
181-
182134# test installation B (generic)
183135pg_sphere--1.0--1.0_gavo.sql :# dummy upgrade to allow for descriptive names
184136cat upgrade_scripts/$@ .in> $@