repo: fix Makefiles / top-level 'make install' target

This commit is contained in:
Florian Dold 2023-06-21 09:44:02 +02:00
parent a0e0c5c4a6
commit 709adb2d48
No known key found for this signature in database
GPG Key ID: D2E4F00F29D02A4B
5 changed files with 71 additions and 14 deletions

View File

@ -115,12 +115,20 @@ lint:
./node_modules/.bin/eslint --ext '.js,.ts,.tsx' 'src' ./node_modules/.bin/eslint --ext '.js,.ts,.tsx' 'src'
install: compile .PHONY: install
@echo Please run \'make install\' from one of the directories in packages/\' # Build and install everything
install:
pnpm install
pnpm run compile
make -C packages/taler-wallet-cli TOPLEVEL=yes install-nodeps
make -C packages/taler-harness TOPLEVEL=yes install-nodeps
make -C packages/demobank-ui TOPLEVEL=yes install-nodeps
make -C packages/merchant-backoffice-ui TOPLEVEL=yes install-nodeps
.PHONY: install-tools
# Install taler-wallet-cli and taler-harness # Install taler-wallet-cli and taler-harness
install-tools: install-tools:
pnpm install --frozen-lockfile --filter @gnu-taler/taler-wallet-cli... --filter @gnu-taler/taler-harness... pnpm install --frozen-lockfile --filter @gnu-taler/taler-wallet-cli... --filter @gnu-taler/taler-harness...
pnpm run --filter @gnu-taler/taler-wallet-cli... --filter @gnu-taler/taler-harness... compile pnpm run --filter @gnu-taler/taler-wallet-cli... --filter @gnu-taler/taler-harness... compile
make -C packages/taler-wallet-cli install-nodeps make -C packages/taler-wallet-cli TOPLEVEL=yes install-nodeps
make -C packages/taler-harness install-nodeps make -C packages/taler-harness TOPLEVEL=yes install-nodeps

View File

@ -1,17 +1,35 @@
# This Makefile has been placed in the public domain # This Makefile has been placed in the public domain
# Settings from "./configure" ifeq ($(TOPLEVEL), yes)
include .config.mk $(info top-level build)
-include ../../.config.mk
else
$(info package-level build)
-include ../../.config.mk
-include .config.mk
endif
$(info prefix is $(prefix))
.PHONY: all
all: all:
@echo run \'make install\' to install @echo run \'make install\' to install
spa_dir=$(prefix)/share/taler/demobank-ui spa_dir=$(prefix)/share/taler/demobank-ui
install: .PHONY: deps
deps:
pnpm install --frozen-lockfile --filter @gnu-taler/demobank-ui... pnpm install --frozen-lockfile --filter @gnu-taler/demobank-ui...
pnpm run check pnpm run check
pnpm run build pnpm run build
.PHONY: install-nodeps
install-nodeps:
install -d $(spa_dir) install -d $(spa_dir)
install ./dist/prod/* $(spa_dir) install ./dist/prod/* $(spa_dir)
.PHONY: install
install:
$(MAKE) deps
$(MAKE) install-nodeps

View File

@ -1,15 +1,34 @@
# This Makefile has been placed in the public domain # This Makefile has been placed in the public domain
# Settings from "./configure" ifeq ($(TOPLEVEL), yes)
include .config.mk $(info top-level build)
-include ../../.config.mk
else
$(info package-level build)
-include ../../.config.mk
-include .config.mk
endif
$(info prefix is $(prefix))
.PHONY: all
all: all:
@echo run \'make install\' to install @echo run \'make install\' to install
spa_dir=$(prefix)/share/taler/merchant-backoffice spa_dir=$(prefix)/share/taler/merchant-backoffice
install: .PHONY: deps
deps:
pnpm install --frozen-lockfile --filter @gnu-taler/merchant-backoffice... pnpm install --frozen-lockfile --filter @gnu-taler/merchant-backoffice...
pnpm run build pnpm run build
.PHONY: install-nodeps
install-nodeps:
(cd dist/prod && find . -type f -exec install -D "{}" "$(spa_dir)/{}" \;) (cd dist/prod && find . -type f -exec install -D "{}" "$(spa_dir)/{}" \;)
.PHONY: install
install:
$(MAKE) deps
$(MAKE) install-nodeps

View File

@ -1,7 +1,13 @@
# This Makefile has been placed in the public domain. # This Makefile has been placed in the public domain.
ifeq ($(TOPLEVEL), yes)
$(info top-level build)
-include ../../.config.mk -include ../../.config.mk
#include .config.mk else
$(info package-level build)
-include ../../.config.mk
-include .config.mk
endif
$(info prefix is $(prefix)) $(info prefix is $(prefix))

View File

@ -1,7 +1,13 @@
# This Makefile has been placed in the public domain. # This Makefile has been placed in the public domain.
ifeq ($(TOPLEVEL), yes)
$(info top-level build)
-include ../../.config.mk -include ../../.config.mk
#include .config.mk else
$(info package-level build)
-include ../../.config.mk
-include .config.mk
endif
$(info prefix is $(prefix)) $(info prefix is $(prefix))