diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2017-05-03 13:34:48 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2017-05-03 21:00:36 +1000 |
| commit | 276d342ebaf859dd53e145ead3e98e2cebb360ab (patch) | |
| tree | b1fc9f5e62bd4a53a2eea9ee9f9b37a3fab805c1 /docs/markdown/Continuous-Integration.md | |
| parent | 7ec6e6df2013aa65f99e0183c9d36b3ef3b7ab0e (diff) | |
| download | meson-276d342ebaf859dd53e145ead3e98e2cebb360ab.zip meson-276d342ebaf859dd53e145ead3e98e2cebb360ab.tar.gz meson-276d342ebaf859dd53e145ead3e98e2cebb360ab.tar.bz2 | |
docs: replace 'meson build' with 'meson builddir'
Clarifies that this is really just a directory, not a command.
https://github.com/mesonbuild/meson/issues/1560
Diffstat (limited to 'docs/markdown/Continuous-Integration.md')
| -rw-r--r-- | docs/markdown/Continuous-Integration.md | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/docs/markdown/Continuous-Integration.md b/docs/markdown/Continuous-Integration.md index 1dff200..e57ea78 100644 --- a/docs/markdown/Continuous-Integration.md +++ b/docs/markdown/Continuous-Integration.md @@ -33,8 +33,8 @@ script: - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then echo FROM YOUR/REPO:yakkety > Dockerfile; fi - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then echo ADD . /root >> Dockerfile; fi - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker build -t withgit .; fi - - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker run withgit /bin/sh -c "cd /root && TRAVIS=true CC=$CC CXX=$CXX meson build && ninja -C build test"; fi - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then SDKROOT=$(xcodebuild -version -sdk macosx Path) meson build && ninja -C build test; fi + - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker run withgit /bin/sh -c "cd /root && TRAVIS=true CC=$CC CXX=$CXX meson builddir && ninja -C builddir test"; fi + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then SDKROOT=$(xcodebuild -version -sdk macosx Path) meson builddir && ninja -C builddir test; fi ``` ## AppVeyor for Windows @@ -67,11 +67,11 @@ install: build_script: - cmd: echo Building on %arch% with %compiler% - - cmd: PATH=%cd%;%MESON_PYTHON_PATH%;%PATH%; && python meson.py --backend=ninja build - - cmd: PATH=%cd%;%MESON_PYTHON_PATH%;%PATH%; && ninja -C build + - cmd: PATH=%cd%;%MESON_PYTHON_PATH%;%PATH%; && python meson.py --backend=ninja builddir + - cmd: PATH=%cd%;%MESON_PYTHON_PATH%;%PATH%; && ninja -C builddir test_script: - - cmd: PATH=%cd%;%MESON_PYTHON_PATH%;%PATH%; && ninja -C build test + - cmd: PATH=%cd%;%MESON_PYTHON_PATH%;%PATH%; && ninja -C builddir test ``` ## Travis without Docker @@ -96,7 +96,7 @@ install: - pip3 install meson script: - - meson build - - ninja -C build - - ninja -C build test + - meson builddir + - ninja -C builddir + - ninja -C builddir test ``` |