From: ArthurHoaro Date: Mon, 30 Jul 2018 16:29:06 +0000 (+0200) Subject: Merge pull request #1191 from ArthurHoaro/hotfix/daily-thumb X-Git-Tag: v0.10.1~8 X-Git-Url: https://git.immae.eu/?p=github%2Fshaarli%2FShaarli.git;a=commitdiff_plain;h=75c4b0d03b6e9a4323675091dbfa664a1bd006eb;hp=bf3c9934d2dc02cead5995570239c5c6230ed5e5 Merge pull request #1191 from ArthurHoaro/hotfix/daily-thumb Fix fatal error on daily page: use new thumbnail system --- diff --git a/Makefile b/Makefile index b0cdadf0..56cf09b2 100644 --- a/Makefile +++ b/Makefile @@ -170,6 +170,7 @@ release_tar: composer_dependencies htmldoc translate build_frontend 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|^doc/html|$(ARCHIVE_PREFIX)doc/html|" doc/html/ + tar rvf $(ARCHIVE_VERSION).tar --transform "s|^tpl|$(ARCHIVE_PREFIX)tpl|" tpl/ gzip $(ARCHIVE_VERSION).tar ### generate a release zip and include 3rd-party dependencies and translations @@ -180,6 +181,8 @@ release_zip: composer_dependencies htmldoc translate build_frontend zip -r $(ARCHIVE_VERSION).zip $(ARCHIVE_PREFIX)doc/ rsync -a vendor/ $(ARCHIVE_PREFIX)vendor/ zip -r $(ARCHIVE_VERSION).zip $(ARCHIVE_PREFIX)vendor/ + rsync -a tpl/ $(ARCHIVE_PREFIX)tpl/ + zip -r $(ARCHIVE_VERSION).zip $(ARCHIVE_PREFIX)tpl/ rm -rf $(ARCHIVE_PREFIX) ##