Mattflaschen has uploaded a new change for review. https://gerrit.wikimedia.org/r/125368
Change subject: Fix make kss build and explain environment variable in README ...................................................................... Fix make kss build and explain environment variable in README Followup to 648667ac9f, which moved this. Change-Id: I9e83187050ed360c57a1c3d4aeba913d69211349 --- M .gitignore M docs/kss/Makefile M docs/kss/README.txt 3 files changed, 19 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/68/125368/1 diff --git a/.gitignore b/.gitignore index c7d6f66..a1be7e2 100644 --- a/.gitignore +++ b/.gitignore @@ -48,7 +48,7 @@ /composer.json # MediaWiki UI documentation -resources/mediawiki.ui/docs +/docs/kss/build # Operating systems ## Mac OS X diff --git a/docs/kss/Makefile b/docs/kss/Makefile index 1b7aeb1..ddcb01a 100644 --- a/docs/kss/Makefile +++ b/docs/kss/Makefile @@ -1,4 +1,5 @@ MEDIAWIKI_LOAD_URL ?= http://localhost/w/load.php +MEDIAWIKI_UI=${PWD}/../../resources/src/mediawiki.ui kss: nodecheck # FIXME: Use more up-to-date Ruby version @@ -7,13 +8,13 @@ # KSS style guide $(eval KSS_RL_TMP := $(shell mktemp /tmp/tmp.XXXXXXXXXX)) @curl -sG "${MEDIAWIKI_LOAD_URL}?modules=mediawiki.ui|mediawiki.ui.button&only=styles" > $(KSS_RL_TMP) - @node_modules/.bin/kss-node mediawiki.ui mediawiki.ui/docs --css $(KSS_RL_TMP) -t styleguide-template + @node_modules/.bin/kss-node ${MEDIAWIKI_UI} build --css $(KSS_RL_TMP) -t styleguide-template @rm $(KSS_RL_TMP) kssopen: kss @echo Opening the generated style guide... - @command -v xdg-open >/dev/null 2>&1 || { open ${PWD}/mediawiki.ui/docs/index.html; exit 0; } - @xdg-open ${PWD}/mediawiki.ui/docs/index.html + @command -v xdg-open >/dev/null 2>&1 || { open build/index.html; exit 0; } + @xdg-open build/index.html nodecheck: @scripts/nodecheck.sh diff --git a/docs/kss/README.txt b/docs/kss/README.txt index d91bf2a..f9473b8 100644 --- a/docs/kss/README.txt +++ b/docs/kss/README.txt @@ -2,3 +2,17 @@ mediawiki.ui/styleguide.md files and directories in here support the automatic generation of CSS documentation from the source LESS files using kss for node.js, https://github.com/kneath/kss + +To build and open in your web browser, run: + +MEDIAWIKI_LOAD_URL=mediawiki_hostname/w/load.php make kssopen + +For example, + +MEDIAWIKI_LOAD_URL=1.2.3.4/w/load.php make kssopen + +If MediaWiki is running on localhost, you can omit MEDIAWIKI_LOAD_URL. + +To rebuild without opening the web browser, run: + +MEDIAWIKI_LOAD_URL=mediawiki_hostname/w/load.php make -- To view, visit https://gerrit.wikimedia.org/r/125368 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9e83187050ed360c57a1c3d4aeba913d69211349 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Mattflaschen <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
