[postgis-tickets] [SCM] PostGIS branch master updated. 3.1.0alpha2-122-gea9947d
git at osgeo.org
git at osgeo.org
Fri Oct 30 10:35:07 PDT 2020
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "PostGIS".
The branch, master has been updated
via ea9947d6d7e9a379f663221001fc39334186c7a3 (commit)
via 29cb70c86bab7dc57af5d9ec9ded8f9080b1fc18 (commit)
from 2fb40b3b01cf4b1c5c376eeab789ecb2efde154c (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit ea9947d6d7e9a379f663221001fc39334186c7a3
Author: Sandro Santilli <strk at kbt.io>
Date: Fri Oct 30 18:34:54 2020 +0100
staged install wasn't so simple, tried another way
diff --git a/regress/Makefile.in b/regress/Makefile.in
index a585d7c..4694f7c 100644
--- a/regress/Makefile.in
+++ b/regress/Makefile.in
@@ -81,12 +81,18 @@ staged-install-raster:
$(MAKE) -C ../raster/rt_pg REGRESS=1 DESTDIR=$(REGRESS_INSTALLDIR) install; \
fi
-staged-install: staged-install-raster staged-install-topology staged-install-sfcgal
+staged-install-core:
$(MAKE) -C ../postgis REGRESS=1 DESTDIR=$(REGRESS_INSTALLDIR) install
$(MAKE) -C ../ REGRESS=1 DESTDIR=$(REGRESS_INSTALLDIR) comments-install
$(PERL) -pi -e 's,\$$libdir,$(REGRESS_INSTALLDIR)/lib,g' $(REGRESS_INSTALLDIR)/share/contrib/postgis/*.sql
#$(MAKE) -C ../loader REGRESS=1 DESTDIR=$(REGRESS_INSTALLDIR) install
+staged-install:
+ $(MAKE) staged-install-core
+ $(MAKE) staged-install-raster
+ $(MAKE) staged-install-topology
+ $(MAKE) staged-install-sfcgal
+
garden: staged-install
createdb postgis_garden
createlang plpgsql postgis_garden || true #tolerate an error here
commit 29cb70c86bab7dc57af5d9ec9ded8f9080b1fc18
Author: Sandro Santilli <strk at kbt.io>
Date: Fri Oct 30 18:33:47 2020 +0100
Revert "Make staged-install rule parallel-safe"
This reverts commit 2fb40b3b01cf4b1c5c376eeab789ecb2efde154c.
diff --git a/regress/Makefile.in b/regress/Makefile.in
index e98768b..a585d7c 100644
--- a/regress/Makefile.in
+++ b/regress/Makefile.in
@@ -66,8 +66,26 @@ distclean: clean
rm -f dumper/Makefile
rm -f sfcgal/Makefile
-staged-install:
- $(MAKE) -C .. REGRESS=1 DESTDIR=$(REGRESS_INSTALLDIR) install
+staged-install-sfcgal:
+ @if test x"@SFCGAL@" != "x"; then \
+ $(MAKE) -C ../sfcgal REGRESS=1 DESTDIR=$(REGRESS_INSTALLDIR) install; \
+ fi
+
+staged-install-topology:
+ @if test x"@TOPOLOGY@" != "x"; then \
+ $(MAKE) -C ../topology REGRESS=1 DESTDIR=$(REGRESS_INSTALLDIR) install; \
+ fi
+
+staged-install-raster:
+ @if test x"@RASTER@" != "x"; then \
+ $(MAKE) -C ../raster/rt_pg REGRESS=1 DESTDIR=$(REGRESS_INSTALLDIR) install; \
+ fi
+
+staged-install: staged-install-raster staged-install-topology staged-install-sfcgal
+ $(MAKE) -C ../postgis REGRESS=1 DESTDIR=$(REGRESS_INSTALLDIR) install
+ $(MAKE) -C ../ REGRESS=1 DESTDIR=$(REGRESS_INSTALLDIR) comments-install
+ $(PERL) -pi -e 's,\$$libdir,$(REGRESS_INSTALLDIR)/lib,g' $(REGRESS_INSTALLDIR)/share/contrib/postgis/*.sql
+ #$(MAKE) -C ../loader REGRESS=1 DESTDIR=$(REGRESS_INSTALLDIR) install
garden: staged-install
createdb postgis_garden
-----------------------------------------------------------------------
Summary of changes:
regress/Makefile.in | 26 +++++++++++++++++++++++++-
1 file changed, 25 insertions(+), 1 deletion(-)
hooks/post-receive
--
PostGIS
More information about the postgis-tickets
mailing list