diff --git a/Makefile b/Makefile index 92e60843e..035c385e9 100644 --- a/Makefile +++ b/Makefile @@ -105,3 +105,9 @@ lint: install: compile @echo Please run \'make install\' from one of the directories in packages/\' + +# Install taler-wallet-cli and taler-harness +install-tools: + pnpm install --frozen-lockfile --filter @gnu-taler/taler-wallet-cli... --filter @gnu-taler/taler-harness... + make -C packages/taler-wallet-cli install-nodeps + make -C packages/taler-harness install-nodeps diff --git a/packages/taler-harness/Makefile b/packages/taler-harness/Makefile index 8bbca5831..7ccfab205 100644 --- a/packages/taler-harness/Makefile +++ b/packages/taler-harness/Makefile @@ -15,9 +15,8 @@ warn-noprefix: install: warn-noprefix else install_target = $(prefix)/lib/taler-harness -.PHONY: install install-nodeps -install: - pnpm install --frozen-lockfile --filter @gnu-taler/taler-harness... +.PHONY: install deps install-nodeps +install-nodeps: ./build.mjs install -d $(prefix)/bin install -d $(install_target)/bin @@ -28,4 +27,9 @@ install: install ./dist/taler-harness-bundled.cjs.map $(install_target)/node_modules/taler-harness/dist/ install ./bin/taler-harness.mjs $(install_target)/node_modules/taler-harness/bin/ ln -sf $(install_target)/node_modules/taler-harness/bin/taler-harness.mjs $(prefix)/bin/taler-harness +deps: + pnpm install --frozen-lockfile --filter @gnu-taler/taler-harness... +install: + $(MAKE) deps + $(MAKE) install-nodeps endif diff --git a/packages/taler-wallet-cli/Makefile b/packages/taler-wallet-cli/Makefile index 4cd9aeb90..98116bbbd 100644 --- a/packages/taler-wallet-cli/Makefile +++ b/packages/taler-wallet-cli/Makefile @@ -15,9 +15,8 @@ warn-noprefix: install: warn-noprefix else install_target = $(prefix)/lib/taler-wallet-cli -.PHONY: install install-nodeps -install: - pnpm install --frozen-lockfile --filter @gnu-taler/taler-wallet-cli... +.PHONY: install install-nodeps deps +install-nodeps: install -d $(prefix)/bin install -d $(install_target)/bin install -d $(install_target)/node_modules/taler-wallet-cli @@ -27,4 +26,9 @@ install: install ./dist/taler-wallet-cli.mjs.map $(install_target)/node_modules/taler-wallet-cli/dist/ install ./bin/taler-wallet-cli.mjs $(install_target)/node_modules/taler-wallet-cli/bin/ ln -sf $(install_target)/node_modules/taler-wallet-cli/bin/taler-wallet-cli.mjs $(prefix)/bin/taler-wallet-cli +deps: + pnpm install --frozen-lockfile --filter @gnu-taler/taler-wallet-cli... +install: + $(MAKE) deps + $(MAKE) install-nodeps endif