@@ -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 \
@@ -119,69 +118,22 @@ pg_sphere.test.sql: $(RELEASE_SQL) $(shlib)
119
118
$(RELEASE_SQL ) : $(addsuffix .in, $(RELEASE_SQL ) $(PGS_SQL ) )
120
119
cat $^ > $@
121
120
122
- # for "create extension from unpacked*":
123
-
124
- UPGRADE_UNP_COMMON = pgs_types.sql pgs_point.sql pgs_euler.sql pgs_circle.sql \
125
- pgs_line.sql pgs_ellipse.sql pgs_polygon.sql pgs_path.sql \
126
- pgs_box.sql pgs_contains_ops_compat.sql pgs_gist.sql \
127
- pgs_gist_contains_ops.sql contains-ops-fixes-1.sql
128
-
129
- AUGMENT_UNP_COMMON = upgrade_scripts/pgs_pre111.sql pgs_contains_ops.sql \
130
- gnomo.sql
131
- # for vanilla 1.1.1 users:
132
- AUGMENT_UNP_111 = $(AUGMENT_UNP_COMMON ) pgs_gist_pointkey.sql
133
-
134
- # for 1.1.2+ users: 'from unpacked_1.1.2plus'
135
- AUGMENT_UNP_FOR_112plus = $(AUGMENT_UNP_COMMON )
136
- UPGRADE_UNP_FOR_112plus = pgs_gist_pointkey.sql pgs_gist_drop_spoint2.sql.in
137
-
138
- # for "alter extension":
139
-
140
- # TODO: add dynamic pl/pgsql to do perform an additional
141
- # "ALTER EXTENSION pg_sphere UPDATE TO '1.1.5_from_before_2016-02-07';"
142
- # if required.
143
- #
144
121
# default 1.0 (after 2016-02-07) -> 1.1.5
145
122
UPGRADE_1_0_PRE_xxxxxx = contains-ops-fixes-2.sql
146
123
# '1.1.5_from_2015-08-31'
147
124
AUGMENT_1_0_PRE_AAF2D5 = pgs_contains_ops.sql gnomo.sql
148
125
UPGRADE_1_0_PRE_AAF2D5 = contains-ops-fixes-1.sql pgs_gist_drop_spoint2.sql.in \
149
126
pgs_gist_contains_ops.sql
150
127
151
- # vanilla 'create from unpackaged' must assume 1.1.1
152
- # ...
153
-
154
- # create "create extension from unpacked*" files
155
-
156
- # create "alter extension" files
157
-
158
- # local stuff follows here
159
- AUGMENT_GAVO_111 = $(AUGMENT_UNP_111 ) # for vanilla 1.1.1 users
160
- ifneq ($(USE_HEALPIX ) ,0)
161
- AUGMENT_GAVO_111 += healpix.sql
162
- endif
163
- UPGRADE_GAVO_111 = $(UPGRADE_UNP_COMMON )
164
-
165
128
# add new HEALPix functions and experimental spoint3
166
129
ifneq ($(USE_HEALPIX ) ,0)
167
130
AUGMENT_FROM_GAVO = healpix.sql
168
131
endif
169
132
AUGMENT_FROM_GAVO += pgs_gist_spoint3.sql
170
133
171
- AUGMENT_UNP_115B0G = $(AUGMENT_UNP_111 ) $(AUGMENT_FROM_GAVO )
172
- UPGRADE_UNP_115B0G = $(UPGRADE_UNP_COMMON )
173
-
174
134
AUGMENT_1_0_115B0G = $(AUGMENT_FROM_GAVO )
175
135
UPGRADE_1_0_115B0G = contains-ops-fixes-2.sql pgs_gist_drop_spoint2.sql
176
136
177
- # test installation 0
178
- pg_sphere--unpackaged--1.1.5beta0gavo.sql : $(addsuffix .in, \
179
- $(AUGMENT_GAVO_111 ) \
180
- $(addprefix upgrade_scripts/, $(UPGRADE_GAVO_111 ) ) )
181
- cat upgrade_scripts/$@ .in $^ > $@
182
-
183
- # (The upgrade of test installation A has been completed.)
184
-
185
137
# test installation B (generic)
186
138
pg_sphere--1.0--1.0_gavo.sql : # dummy upgrade to allow for descriptive names
187
139
cat upgrade_scripts/$@ .in > $@
0 commit comments