Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/calendar.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorg Ehrke <developer@georgehrke.com>2017-09-11 19:03:47 +0300
committerGeorg Ehrke <developer@georgehrke.com>2017-09-11 19:10:01 +0300
commit45e9b353c82ef1a25a840df4b0d5427b238be40e (patch)
treeb67267f47a1dc77ded1b3af61022415ebe1de1f4 /Makefile
parentbd798a42ca540abf067608fcc313c6897c7dfb57 (diff)
Only use tar --exclude-vcs-ignores if tar >= 1.28
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile10
1 files changed, 9 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 6befe814..a04940c9 100644
--- a/Makefile
+++ b/Makefile
@@ -77,6 +77,8 @@ endif
endif
endif
+TAR_CAN_EXCLUDE_VCS=$(shell expr `tar --version | grep ^tar | sed 's/^.* //g'` \>= 1.28)
+
all: build
# Fetches the PHP and JS dependencies and compiles the JS. If no composer.json
@@ -125,7 +127,9 @@ source:
--exclude=/js/node_modules/ \
--exclude=*.log
ifdef CAN_SIGN
+ mv $(configdir)/config.php $(configdir)/config-2.php
$(sign) --path "$(source_build_directory)"
+ mv $(configdir)/config-2.php $(configdir)/config.php
else
@echo $(sign_skip_msg)
endif
@@ -156,8 +160,12 @@ ifdef CAN_SIGN
else
@echo $(sign_skip_msg)
endif
- tar -czf $(appstore_package_name).tar.gz -C $(appstore_build_directory)/../ --exclude-vcs-ignores --exclude='.gitignore' $(app_name)
+ifeq "$(TAR_CAN_EXCLUDE_VCS)" "1"
+ tar -czf $(appstore_package_name).tar.gz -C $(appstore_build_directory)/../ --exclude-vcs-ignores --exclude='.gitignore' $(app_name)
+else
+ tar -czf $(appstore_package_name).tar.gz -C $(appstore_build_directory)/../ --exclude='.gitignore' $(app_name)
+endif
# Command for running JS and PHP tests. Works for package.json files in the js/
# and root directory. If phpunit is not installed systemwide, a copy is fetched