postgrespro · vitcpp · Jun 2, 2023 · Jun 2, 2023
diff --git a/Makefile b/Makefile
@@ -1,13 +1,16 @@
 PGSPHERE_VERSION = 1.2.1
 
 # the base dir name may be changed depending on git clone command
-SRC_DIR = $(shell basename $(shell pwd))
+SRC_DIR     = $(shell basename $(shell pwd))
 
-MODULE_big = pg_sphere
-OBJS       = sscan.o sparse.o sbuffer.o vector3d.o point.o \
-             euler.o circle.o line.o ellipse.o polygon.o \
-             path.o box.o output.o gq_cache.o gist.o key.o \
-             gnomo.o healpix.o moc.o process_moc.o healpix_bare/healpix_bare.o
+MODULE_big  = pg_sphere
+
+OBJS        = src/sscan.o src/sparse.o src/sbuffer.o src/vector3d.o src/point.o \
+              src/euler.o src/circle.o src/line.o src/ellipse.o src/polygon.o \
+              src/path.o src/box.o src/output.o src/gq_cache.o src/gist.o src/key.o \
+              src/gnomo.o \
+              src/healpix.o src/moc.o src/process_moc.o \
+              healpix_bare/healpix_bare.o
 
 EXTENSION   = pg_sphere
 RELEASE_SQL = $(EXTENSION)--$(PGSPHERE_VERSION).sql
@@ -25,6 +28,9 @@ REGRESS     = init tables points euler circle line ellipse poly path box index \
 			  contains_ops contains_ops_compat bounding_box_gist gnomo healpix \
 			  moc mocautocast
 
+PG_CFLAGS	+= -Isrc -DPGSPHERE_VERSION=${PGSPHERE_VERSION}
+PG_CXXFLAGS	+= -Isrc -DPGSPHERE_VERSION=${PGSPHERE_VERSION}
+
 REGRESS_9_5 = index_9.5 # experimental for spoint3
 
 TESTS       = init_test tables points euler circle line ellipse poly path box index \
@@ -45,9 +51,10 @@ CRUSH_TESTS = init_extended circle_extended
 PGS_SQL     = pgs_types.sql pgs_point.sql pgs_euler.sql pgs_circle.sql \
    pgs_line.sql pgs_ellipse.sql pgs_polygon.sql pgs_path.sql \
    pgs_box.sql pgs_contains_ops.sql pgs_contains_ops_compat.sql \
-   pgs_gist.sql gnomo.sql \
+   pgs_gist.sql pgs_gnomo.sql \
    healpix.sql pgs_gist_spoint3.sql pgs_moc_type.sql pgs_moc_compat.sql pgs_moc_ops.sql \
    pgs_moc_geo_casts.sql
+
 PGS_SQL_9_5 = pgs_9.5.sql # experimental for spoint3
 
 USE_PGXS = 1
@@ -123,39 +130,41 @@ UPGRADE_UNP_COMMON =  pgs_types.sql pgs_point.sql pgs_euler.sql pgs_circle.sql \
 	pgs_gist_contains_ops.sql contains-ops-fixes-1.sql
 
 AUGMENT_UNP_COMMON = upgrade_scripts/pgs_pre111.sql pgs_contains_ops.sql \
-	gnomo.sql
+	pgs_gnomo.sql
+
 # for vanilla 1.1.1 users
 AUGMENT_UNP_111 = $(AUGMENT_UNP_COMMON) pgs_gist_pointkey.sql
 
+# TODO: Clean up the commented code below.
 # for 1.1.2+ users: 'from unpacked_1.1.2plus'
-AUGMENT_UNP_FOR_112plus = $(AUGMENT_UNP_COMMON)
-UPGRADE_UNP_FOR_112plus = pgs_gist_pointkey.sql pgs_gist_drop_spoint2.sql.in
-
+#AUGMENT_UNP_FOR_112plus = $(AUGMENT_UNP_COMMON)
+#UPGRADE_UNP_FOR_112plus = pgs_gist_pointkey.sql pgs_gist_drop_spoint2.sql.in
+#
 # for "alter extension":
