Makefile: Use GNU tar if available (#1957)
This commit is contained in:
parent
c0c743f9c6
commit
6624f00c05
2 changed files with 11 additions and 3 deletions
13
Makefile
13
Makefile
|
@ -24,6 +24,13 @@ docker_%:
|
||||||
##
|
##
|
||||||
PHPCS := $(BIN)/phpcs
|
PHPCS := $(BIN)/phpcs
|
||||||
|
|
||||||
|
# Use GNU Tar where available
|
||||||
|
ifneq (, $(shell which gtar))
|
||||||
|
TAR := gtar
|
||||||
|
else
|
||||||
|
TAR := tar
|
||||||
|
endif
|
||||||
|
|
||||||
code_sniffer:
|
code_sniffer:
|
||||||
@$(PHPCS)
|
@$(PHPCS)
|
||||||
|
|
||||||
|
@ -115,9 +122,9 @@ build_frontend: frontend_dependencies
|
||||||
### generate a release tarball and include 3rd-party dependencies and translations
|
### generate a release tarball and include 3rd-party dependencies and translations
|
||||||
release_tar: composer_dependencies htmldoc translate build_frontend
|
release_tar: composer_dependencies htmldoc translate build_frontend
|
||||||
git archive --prefix=$(ARCHIVE_PREFIX) -o $(ARCHIVE_VERSION).tar HEAD
|
git archive --prefix=$(ARCHIVE_PREFIX) -o $(ARCHIVE_VERSION).tar HEAD
|
||||||
tar rvf $(ARCHIVE_VERSION).tar --transform "s|^vendor|$(ARCHIVE_PREFIX)vendor|" vendor/
|
$(TAR) rvf $(ARCHIVE_VERSION).tar --transform "s|^vendor|$(ARCHIVE_PREFIX)vendor|" vendor/
|
||||||
tar rvf $(ARCHIVE_VERSION).tar --transform "s|^doc/html|$(ARCHIVE_PREFIX)doc/html|" doc/html/
|
$(TAR) rvf $(ARCHIVE_VERSION).tar --transform "s|^doc/html|$(ARCHIVE_PREFIX)doc/html|" doc/html/
|
||||||
tar rvf $(ARCHIVE_VERSION).tar --transform "s|^tpl|$(ARCHIVE_PREFIX)tpl|" tpl/
|
$(TAR) rvf $(ARCHIVE_VERSION).tar --transform "s|^tpl|$(ARCHIVE_PREFIX)tpl|" tpl/
|
||||||
gzip $(ARCHIVE_VERSION).tar
|
gzip $(ARCHIVE_VERSION).tar
|
||||||
|
|
||||||
### generate a release zip and include 3rd-party dependencies and translations
|
### generate a release zip and include 3rd-party dependencies and translations
|
||||||
|
|
|
@ -14,6 +14,7 @@ This guide assumes that you have:
|
||||||
- create a new release
|
- create a new release
|
||||||
- [Composer](https://getcomposer.org/) needs to be installed
|
- [Composer](https://getcomposer.org/) needs to be installed
|
||||||
- The [venv](https://docs.python.org/3/library/venv.html) Python 3 module needs to be installed for HTML documentation generation.
|
- The [venv](https://docs.python.org/3/library/venv.html) Python 3 module needs to be installed for HTML documentation generation.
|
||||||
|
- Make sure you have GNU `tar` installed (not BSD `tar`). On macOS, you can install it with `brew install gnu-tar`.
|
||||||
|
|
||||||
## Release notes and `CHANGELOG.md`
|
## Release notes and `CHANGELOG.md`
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue