Skip to content

Commit 8da3fee

Browse files
committed
Remove support from upgrading from pre-1.2.0 versions
Before 1.2, there was a mess of 1.1_datestamp and 1.1gavo versions. Remove that version number maze, existing users should already be on 1.2, or can upgrade to 1.2/1.3 before deploying later versions.
1 parent e2bfda1 commit 8da3fee

15 files changed

+0
-216
lines changed

Diff for: Makefile

-47
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,6 @@ OBJS += src/healpix.o src/moc.o src/process_moc.o \
2020
endif
2121

2222
DATA_built = $(RELEASE_SQL) \
23-
pg_sphere--1.0--1.0_gavo.sql \
24-
pg_sphere--1.0_gavo--1.1.5beta0gavo.sql \
25-
pg_sphere--1.1.5beta0gavo--1.1.5beta2gavo.sql \
26-
pg_sphere--1.1.5beta2gavo--1.1.5beta4gavo.sql \
27-
pg_sphere--1.1.5beta4gavo--1.2.0.sql \
2823
pg_sphere--1.2.0--1.2.1.sql \
2924
pg_sphere--1.2.1--1.2.2.sql \
3025
pg_sphere--1.2.2--1.2.3.sql \
@@ -118,55 +113,13 @@ pg_sphere.test.sql: $(RELEASE_SQL) $(shlib)
118113
$(RELEASE_SQL): $(addsuffix .in, $(RELEASE_SQL) $(PGS_SQL))
119114
cat $^ > $@
120115

121-
# default 1.0 (after 2016-02-07) -> 1.1.5
122-
UPGRADE_1_0_PRE_xxxxxx = contains-ops-fixes-2.sql
123-
# '1.1.5_from_2015-08-31'
124-
AUGMENT_1_0_PRE_AAF2D5 = pgs_contains_ops.sql gnomo.sql
125-
UPGRADE_1_0_PRE_AAF2D5 = contains-ops-fixes-1.sql pgs_gist_drop_spoint2.sql.in \
126-
pgs_gist_contains_ops.sql
127-
128-
# add new HEALPix functions and experimental spoint3
129-
ifneq ($(USE_HEALPIX),0)
130-
AUGMENT_FROM_GAVO = healpix.sql
131-
endif
132-
AUGMENT_FROM_GAVO += pgs_gist_spoint3.sql
133-
134-
AUGMENT_1_0_115B0G = $(AUGMENT_FROM_GAVO)
135-
UPGRADE_1_0_115B0G = contains-ops-fixes-2.sql pgs_gist_drop_spoint2.sql
136-
137-
# test installation B (generic)
138-
pg_sphere--1.0--1.0_gavo.sql: # dummy upgrade to allow for descriptive names
139-
cat upgrade_scripts/$@.in > $@
140-
pg_sphere--1.0_gavo--1.1.5beta0gavo.sql: $(addsuffix .in, \
141-
$(AUGMENT_1_0_115B0G) \
142-
$(addprefix upgrade_scripts/, $(UPGRADE_1_0_115B0G)))
143-
cat upgrade_scripts/$@.in $^ > $@
144-
145116
ifneq ($(USE_HEALPIX),0)
146-
pg_sphere--1.1.5beta0gavo--1.1.5beta2gavo.sql: pgs_moc_type.sql.in
147-
cat upgrade_scripts/$@.in $^ > $@
148-
149-
pg_sphere--1.1.5beta2gavo--1.1.5beta4gavo.sql: pgs_moc_compat.sql.in
150-
cat upgrade_scripts/$@.in $^ > $@
151-
152-
pg_sphere--1.1.5beta4gavo--1.2.0.sql: pgs_moc_ops.sql.in
153-
cat upgrade_scripts/$@.in $^ > $@
154-
155117
pg_sphere--1.2.0--1.2.1.sql: pgs_moc_geo_casts.sql.in pgs_epochprop.sql.in
156118
cat upgrade_scripts/$@.in $^ > $@
157119

158120
pg_sphere--1.2.1--1.2.2.sql: upgrade_scripts/pg_sphere--1.2.1--1.2.2-healpix.sql.in
159121
cat upgrade_scripts/$@.in $^ > $@
160122
else
161-
pg_sphere--1.1.5beta0gavo--1.1.5beta2gavo.sql:
162-
cat upgrade_scripts/$@.in > $@
163-
164-
pg_sphere--1.1.5beta2gavo--1.1.5beta4gavo.sql:
165-
cat upgrade_scripts/$@.in > $@
166-
167-
pg_sphere--1.1.5beta4gavo--1.2.0.sql:
168-
cat upgrade_scripts/$@.in > $@
169-
170123
pg_sphere--1.2.0--1.2.1.sql: pgs_epochprop.sql.in
171124
cat upgrade_scripts/$@.in $^ > $@
172125

Diff for: upgrade_scripts/contains-ops-fixes-1.sql.in

-39
This file was deleted.

Diff for: upgrade_scripts/contains-ops-fixes-2.sql.in

-26
This file was deleted.

Diff for: upgrade_scripts/pg_sphere--1.0--1.0_gavo.sql.in

-2
This file was deleted.

Diff for: upgrade_scripts/pg_sphere--1.0--1.1.5_from_2015-08-31.sql.in

-2
This file was deleted.

Diff for: upgrade_scripts/pg_sphere--1.0--1.1.5_from_2016-02-07.sql.in

-2
This file was deleted.

Diff for: upgrade_scripts/pg_sphere--1.0_gavo--1.1.5beta0gavo.sql.in

-2
This file was deleted.

Diff for: upgrade_scripts/pg_sphere--1.1.5--1.1.5.1.sql.in

-2
This file was deleted.

Diff for: upgrade_scripts/pg_sphere--1.1.5_from_2015-08-31--1.1.5.sql.in

-2
This file was deleted.

Diff for: upgrade_scripts/pg_sphere--1.1.5_from_2016-02-07--1.1.5.sql.in

-2
This file was deleted.

Diff for: upgrade_scripts/pg_sphere--1.1.5beta0gavo--1.1.5beta2gavo.sql.in

-2
This file was deleted.

Diff for: upgrade_scripts/pg_sphere--1.1.5beta2gavo--1.1.5beta4gavo.sql.in

-2
This file was deleted.

Diff for: upgrade_scripts/pg_sphere--1.1.5beta4gavo--1.2.0.sql.in

-2
This file was deleted.

Diff for: upgrade_scripts/pgs_gist_contains_ops.sql.in

-73
This file was deleted.

Diff for: upgrade_scripts/pgs_gist_drop_spoint2.sql.in

-11
This file was deleted.

0 commit comments

Comments
 (0)