-
+#
 # TODO: add dynamic pl/pgsql to do perform an additional
 #    "ALTER EXTENSION pg_sphere UPDATE TO '1.1.5_from_before_2016-02-07';"
 # if required.
 #
 # default 1.0 (after 2016-02-07) -> 1.1.5
-UPGRADE_1_0_PRE_xxxxxx = contains-ops-fixes-2.sql
+#UPGRADE_1_0_PRE_xxxxxx = contains-ops-fixes-2.sql
 # '1.1.5_from_2015-08-31'
-AUGMENT_1_0_PRE_AAF2D5 = pgs_contains_ops.sql gnomo.sql
-UPGRADE_1_0_PRE_AAF2D5 = contains-ops-fixes-1.sql pgs_gist_drop_spoint2.sql.in \
-						pgs_gist_contains_ops.sql
-
+#AUGMENT_1_0_PRE_AAF2D5 = pgs_contains_ops.sql gnomo.sql
+#UPGRADE_1_0_PRE_AAF2D5 = contains-ops-fixes-1.sql pgs_gist_drop_spoint2.sql.in \#
+#						pgs_gist_contains_ops.sql
+#
 # vanilla 'create from unpackaged' must assume 1.1.1
 # ...
-
+#
 # create "create extension from unpacked*" files
-
+#
 # create "alter extension" files
-
-
-ifeq ($(pg_version_9_5_plus),y)
-# 1.1.1.5 -> 1.1.5.1 for Postgres 9.5+ features
-else
-endif
+#
+#
+#ifeq ($(pg_version_9_5_plus),y)
+## 1.1.1.5 -> 1.1.5.1 for Postgres 9.5+ features
+#else
+#endif
 
 # local stuff follows here
 
