From: Regina Obe <lr@pcorp.us>
Date: Fri, 27 Jun 2014 21:09:06 +0000 (+0000)
Subject: #2754 postgis_sfcgal extension oops missed new extension folder
X-Git-Tag: 2.2.0rc1~1043
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7c5c9367521df1ce9e35ac539b87de5f2613b08f;p=postgis

#2754 postgis_sfcgal extension oops missed new extension folder

git-svn-id: http://svn.osgeo.org/postgis/trunk@12690 b70326c6-7e19-0410-871a-916f4a2858ee
---

diff --git a/extensions/postgis_sfcgal/Makefile.in b/extensions/postgis_sfcgal/Makefile.in
new file mode 100644
index 000000000..e2ce72901
--- /dev/null
+++ b/extensions/postgis_sfcgal/Makefile.in
@@ -0,0 +1,89 @@
+include ../upgradeable_versions.mk
+
+EXTENSION    = postgis_sfcgal
+EXTVERSION    = @POSTGIS_LIB_VERSION@
+MINORVERSION  = @POSTGIS_MAJOR_VERSION@.@POSTGIS_MINOR_VERSION@
+GREP = @GREP@
+
+MICRO_NUMBER  = $(shell echo $(EXTVERSION) | sed "s/[0-9]\.[0-9]\.\([0-9]*\)[a-zA-Z]*[0-9]*/\1/")
+PREREL_NUMBER = $(shell echo $(EXTVERSION) | \
+                        sed "s/[0-9]\.[0-9]\.\(.*\)/\1/" | \
+                        $(GREP) "[a-zA-Z]" | \
+                        sed "s/[0-9][a-zA-Z]\([0-9]*\)[a-zA-Z]*/\1/")
+MICRO_PREV    = $(shell if test "$(MICRO_NUMBER)x" != "x"; then expr $(MICRO_NUMBER) - 1; fi)
+PREREL_PREV   = $(shell if test "$(PREREL_NUMBER)x" != "x"; then expr $(PREREL_NUMBER) - 1; fi)
+
+PREREL_PREFIX = $(shell echo $(EXTVERSION) | \
+                        sed "s/[0-9]\.[0-9]\.\(.*\)/\1/" | \
+                        $(GREP) "[a-zA-Z]" | \
+                        sed "s/\([0-9][a-zA-Z]*\)[0-9]*/\1/")
+
+DATA         = $(filter-out $(wildcard sql/*--*.sql),$(wildcard sql/*.sql))
+
+PG_CONFIG    =  @PG_CONFIG@
+
+PG91         = $(shell $(PG_CONFIG) --version | $(GREP) -qE " 8\.| 9\.0" && echo no || echo yes)
+SQL_BITS     = $(wildcard sql_bits/*.sql)
+EXTRA_CLEAN += sql/*.sql ${SQL_BITS} 
+
+
+ifeq ($(PG91),yes)
+all: sql/$(EXTENSION)--$(EXTVERSION).sql sql/$(EXTENSION)--unpackaged--$(EXTVERSION).sql sql/$(EXTENSION)--$(EXTVERSION)--$(EXTVERSION)next.sql sql/$(EXTENSION)--$(EXTVERSION)next--$(EXTVERSION).sql sql_minor_upgrade
+
+sql/$(EXTENSION)--$(EXTVERSION).sql: sql/$(EXTENSION).sql
+	mkdir -p sql
+	cp $< $@
+	
+sql/$(EXTENSION).sql: sql_bits/sfcgal.sql  sql_bits/sfcgal_comments.sql
+	mkdir -p sql
+	cat $^ > $@
+
+#this is a cludge to allow upgrading from same SVN to same SVN
+sql/$(EXTENSION)--$(EXTVERSION)--$(EXTVERSION)next.sql: ../postgis_extension_helper.sql sql_bits/sfcgal_upgrade_minor.sql sql_bits/sfcgal_comments.sql ../postgis_extension_helper_uninstall.sql
+	mkdir -p sql
+	cat $^ > $@
+sql/$(EXTENSION)--$(EXTVERSION)next--$(EXTVERSION).sql: sql/$(EXTENSION)--$(EXTVERSION)--$(EXTVERSION)next.sql
+	mkdir -p sql
+	cp $< $@
+	
+sql_bits/sfcgal.sql: ../../postgis/sfcgal.sql
+	mkdir -p sql_bits
+	sed -e 's/BEGIN;//g' -e 's/COMMIT;//g'  $< > $@
+	
+../../doc/sfcgal_comments.sql:
+	$(MAKE) -C ../../doc comments
+	
+sql_bits/sfcgal_comments.sql: ../../doc/sfcgal_comments.sql
+	mkdir -p sql_bits
+	cp $< $@
+	
+#grep all lines that start with CREATE OR REPLACE FUNCTION, TRIGGER...
+#then replace CREATE OR REPLACE .. with ALTER EXTENSION..;
+#then remove default values and extra junk
+sql/$(EXTENSION)--unpackaged--$(EXTVERSION).sql: sql_bits/sfcgal.sql ../../utils/create_unpackaged.pl
+	mkdir -p sql
+	cat $< | ../../utils/create_unpackaged.pl postgis_topology > $@
+
+sql_bits/sfcgal_upgrade.sql : ../../postgis/sfcgal_upgrade.sql
+	mkdir -p sql_bits
+	cp $< $@
+
+sql_bits/sfcgal_upgrade_minor.sql: ../postgis_extension_helper.sql sql_bits/sfcgal_upgrade.sql ../../doc/sfcgal_comments.sql ../postgis_extension_helper_uninstall.sql
+	mkdir -p sql_bits
+	echo '\echo Use "CREATE EXTENSION $(EXTENSION)" to load this file. \quit' > $@
+	cat $^ >> $@
+
+sql_minor_upgrade: sql_bits/sfcgal_upgrade_minor.sql
+	for OLD_VERSION in $(UPGRADEABLE_VERSIONS); do \
+  	  cat $< > sql/$(EXTENSION)--$$OLD_VERSION--$(EXTVERSION).sql; \
+	done
+	
+DATA = $(wildcard sql/*--*.sql)
+EXTRA_CLEAN += sql/$(EXTENSION)--$(EXTVERSION).sql sql/$(EXTENSION)--unpackaged--$(EXTVERSION).sql
+endif
+
+distclean: clean
+	rm Makefile
+
+PGXS := $(shell $(PG_CONFIG) --pgxs)
+include $(PGXS)
diff --git a/extensions/postgis_sfcgal/postgis_sfcgal.control.in b/extensions/postgis_sfcgal/postgis_sfcgal.control.in
new file mode 100644
index 000000000..d50586ccf
--- /dev/null
+++ b/extensions/postgis_sfcgal/postgis_sfcgal.control.in
@@ -0,0 +1,5 @@
+# postgis topology extension
+comment = 'PostGIS SFCGAL functions'
+default_version = '@POSTGIS_LIB_VERSION@'
+relocatable = false
+requires = postgis