From 44b9dca9d5887015423db6457aefab7646b6280e Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Tue, 13 Jun 2017 12:28:37 +1000 Subject: tools: update the publish-doc tool to use ninja Signed-off-by: Peter Hutterer --- tools/publish-doc | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/tools/publish-doc b/tools/publish-doc index d88edc3..1a91e1a 100755 --- a/tools/publish-doc +++ b/tools/publish-doc @@ -4,9 +4,13 @@ set -e [ -e doc ] || (echo "Run this from the project root" && exit 1) -make +if ! [ -f build/build.ninja ]; then + echo "Setting up meson in directory 'build'" + meson build +fi +ninja -C build -[ -e doc/html ] || (echo "HTML documentation failed to build" && exit 1) +[ -e build/html ] || (echo "HTML documentation failed to build" && exit 1) path=latest @@ -15,4 +19,4 @@ if [ -n "$1" ]; then path="$1" fi -rsync --delete -avz doc/html/ freedesktop.org:/srv/wayland.freedesktop.org/www/libinput/doc/$path +rsync --delete -avz build/html/ freedesktop.org:/srv/wayland.freedesktop.org/www/libinput/doc/$path -- cgit v1.2.3