From 84e8040d7e8fc2c7cc82d8e09033934e429c31c9 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Thu, 2 Jul 2026 09:48:09 +0200 Subject: [PATCH] fix(Makefile): Add missing composer setup for dev-setups and building package Signed-off-by: Joas Schilling --- Makefile | 25 ++++++++----------------- 1 file changed, 8 insertions(+), 17 deletions(-) diff --git a/Makefile b/Makefile index f216e323b..ba5660ce8 100644 --- a/Makefile +++ b/Makefile @@ -11,22 +11,13 @@ composer=$(shell which composer 2> /dev/null) all: dev-setup build-js-production -dev-setup: clean clean-dev npm-init - -# Installs and updates the composer dependencies. If composer is not installed -# a copy is fetched from the web -composer: -ifeq (, $(composer)) - @echo "No composer command available, downloading a copy from the web" - mkdir -p $(build_tools_directory) - curl -sS https://getcomposer.org/installer | php - mv composer.phar $(build_tools_directory) - php $(build_tools_directory)/composer.phar install --prefer-dist - php $(build_tools_directory)/composer.phar update --prefer-dist -else - composer install --prefer-dist - composer update --prefer-dist -endif +dev-setup: clean clean-dev composer-dev npm-init + +composer-dev: + composer i + +composer-production: + composer i --no-dev npm-init: npm ci @@ -59,7 +50,7 @@ clean: clean-dev: rm -rf node_modules -package: dev-setup build-js-production +package: dev-setup build-js-production composer-production mkdir -p $(source_dir) rsync -a \ --exclude=/build \