[postgis] 10/10: Reorder rules targets in order of execution.
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Fri Sep 25 21:31:05 UTC 2015
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch experimental
in repository postgis.
commit d1dd8e6ee1d098421de03ebf6223eaa2e32a6bea
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Fri Sep 25 23:16:15 2015 +0200
Reorder rules targets in order of execution.
---
debian/changelog | 1 +
debian/rules | 141 ++++++++++++++++++++++++++++---------------------------
2 files changed, 72 insertions(+), 70 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index d5dceb0..4b88e7a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,6 +25,7 @@ postgis (2.2.0~rc1+dfsg-1) UNRELEASED; urgency=medium
* Rename liblwgeom package to match SONAME.
* Update symbols for sfcgal & version 2.2.0 RC1.
* Update fix-spelling patch for additional typos.
+ * Reorder rules targets in order of execution.
-- Markus Wanner <markus at bluegap.ch> Fri, 25 Sep 2015 19:19:19 +0200
diff --git a/debian/rules b/debian/rules
index b7f02a0..f6f8bdf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -97,38 +97,36 @@ COMMON_CONFIGURE_ARGS = --host=$(DEB_HOST_GNU_TYPE) \
--infodir=\$${prefix}/share/info \
--with-gui
-build: build-arch build-indep
-
-build-arch: build-arch-stamp check
-build-arch-stamp: configuration-stamp
-# Build against the newest Postgres version
- $(MAKE)
- $(MAKE) -C doc
+clean: debian/control
+ dh_testdir
+ dh_testroot
-# Build against all other Postgres versions
+# Clean all separate build directories.
(set -e; \
for PGVER in $(OTHER_POSTGRES_VERSIONS); do \
- $(MAKE) -C $(CURDIR)/debian/build-$$PGVER; \
+ rm -rf $(CURDIR)/debian/build-$$PGVER; \
done)
- touch $@
+ [ ! -f GNUmakefile ] || $(MAKE) distclean || true
+ [ ! -f GNUmakefile ] || $(MAKE) -C doc images-clean || true
-build-indep: build-indep-stamp
-build-indep-stamp: configuration-stamp
-# Let PostGIS create a perl script from postgis_restore.pl.in
- $(MAKE) -C utils
+# Cleanup after the Makefile
+ rm -f postgis/postgis_upgrade_20_minor.sql.in \
+ raster/rt_pg/rtpostgis_drop.sql \
+ raster/rt_pg/rtpostgis_upgrade_cleanup.sql
-# Create a few SQL scripts that the Makefiles are not clever enough
-# to resolve, when building arch-indep only.
- $(MAKE) -C postgis postgis.sql postgis_upgrade.sql
- $(MAKE) -C raster/rt_pg rtpostgis.sql rtpostgis_upgrade.sql
- $(MAKE) -C topology topology.sql topology_upgrade.sql
+# Cleanup auto-generated packaging control files
+ rm -f $(CURDIR)/debian/postgresql-*-postgis-2.2.install
+ rm -f $(CURDIR)/debian/postgresql-*-postgis-scripts.install
+ rm -f loader/cunit/cu_tester
+ rm -rf liblwgeom/cunit/.libs
-# This creates the required SQL scripts. Again, the Makefile is not
-# clever enough to run this before 'install'.
- $(MAKE) -C extensions
+# Cleanup the temporary environment file.
+ rm -f postgis-check-env.tmp
- touch $@
+ dh_autotools-dev_restoreconfig
+ dh_autoreconf_clean
+ dh_clean
configuration: configuration-stamp
configuration-stamp:
@@ -166,38 +164,58 @@ configuration-stamp:
touch $@
-clean: debian/control
- dh_testdir
- dh_testroot
+build: build-arch build-indep
-# Clean all separate build directories.
+build-arch: build-arch-stamp check
+build-arch-stamp: configuration-stamp
+# Build against the newest Postgres version
+ $(MAKE)
+ $(MAKE) -C doc
+
+# Build against all other Postgres versions
(set -e; \
for PGVER in $(OTHER_POSTGRES_VERSIONS); do \
- rm -rf $(CURDIR)/debian/build-$$PGVER; \
+ $(MAKE) -C $(CURDIR)/debian/build-$$PGVER; \
done)
- [ ! -f GNUmakefile ] || $(MAKE) distclean || true
- [ ! -f GNUmakefile ] || $(MAKE) -C doc images-clean || true
+ touch $@
-# Cleanup after the Makefile
- rm -f postgis/postgis_upgrade_20_minor.sql.in \
- raster/rt_pg/rtpostgis_drop.sql \
- raster/rt_pg/rtpostgis_upgrade_cleanup.sql
+build-indep: build-indep-stamp
+build-indep-stamp: configuration-stamp
+# Let PostGIS create a perl script from postgis_restore.pl.in
+ $(MAKE) -C utils
-# Cleanup auto-generated packaging control files
- rm -f $(CURDIR)/debian/postgresql-*-postgis-2.2.install
- rm -f $(CURDIR)/debian/postgresql-*-postgis-scripts.install
- rm -f loader/cunit/cu_tester
- rm -rf liblwgeom/cunit/.libs
+# Create a few SQL scripts that the Makefiles are not clever enough
+# to resolve, when building arch-indep only.
+ $(MAKE) -C postgis postgis.sql postgis_upgrade.sql
+ $(MAKE) -C raster/rt_pg rtpostgis.sql rtpostgis_upgrade.sql
+ $(MAKE) -C topology topology.sql topology_upgrade.sql
-# Cleanup the temporary environment file.
- rm -f postgis-check-env.tmp
+# This creates the required SQL scripts. Again, the Makefile is not
+# clever enough to run this before 'install'.
+ $(MAKE) -C extensions
- dh_autotools-dev_restoreconfig
- dh_autoreconf_clean
- dh_clean
+ touch $@
+
+check: build-arch-stamp
+# Run unit tests (against the newest Postgres version only, for
+# now).
+ echo "LD_PRELOAD = '$(CURDIR)/liblwgeom/.libs/liblwgeom-$(MAJOR_VERSION).$(MINOR_VERSION).$(MICRO_VERSION).so'" \
+ > $(CURDIR)/postgis-check-env.tmp
+ (set -e; \
+ test -z '$(CHECK)' || \
+ pg_virtualenv -v $(NEWEST_POSTGRES_VERSION) \
+ -c '--environment $(CURDIR)/postgis-check-env.tmp' make check || (\
+ for LOGFILE in /tmp/pgis_reg/test_*_diff; do \
+ echo " ### $$LOGFILE ###"; \
+ cat $$LOGFILE; \
+ done; \
+ echo " ### end of log dumps ###"; \
+ exit 2) \
+ )
install: install-indep install-arch
+
install-indep: build-indep
dh_testdir
dh_testroot
@@ -284,22 +302,15 @@ install-arch: build-arch
dh_install -s
-check: build-arch-stamp
-# Run unit tests (against the newest Postgres version only, for
-# now).
- echo "LD_PRELOAD = '$(CURDIR)/liblwgeom/.libs/liblwgeom-$(MAJOR_VERSION).$(MINOR_VERSION).$(MICRO_VERSION).so'" \
- > $(CURDIR)/postgis-check-env.tmp
- (set -e; \
- test -z '$(CHECK)' || \
- pg_virtualenv -v $(NEWEST_POSTGRES_VERSION) \
- -c '--environment $(CURDIR)/postgis-check-env.tmp' make check || (\
- for LOGFILE in /tmp/pgis_reg/test_*_diff; do \
- echo " ### $$LOGFILE ###"; \
- cat $$LOGFILE; \
- done; \
- echo " ### end of log dumps ###"; \
- exit 2) \
- )
+binary: binary-arch binary-indep
+
+# Build architecture independant packages using the common target.
+binary-indep: install-indep
+ $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
+
+# Build architecture dependant packages using the common target.
+binary-arch: install-arch
+ $(MAKE) -f debian/rules DH_OPTIONS=-a binary-common
# Must not depend on anything. This is to be called by
# binary-arch/binary-indep
@@ -323,16 +334,6 @@ binary-common:
dh_md5sums
dh_builddeb
-# Build architecture independant packages using the common target.
-binary-indep: install-indep
- $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
-
-# Build architecture dependant packages using the common target.
-binary-arch: install-arch
- $(MAKE) -f debian/rules DH_OPTIONS=-a binary-common
-
-binary: binary-arch binary-indep
-
get-orig-source:
uscan --verbose --force-download
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/postgis.git
More information about the Pkg-grass-devel
mailing list