Skip to content

Commit 7462c09

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 d7f8314 commit 7462c09

15 files changed

+0
-216
lines changed

Makefile

Lines changed: 0 additions & 47 deletions
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 \
@@ -117,55 +112,13 @@ pg_sphere.test.sql: $(RELEASE_SQL) $(shlib)
117112
$(RELEASE_SQL): pg_sphere_head.sql.in $(addsuffix .in, $(PGS_SQL))
118113
cat $^ > $@
119114

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

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

upgrade_scripts/contains-ops-fixes-1.sql.in

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

upgrade_scripts/contains-ops-fixes-2.sql.in

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

upgrade_scripts/pg_sphere--1.0--1.0_gavo.sql.in

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

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

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

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

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

upgrade_scripts/pg_sphere--1.0_gavo--1.1.5beta0gavo.sql.in

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

upgrade_scripts/pg_sphere--1.1.5--1.1.5.1.sql.in

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

upgrade_scripts/pg_sphere--1.1.5_from_2015-08-31--1.1.5.sql.in

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

upgrade_scripts/pg_sphere--1.1.5_from_2016-02-07--1.1.5.sql.in

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

upgrade_scripts/pg_sphere--1.1.5beta0gavo--1.1.5beta2gavo.sql.in

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

upgrade_scripts/pg_sphere--1.1.5beta2gavo--1.1.5beta4gavo.sql.in

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

upgrade_scripts/pg_sphere--1.1.5beta4gavo--1.2.0.sql.in

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

upgrade_scripts/pgs_gist_contains_ops.sql.in

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

upgrade_scripts/pgs_gist_drop_spoint2.sql.in

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

0 commit comments

Comments
 (0)