]> git.immae.eu Git - github/shaarli/Shaarli.git/commitdiff
documentation: include generated HTML in release archives 910/head
authorVirtualTam <virtualtam@flibidi.net>
Tue, 1 Aug 2017 17:25:45 +0000 (19:25 +0200)
committerVirtualTam <virtualtam@flibidi.net>
Wed, 2 Aug 2017 12:48:41 +0000 (14:48 +0200)
Closes https://github.com/shaarli/Shaarli/issues/908
Relates to https://github.com/shaarli/Shaarli/pull/772

Signed-off-by: VirtualTam <virtualtam@flibidi.net>
Makefile

index f2db7d96b2081ad3964e6cb08441e18a87713085..6483fca78815b77994bea6539621c2826d0920e4 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -159,15 +159,18 @@ composer_dependencies: clean
        find vendor/ -name ".git" -type d -exec rm -rf {} +
 
 ### generate a release tarball and include 3rd-party dependencies
-release_tar: composer_dependencies
+release_tar: composer_dependencies doc_html
        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/
        gzip $(ARCHIVE_VERSION).tar
 
 ### generate a release zip and include 3rd-party dependencies
-release_zip: composer_dependencies
+release_zip: composer_dependencies doc_html
        git archive --prefix=$(ARCHIVE_PREFIX) -o $(ARCHIVE_VERSION).zip -9 HEAD
-       mkdir $(ARCHIVE_PREFIX)
+       mkdir -p $(ARCHIVE_PREFIX)/{doc,vendor}
+       rsync -a doc/html/ $(ARCHIVE_PREFIX)doc/html/
+       zip -r $(ARCHIVE_VERSION).zip $(ARCHIVE_PREFIX)doc/
        rsync -a vendor/ $(ARCHIVE_PREFIX)vendor/
        zip -r $(ARCHIVE_VERSION).zip $(ARCHIVE_PREFIX)vendor/
        rm -rf $(ARCHIVE_PREFIX)
@@ -206,4 +209,3 @@ htmlpages:
        rm -r venv
 
 doc_html: authors htmlpages
-