@@ -182,6 +191,7 @@ pg_sphere--unpackaged--1.1.5beta0gavo.sql: $(addsuffix .in, \
 # test installation B (generic)
 pg_sphere--1.0--1.0_gavo.sql: # dummy upgrade to allow for descriptive names
 	cat upgrade_scripts/$@.in > $@
+
 pg_sphere--1.0_gavo--1.1.5beta0gavo.sql: $(addsuffix .in, \
 		$(AUGMENT_1_0_115B0G) \
 		$(addprefix upgrade_scripts/, $(UPGRADE_1_0_115B0G)))

diff --git a/expected/init.out b/expected/init.out
@@ -3,3 +3,9 @@
 -- does not depend on contents of pg_sphere.sql.
 --
 CREATE EXTENSION pg_sphere;
+select pg_sphere_version();
+ pg_sphere_version 
+-------------------
+ 1.2.1
+(1 row)
+
diff --git a/gnomo.sql.in → pgs_gnomo.sql.in b/gnomo.sql.in → pgs_gnomo.sql.in
diff --git a/sql/init.sql b/sql/init.sql
@@ -3,3 +3,4 @@
 -- does not depend on contents of pg_sphere.sql.
 --
 CREATE EXTENSION pg_sphere;
+select pg_sphere_version();
diff --git a/box.c → src/box.c b/box.c → src/box.c
diff --git a/box.h → src/box.h b/box.h → src/box.h
diff --git a/circle.c → src/circle.c b/circle.c → src/circle.c
diff --git a/circle.h → src/circle.h b/circle.h → src/circle.h
diff --git a/ellipse.c → src/ellipse.c b/ellipse.c → src/ellipse.c
diff --git a/ellipse.h → src/ellipse.h b/ellipse.h → src/ellipse.h
diff --git a/euler.c → src/euler.c b/euler.c → src/euler.c
diff --git a/euler.h → src/euler.h b/euler.h → src/euler.h
diff --git a/gist.c → src/gist.c b/gist.c → src/gist.c
diff --git a/gist.h → src/gist.h b/gist.h → src/gist.h
diff --git a/gnomo.c → src/gnomo.c b/gnomo.c → src/gnomo.c
@@ -1,8 +1,8 @@
 #include <postgres.h>
 #include <fmgr.h>
 
-#include <gnomo.h>
-#include <point.h> /* SPoint from pgsphere */
+#include "gnomo.h"
+#include "point.h" /* SPoint from pgsphere */
 
 #include <math.h>
 

diff --git a/gnomo.h → src/gnomo.h b/gnomo.h → src/gnomo.h
diff --git a/gq_cache.c → src/gq_cache.c b/gq_cache.c → src/gq_cache.c
diff --git a/healpix.c → src/healpix.c b/healpix.c → src/healpix.c
diff --git a/key.c → src/key.c b/key.c → src/key.c
diff --git a/key.h → src/key.h b/key.h → src/key.h
diff --git a/line.c → src/line.c b/line.c → src/line.c
diff --git a/line.h → src/line.h b/line.h → src/line.h
diff --git a/moc.c → src/moc.c b/moc.c → src/moc.c
diff --git a/output.c → src/output.c b/output.c → src/output.c
@@ -1,5 +1,12 @@
 #include "types.h"
 
+#if !defined(PGSPHERE_VERSION)
+#error "PGSPHERE_VERSION macro is not set"
+#endif
+
+#define PGSPHERE_STRINGIFY_INTERNAL(x) #x
+#define PGSPHERE_STRINGIFY(x) PGSPHERE_STRINGIFY_INTERNAL(x)
+
 /* Output functions */
 
 
@@ -528,6 +535,6 @@ Datum
 pg_sphere_version(PG_FUNCTION_ARGS)
 {
 	char	   *buffer = (char *) palloc(20);
-	sprintf(buffer, "1.1.5");
+	sprintf(buffer, PGSPHERE_STRINGIFY(PGSPHERE_VERSION));
 	PG_RETURN_CSTRING(buffer);
 }
diff --git a/path.c → src/path.c b/path.c → src/path.c
diff --git a/path.h → src/path.h b/path.h → src/path.h
diff --git a/pg_sphere.h → src/pg_sphere.h b/pg_sphere.h → src/pg_sphere.h
diff --git a/pgs_chealpix.h → src/pgs_chealpix.h b/pgs_chealpix.h → src/pgs_chealpix.h
diff --git a/pgs_healpix.h → src/pgs_healpix.h b/pgs_healpix.h → src/pgs_healpix.h
diff --git a/pgs_moc.h → src/pgs_moc.h b/pgs_moc.h → src/pgs_moc.h
diff --git a/pgs_process_moc.h → src/pgs_process_moc.h b/pgs_process_moc.h → src/pgs_process_moc.h
diff --git a/pgs_util.h → src/pgs_util.h b/pgs_util.h → src/pgs_util.h
diff --git a/point.c → src/point.c b/point.c → src/point.c
diff --git a/point.h → src/point.h b/point.h → src/point.h
diff --git a/polygon.c → src/polygon.c b/polygon.c → src/polygon.c
diff --git a/polygon.h → src/polygon.h b/polygon.h → src/polygon.h
diff --git a/process_moc.cpp → src/process_moc.cpp b/process_moc.cpp → src/process_moc.cpp
diff --git a/sbuffer.c → src/sbuffer.c b/sbuffer.c → src/sbuffer.c
diff --git a/sbuffer.h → src/sbuffer.h b/sbuffer.h → src/sbuffer.h
diff --git a/sparse.c → src/sparse.c b/sparse.c → src/sparse.c
diff --git a/sparse.h → src/sparse.h b/sparse.h → src/sparse.h
diff --git a/sparse.y → src/sparse.y b/sparse.y → src/sparse.y
diff --git a/sscan.c → src/sscan.c b/sscan.c → src/sscan.c
diff --git a/sscan.l → src/sscan.l b/sscan.l → src/sscan.l
diff --git a/types.h → src/types.h b/types.h → src/types.h
diff --git a/vector3d.c → src/vector3d.c b/vector3d.c → src/vector3d.c
diff --git a/vector3d.h → src/vector3d.h b/vector3d.h → src/vector3d.h