@@ -20,7 +20,6 @@ OBJS += src/healpix.o src/moc.o src/process_moc.o \
20
20
endif
21
21
22
22
DATA_built = $(RELEASE_SQL ) \
23
- pg_sphere--unpackaged--1.1.5beta0gavo.sql \
24
23
pg_sphere--1.0--1.0_gavo.sql \
25
24
pg_sphere--1.0_gavo--1.1.5beta0gavo.sql \
26
25
pg_sphere--1.1.5beta0gavo--1.1.5beta2gavo.sql \
@@ -116,69 +115,22 @@ pg_sphere.test.sql: $(RELEASE_SQL) $(shlib)
116
115
$(RELEASE_SQL ) : pg_sphere_head.sql.in $(addsuffix .in, $(PGS_SQL ) )
117
116
cat $^ > $@
118
117
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
- #
141
118
# default 1.0 (after 2016-02-07) -> 1.1.5
142
119
UPGRADE_1_0_PRE_xxxxxx = contains-ops-fixes-2.sql
143
120
# '1.1.5_from_2015-08-31'
144
121
AUGMENT_1_0_PRE_AAF2D5 = pgs_contains_ops.sql gnomo.sql
145
122
UPGRADE_1_0_PRE_AAF2D5 = contains-ops-fixes-1.sql pgs_gist_drop_spoint2.sql.in \
146
123
pgs_gist_contains_ops.sql
147
124
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
-
162
125
# add new HEALPix functions and experimental spoint3
163
126
ifneq ($(USE_HEALPIX ) ,0)
164
127
AUGMENT_FROM_GAVO = healpix.sql
165
128
endif
166
129
AUGMENT_FROM_GAVO += pgs_gist_spoint3.sql
167
130
168
- AUGMENT_UNP_115B0G = $(AUGMENT_UNP_111 ) $(AUGMENT_FROM_GAVO )
169
- UPGRADE_UNP_115B0G = $(UPGRADE_UNP_COMMON )
170
-
171
131
AUGMENT_1_0_115B0G = $(AUGMENT_FROM_GAVO )
172
132
UPGRADE_1_0_115B0G = contains-ops-fixes-2.sql pgs_gist_drop_spoint2.sql
173
133
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
-
182
134
# test installation B (generic)
183
135
pg_sphere--1.0--1.0_gavo.sql : # dummy upgrade to allow for descriptive names
184
136
cat upgrade_scripts/$@ .in > $@
0 commit comments