Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit4ee11e1

Browse files
authored
Merge pull request#75 from cybertec-postgresql/makefile
Makefile cleanup
2 parents1366e73 +bcfbd46 commit4ee11e1

15 files changed

+2
-639
lines changed

‎Makefile

Lines changed: 2 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ OBJS += src/healpix.o src/moc.o src/process_moc.o \
2020
endif
2121

2222
DATA_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\
@@ -38,18 +37,10 @@ REGRESS = init tables points euler circle line ellipse poly path box index \
3837
contains_ops contains_ops_compat bounding_box_gist gnomo epochprop\
3938
contains overlaps spoint_brin sbox_brin
4039

41-
ifneq ($(USE_HEALPIX),0)
42-
REGRESS += healpix moc mocautocast
43-
endif
44-
4540
TESTS = init_test tables points euler circle line ellipse poly path box\
4641
index contains_ops contains_ops_compat bounding_box_gist gnomo\
4742
epochprop contains overlaps spoint_brin sbox_brin
4843

49-
ifneq ($(USE_HEALPIX),0)
50-
TESTS += healpix moc mocautocast
51-
endif
52-
5344
PG_CFLAGS+= -DPGSPHERE_VERSION=$(PGSPHERE_VERSION)
5445
PG_CPPFLAGS+= -DPGSPHERE_VERSION=$(PGSPHERE_VERSION)
5546

@@ -70,6 +61,8 @@ PGS_SQL = pgs_types.sql pgs_point.sql pgs_euler.sql pgs_circle.sql \
7061
pgs_gist.sql gnomo.sql pgs_brin.sql
7162

7263
ifneq ($(USE_HEALPIX),0)
64+
REGRESS += healpix moc moc1 moc100 mocautocast
65+
TESTS += healpix moc moc1 moc100 mocautocast
7366
PGS_SQL += healpix.sql
7467
endif
7568

@@ -109,17 +102,10 @@ healpix_bare/healpix_bare.o : healpix_bare/healpix_bare.c
109102
$(COMPILE.c) -Wno-declaration-after-statement -o$@$^
110103

111104
pg_version :=$(word 2,$(shell$(PG_CONFIG) --version))
112-
has_explain_summary =$(if$(filter-out 9.%,$(pg_version)),y,n)
113105

114106
crushtest: REGRESS +=$(CRUSH_TESTS)
115107
crushtest: installcheck
116108

117-
ifneq ($(USE_HEALPIX),0)
118-
ifeq ($(has_explain_summary),y)
119-
REGRESS += moc1 moc100
120-
endif
121-
endif
122-
123109
test: pg_sphere.test.sql
124110
$(pg_regress_installcheck) --temp-instance=tmp_check$(REGRESS_OPTS)$(TESTS)
125111

@@ -129,69 +115,22 @@ pg_sphere.test.sql: $(RELEASE_SQL) $(shlib)
129115
$(RELEASE_SQL): pg_sphere_head.sql.in$(addsuffix .in,$(PGS_SQL))
130116
cat$^>$@
131117

132-
# for "create extension from unpacked*":
133-
134-
UPGRADE_UNP_COMMON = pgs_types.sql pgs_point.sql pgs_euler.sql pgs_circle.sql\
135-
pgs_line.sql pgs_ellipse.sql pgs_polygon.sql pgs_path.sql\
136-
pgs_box.sql pgs_contains_ops_compat.sql pgs_gist.sql\
137-
pgs_gist_contains_ops.sql contains-ops-fixes-1.sql
138-
139-
AUGMENT_UNP_COMMON = upgrade_scripts/pgs_pre111.sql pgs_contains_ops.sql\
140-
gnomo.sql
141-
# for vanilla 1.1.1 users:
142-
AUGMENT_UNP_111 =$(AUGMENT_UNP_COMMON) pgs_gist_pointkey.sql
143-
144-
# for 1.1.2+ users: 'from unpacked_1.1.2plus'
145-
AUGMENT_UNP_FOR_112plus =$(AUGMENT_UNP_COMMON)
146-
UPGRADE_UNP_FOR_112plus = pgs_gist_pointkey.sql pgs_gist_drop_spoint2.sql.in
147-
148-
# for "alter extension":
149-
150-
# TODO: add dynamic pl/pgsql to do perform an additional
151-
# "ALTER EXTENSION pg_sphere UPDATE TO '1.1.5_from_before_2016-02-07';"
152-
# if required.
153-
#
154118
# default 1.0 (after 2016-02-07) -> 1.1.5
155119
UPGRADE_1_0_PRE_xxxxxx = contains-ops-fixes-2.sql
156120
# '1.1.5_from_2015-08-31'
157121
AUGMENT_1_0_PRE_AAF2D5 = pgs_contains_ops.sql gnomo.sql
158122
UPGRADE_1_0_PRE_AAF2D5 = contains-ops-fixes-1.sql pgs_gist_drop_spoint2.sql.in\
159123
pgs_gist_contains_ops.sql
160124

161-
# vanilla 'create from unpackaged' must assume 1.1.1
162-
# ...
163-
164-
# create "create extension from unpacked*" files
165-
166-
# create "alter extension" files
167-
168-
# local stuff follows here
169-
AUGMENT_GAVO_111 =$(AUGMENT_UNP_111)# for vanilla 1.1.1 users
170-
ifneq ($(USE_HEALPIX),0)
171-
AUGMENT_GAVO_111 += healpix.sql
172-
endif
173-
UPGRADE_GAVO_111 =$(UPGRADE_UNP_COMMON)
174-
175125
# add new HEALPix functions and experimental spoint3
176126
ifneq ($(USE_HEALPIX),0)
177127
AUGMENT_FROM_GAVO = healpix.sql
178128
endif
179129
AUGMENT_FROM_GAVO += pgs_gist_spoint3.sql
180130

181-
AUGMENT_UNP_115B0G =$(AUGMENT_UNP_111)$(AUGMENT_FROM_GAVO)
182-
UPGRADE_UNP_115B0G =$(UPGRADE_UNP_COMMON)
183-
184131
AUGMENT_1_0_115B0G =$(AUGMENT_FROM_GAVO)
185132
UPGRADE_1_0_115B0G = contains-ops-fixes-2.sql pgs_gist_drop_spoint2.sql
186133

187-
# test installation 0
188-
pg_sphere--unpackaged--1.1.5beta0gavo.sql:$(addsuffix .in, \
189-
$(AUGMENT_GAVO_111) \
190-
$(addprefix upgrade_scripts/,$(UPGRADE_GAVO_111)))
191-
cat upgrade_scripts/$@.in$^>$@
192-
193-
# (The upgrade of test installation A has been completed.)
194-
195134
# test installation B (generic)
196135
pg_sphere--1.0--1.0_gavo.sql:# dummy upgrade to allow for descriptive names
197136
cat upgrade_scripts/$@.in>$@

‎upgrade_scripts/pg_sphere--unpackaged--1.1.5.sql.in

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

‎upgrade_scripts/pg_sphere--unpackaged--1.1.5beta0gavo.sql.in

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

‎upgrade_scripts/pgs_box.sql.in

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

‎upgrade_scripts/pgs_circle.sql.in

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

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp