[libeufin] 02/02: separate compile and install step

[gnunet]

This is an automated email from the git hooks/post-receive script.

dold pushed a commit to branch master
in repository libeufin.

commit 171fdd75f8d3e351d244161acb8ee8d635230370
Author: Florian Dold <florian@dold.me>
AuthorDate: Tue Nov 28 00:35:50 2023 +0100

    separate compile and install step
---
 Makefile     | 41 ++++++++++++++++++++++++++++-------------
 debian/rules |  6 +-----
 2 files changed, 29 insertions(+), 18 deletions(-)

diff --git a/Makefile b/Makefile
index 5fe523e4..a805ad04 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,10 @@
 
 include build-system/config.mk
 
-all: assemble
+# Default target, must be at the top.
+# Should be changed with care to not break (Debian) packaging.
+all: compile
+
 git-archive-all = 
./build-system/taler-build-scripts/archive-with-submodules/git_archive_all.py
 git_tag=$(shell git describe --tags)
 gradle_version=$(shell ./gradlew -q libeufinVersion)
@@ -20,6 +23,14 @@ spa_dir=$(abs_destdir)$(prefix)/share/libeufin/spa
 sql_dir=$(abs_destdir)$(prefix)/share/libeufin/sql
 config_dir=$(abs_destdir)$(prefix)/share/libeufin/config.d
 
+
+# While the gradle command sounds like it's installing something,
+# it's like a destdir install that only touches the source tree.
+.PHONY: compile
+compile:
+       ./gradlew bank:installShadowDist nexus:installShadowDist
+
+
 .PHONY: dist
 dist:
        $(call versions_check)
@@ -30,26 +41,26 @@ dist:
 deb:
        dpkg-buildpackage -rfakeroot -b -uc -us
 
-.PHONY: install
-install: install-bank install-nexus
+# Install without attempting to build first
+.PHONY: install-nobuild
+install-nobuild: install-nobuild-bank install-nobuild-nexus
 
 
-.PHONY: install-common
-install-common:
+.PHONY: install-nobuild-common
+install-nobuild-common:
        install -D -t $(config_dir) contrib/currencies.conf 
        install -D -t $(sql_dir) database-versioning/versioning.sql 
 
-.PHONY: install-bank-files
-install-bank-files:
+.PHONY: install-nobuild-bank-files
+install-nobuild-bank-files:
        install -D -t $(config_dir) contrib/bank.conf
        install -D -t $(sql_dir) database-versioning/libeufin-bank*.sql
        install -D -t $(sql_dir) database-versioning/libeufin-conversion*.sql
 
-.PHONY: install-bank
-install-bank: install-common install-bank-files
+.PHONY: install-nobuild-bank
+install-nobuild-bank: install-nobuild-common install-nobuild-bank-files
        install -d $(spa_dir)
        cp contrib/wallet-core/demobank/* $(spa_dir)/
-       ./gradlew bank:installShadowDist
        install -d $(abs_destdir)$(prefix)
        rm -f bank/build/install/bank-shadow/bin/*.bat
        cp -r bank/build/install/bank-shadow/* -d $(abs_destdir)$(prefix)
@@ -57,16 +68,20 @@ install-bank: install-common install-bank-files
        cp contrib/libeufin-bank-dbinit -d $(abs_destdir)$(prefix)/bin
        cp contrib/libeufin-bank-dbconfig -d $(abs_destdir)$(prefix)/bin
 
-.PHONY: install-nexus
-install-nexus: install-common
+.PHONY: install-nobuild-nexus
+install-nobuild-nexus: install-nobuild-common
        install -D -t $(config_dir) contrib/nexus.conf
        install -D -t $(sql_dir) database-versioning/libeufin-nexus*.sql
        install -D -t $(man_dir)/man1 doc/prebuilt/man/libeufin-nexus.1
        install -D -t $(man_dir)/man5 doc/prebuilt/man/libeufin-nexus.conf.5
-       ./gradlew nexus:installShadowDist
        rm -f nexus/build/install/nexus-shadow/bin/*.bat
        cp -r nexus/build/install/nexus-shadow/* -d $(abs_destdir)$(prefix)
 
+.PHONY: install
+install:
+       $(MAKE) compile
+       $(MAKE) install-nobuild
+
 .PHONY: assemble
 assemble:
        ./gradlew assemble
diff --git a/debian/rules b/debian/rules
index 4c18c906..f338080b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,16 +16,12 @@ clean:
        rm -rf libeufin-bank-$(FULLVER)
        rm -rf libeufin-nexus-$(FULLVER)
 
-# Override the build step, because we current need to do it manually
-# outside the regular Debian package build.
-override_dh_auto_build:
-       true
 override_dh_auto_test:
        true
+
 override_dh_auto_configure:
        ./configure --prefix=/usr
 
-
 # Override this step because it's very slow and likely
 # unnecessary for us.
 override_dh_strip_nondeterminism:

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.