Convert contrib modules to use the extension facility.

This isn't fully tested as yet, in particular I'm not sure that the
"foo--unpackaged--1.0.sql" scripts are OK.  But it's time to get some
buildfarm cycles on it.

sepgsql is not converted to an extension, mainly because it seems to
require a very nonstandard installation process.

Dimitri Fontaine and Tom Lane

6 files changed, 21 insertions, 23 deletions

diff --git a/contrib/uuid-ossp/.gitignore b/contrib/uuid-ossp/.gitignore
deleted file mode 100644
index ece095ad7b..0000000000
--- a/contrib/uuid-ossp/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/uuid-ossp.sql
diff --git a/contrib/uuid-ossp/Makefile b/contrib/uuid-ossp/Makefile
index 77ea87409f..9b2d2e3ff9 100644
--- a/contrib/uuid-ossp/Makefile
+++ b/contrib/uuid-ossp/Makefile
@@ -2,8 +2,9 @@
 
 MODULE_big = uuid-ossp
 OBJS = uuid-ossp.o
-DATA_built = uuid-ossp.sql
-DATA = uninstall_uuid-ossp.sql
+
+EXTENSION = uuid-ossp
+DATA = uuid-ossp--1.0.sql uuid-ossp--unpackaged--1.0.sql
 
 SHLIB_LINK += $(OSSP_UUID_LIBS)
 
diff --git a/contrib/uuid-ossp/uninstall_uuid-ossp.sql b/contrib/uuid-ossp/uninstall_uuid-ossp.sql
deleted file mode 100644
index 0fafb2721f..0000000000
--- a/contrib/uuid-ossp/uninstall_uuid-ossp.sql
+++ /dev/null
@@ -1,16 +0,0 @@
-/* contrib/uuid-ossp/uninstall_uuid-ossp.sql */
-
--- Adjust this setting to control where the objects get dropped.
-SET search_path = public;
-
-DROP FUNCTION uuid_nil();
-DROP FUNCTION uuid_ns_dns();
-DROP FUNCTION uuid_ns_url();
-DROP FUNCTION uuid_ns_oid();
-DROP FUNCTION uuid_ns_x500();
-
-DROP FUNCTION uuid_generate_v1();
-DROP FUNCTION uuid_generate_v1mc();
-DROP FUNCTION uuid_generate_v3(namespace uuid, name text);
-DROP FUNCTION uuid_generate_v4();
-DROP FUNCTION uuid_generate_v5(namespace uuid, name text);
diff --git a/contrib/uuid-ossp/uuid-ossp.sql.in b/contrib/uuid-ossp/uuid-ossp--1.0.sql
index 71212cde48..34b32de77e 100644
--- a/contrib/uuid-ossp/uuid-ossp.sql.in
+++ b/contrib/uuid-ossp/uuid-ossp--1.0.sql
@@ -1,7 +1,4 @@
-/* contrib/uuid-ossp/uuid-ossp.sql.in */
-
--- Adjust this setting to control where the objects get created.
-SET search_path = public;
+/* contrib/uuid-ossp/uuid-ossp--1.0.sql */
 
 CREATE OR REPLACE FUNCTION uuid_nil()
 RETURNS uuid
diff --git a/contrib/uuid-ossp/uuid-ossp--unpackaged--1.0.sql b/contrib/uuid-ossp/uuid-ossp--unpackaged--1.0.sql
new file mode 100644
index 0000000000..bc984dd8c0
--- /dev/null
+++ b/contrib/uuid-ossp/uuid-ossp--unpackaged--1.0.sql
@@ -0,0 +1,12 @@
+/* contrib/uuid-ossp/uuid-ossp--unpackaged--1.0.sql */
+
+ALTER EXTENSION "uuid-ossp" ADD function uuid_nil();
+ALTER EXTENSION "uuid-ossp" ADD function uuid_ns_dns();
+ALTER EXTENSION "uuid-ossp" ADD function uuid_ns_url();
+ALTER EXTENSION "uuid-ossp" ADD function uuid_ns_oid();
+ALTER EXTENSION "uuid-ossp" ADD function uuid_ns_x500();
+ALTER EXTENSION "uuid-ossp" ADD function uuid_generate_v1();
+ALTER EXTENSION "uuid-ossp" ADD function uuid_generate_v1mc();
+ALTER EXTENSION "uuid-ossp" ADD function uuid_generate_v3(namespace uuid, name text);
+ALTER EXTENSION "uuid-ossp" ADD function uuid_generate_v4();
+ALTER EXTENSION "uuid-ossp" ADD function uuid_generate_v5(namespace uuid, name text);
diff --git a/contrib/uuid-ossp/uuid-ossp.control b/contrib/uuid-ossp/uuid-ossp.control
new file mode 100644
index 0000000000..f52ae99d41
--- /dev/null
+++ b/contrib/uuid-ossp/uuid-ossp.control
@@ -0,0 +1,5 @@
+# uuid-ossp extension
+comment = 'generate universally unique identifiers (UUIDs)'
+default_version = '1.0'
+module_pathname = '$libdir/uuid-ossp'
+relocatable = true