doc/Makefile: remove references to composer update

[github/shaarli/Shaarli.git] / Makefile

diff --git a/Makefile b/Makefile
index 917fab7d9753cb1fa41c18b759e7dc06cf0559d9..d16639265ecc1516e10cc9881a1f28ae6389ba7a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -85,6 +85,10 @@ all_tests: test locale_test_de_DE locale_test_en_US locale_test_fr_FR
        @# --text doesn't work with phpunit 4.* (v5 requires PHP 5.6)
        @#$(BIN)/phpcov merge --text coverage/txt coverage
 
+### download 3rd-party PHP libraries, including dev dependencies
+composer_dependencies_dev: clean
+       composer install --prefer-dist
+
 ##
 # Custom release archive generation
 #
@@ -123,7 +127,8 @@ release_tar: composer_dependencies htmldoc translate build_frontend
 ### generate a release zip and include 3rd-party dependencies and translations
 release_zip: composer_dependencies htmldoc translate build_frontend
        git archive --prefix=$(ARCHIVE_PREFIX) -o $(ARCHIVE_VERSION).zip -9 HEAD
-       mkdir -p $(ARCHIVE_PREFIX)/{doc,vendor}
+       mkdir -p $(ARCHIVE_PREFIX)/doc
+       mkdir -p $(ARCHIVE_PREFIX)/vendor
        rsync -a doc/html/ $(ARCHIVE_PREFIX)doc/html/
        zip -r $(ARCHIVE_VERSION).zip $(ARCHIVE_PREFIX)doc/
        rsync -a vendor/ $(ARCHIVE_PREFIX)vendor/
@@ -155,6 +160,7 @@ phpdoc: clean
 htmldoc:
        python3 -m venv venv/
        bash -c 'source venv/bin/activate; \
+       pip install wheel; \
        pip install mkdocs; \
        mkdocs build --clean'
        find doc/html/ -type f -exec chmod a-x '{}' \;
@@ -172,4 +178,4 @@ eslint:
 
 ### Run CSSLint check against Shaarli's SCSS files
 sasslint:
-       @yarn run sass-lint -c .dev/.sasslintrc 'assets/default/scss/*.scss' -v -q
+       @yarn run stylelint --config .dev/.stylelintrc.js 'assets/default/scss/*.scss'