From 2d97aa77815ff866dee514d1a63ec9ee26b20a0e Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Sat, 23 Jul 2016 14:13:56 +0200 Subject: Remove Delicious in project description in comments --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 75c54f28..52d20090 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -# Shaarli, the personal, minimalist, super-fast, no-database delicious clone. +# The personal, minimalist, super-fast, database free, bookmarking service. # Makefile for PHP code analysis & testing # Prerequisites: -- cgit v1.2.3 From 559315ba0a89e306bc46d0a540f1536193860580 Mon Sep 17 00:00:00 2001 From: VirtualTam Date: Sat, 23 Jul 2016 19:26:05 +0200 Subject: Makefile: generate release archives including 3rd-party libraries Relates to #607 Archive creation process (tar, zip): - let Composer resolve functional (no-dev) dependencies - call git-archive to generate a release archive - include 3rd-party dependencies to the generated archive Signed-off-by: VirtualTam --- Makefile | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 52d20090..22be0d96 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ # The personal, minimalist, super-fast, database free, bookmarking service. -# Makefile for PHP code analysis & testing +# Makefile for PHP code analysis & testing, documentation and release generation # Prerequisites: # - install Composer, either: @@ -127,6 +127,34 @@ test: @mkdir -p sandbox @$(BIN)/phpunit tests +## +# Custom release archive generation +# +# For each tagged revision, GitHub provides tar and zip archives that correspond +# to the output of git-archive +# +# These targets produce similar archives, featuring 3rd-party dependencies +# to ease deployment on shared hosting. +## +ARCHIVE_VERSION := shaarli-$$(git describe)-full + +release_archive: release_tar release_zip + +### download 3rd-party PHP libraries +composer_dependencies: clean + composer update --no-dev + find vendor/ -name ".git" -type d -exec rm -rf {} + + +### generate a release tarball and include 3rd-party dependencies +release_tar: composer_dependencies + git archive -o $(ARCHIVE_VERSION).tar HEAD + tar rvf $(ARCHIVE_VERSION).tar vendor/ + +### generate a release zip and include 3rd-party dependencies +release_zip: composer_dependencies + git archive -o $(ARCHIVE_VERSION).zip -9 HEAD + zip -r $(ARCHIVE_VERSION).zip vendor/ + ## # Targets for repository and documentation maintenance ## -- cgit v1.2.3 From ca0ed5ca42fda5b1236fe22dbd596790e9291ab2 Mon Sep 17 00:00:00 2001 From: VirtualTam Date: Sun, 16 Oct 2016 19:33:29 +0200 Subject: Update release archive generation Relates to https://github.com/shaarli/Shaarli/issues/607 Relates to https://github.com/shaarli/Shaarli/pull/608 Modifications: - match the arborescence of the archives provided by GitHub - generate compressed tarballs Signed-off-by: VirtualTam --- Makefile | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 22be0d96..60aec9a0 100644 --- a/Makefile +++ b/Makefile @@ -137,6 +137,7 @@ test: # to ease deployment on shared hosting. ## ARCHIVE_VERSION := shaarli-$$(git describe)-full +ARCHIVE_PREFIX=Shaarli/ release_archive: release_tar release_zip @@ -147,13 +148,17 @@ composer_dependencies: clean ### generate a release tarball and include 3rd-party dependencies release_tar: composer_dependencies - git archive -o $(ARCHIVE_VERSION).tar HEAD - tar rvf $(ARCHIVE_VERSION).tar vendor/ + git archive --prefix=$(ARCHIVE_PREFIX) -o $(ARCHIVE_VERSION).tar HEAD + tar rvf $(ARCHIVE_VERSION).tar --transform "s|^vendor|$(ARCHIVE_PREFIX)vendor|" vendor/ + gzip $(ARCHIVE_VERSION).tar ### generate a release zip and include 3rd-party dependencies release_zip: composer_dependencies - git archive -o $(ARCHIVE_VERSION).zip -9 HEAD - zip -r $(ARCHIVE_VERSION).zip vendor/ + git archive --prefix=$(ARCHIVE_PREFIX) -o $(ARCHIVE_VERSION).zip -9 HEAD + mkdir $(ARCHIVE_PREFIX) + rsync -a vendor/ $(ARCHIVE_PREFIX)vendor/ + zip -r $(ARCHIVE_VERSION).zip $(ARCHIVE_PREFIX)vendor/ + rm -rf $(ARCHIVE_PREFIX) ## # Targets for repository and documentation maintenance -- cgit v1.2.3