From bffcce701e29d1954a76f0a5ec472241ed26efc2 Mon Sep 17 00:00:00 2001
From: Christian Wolf <github@christianwolf.email>
Date: Fri, 11 Dec 2020 15:48:12 +0100
Subject: [PATCH] Update the makefile to allow a non-dev installation from
 composer

Signed-off-by: Christian Wolf <github@christianwolf.email>

Remove webpack config from tarball

Signed-off-by: Christian Wolf <github@christianwolf.email>
---
 Makefile | 29 +++++++++++++++++++++++++----
 1 file changed, 25 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index cf93ea36..156ed587 100755
--- a/Makefile
+++ b/Makefile
@@ -65,15 +65,21 @@ ifneq (,$(wildcard $(CURDIR)/js/package.json))
 	make npm
 endif
 
-# Installs and updates the composer dependencies. If composer is not installed
-# a copy is fetched from the web
-.PHONY: composer
-composer:
+
+.PHONY: install_composer
+install_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)
+endif
+
+# Installs and updates the composer dependencies. If composer is not installed
+# a copy is fetched from the web
+.PHONY: composer
+composer: install_composer
+ifeq (, $(composer))
 	php $(build_tools_directory)/composer.phar install --prefer-dist
 	php $(build_tools_directory)/composer.phar update --prefer-dist
 else
@@ -81,6 +87,14 @@ else
 	composer update --prefer-dist
 endif
 
+.PHONY: composer_dist
+composer_dist: install_composer
+ifeq (, $(composer))
+	php $(build_tools_directory)/composer.phar install --prefer-dist --no-dev
+else
+	composer install --prefer-dist --no-dev
+endif
+
 # Installs npm dependencies
 .PHONY: npm
 npm:
@@ -132,6 +146,7 @@ appstore:
 	tar cvzf $(appstore_package_name).tar.gz \
 	--exclude-vcs \
 	--exclude="../$(app_name)/build" \
+	--exclude="../$(app_name)/documentation" \
 	--exclude="../$(app_name)/tests" \
 	--exclude="../$(app_name)/Makefile" \
 	--exclude="../$(app_name)/*.log" \
@@ -145,11 +160,17 @@ appstore:
 	--exclude="../$(app_name)/js/bower.json" \
 	--exclude="../$(app_name)/js/karma.*" \
 	--exclude="../$(app_name)/js/protractor.*" \
+	--exclude="../$(app_name)/node_modules" \
+	--exclude="../$(app_name)/src" \
+	--exclude="../$(app_name)/translationfiles" \
+	--exclude="../$(app_name)/draft-release.sh" \
 	--exclude="../$(app_name)/package.json" \
+	--exclude="../$(app_name)/package-lock.json" \
 	--exclude="../$(app_name)/bower.json" \
 	--exclude="../$(app_name)/karma.*" \
 	--exclude="../$(app_name)/protractor\.*" \
 	--exclude="../$(app_name)/.*" \
+	--exclude="../$(app_name)/webpack.*.js" \
 	--exclude="../$(app_name)/js/.*" \
 	../$(app_name)