diff options
author | Eli Schwartz <eschwartz@archlinux.org> | 2022-08-16 16:12:35 -0400 |
---|---|---|
committer | Eli Schwartz <eschwartz@archlinux.org> | 2022-08-16 16:18:18 -0400 |
commit | 25b0988d4e40d22d907169b4f73ff07b4cb7fd0e (patch) | |
tree | b5cdc4588cc1856a00126fb28d09b4fbd1bb9079 | |
parent | 33a5352e3c56c3d245aed48005515f097ab2ab53 (diff) | |
download | meson-25b0988d4e40d22d907169b4f73ff07b4cb7fd0e.zip meson-25b0988d4e40d22d907169b4f73ff07b4cb7fd0e.tar.gz meson-25b0988d4e40d22d907169b4f73ff07b4cb7fd0e.tar.bz2 |
docs: fix various references to "meson builddir"
This is wrong, it should use "meson setup builddir".
-rw-r--r-- | docs/markdown/Continuous-Integration.md | 6 | ||||
-rw-r--r-- | docs/markdown/Creating-releases.md | 2 | ||||
-rw-r--r-- | docs/markdown/Cross-compilation.md | 2 | ||||
-rw-r--r-- | docs/markdown/Dependencies.md | 2 | ||||
-rw-r--r-- | docs/markdown/GuiTutorial.md | 2 | ||||
-rw-r--r-- | docs/markdown/IDE-integration.md | 2 | ||||
-rw-r--r-- | docs/markdown/IndepthTutorial.md | 2 | ||||
-rw-r--r-- | docs/markdown/Quick-guide.md | 4 | ||||
-rw-r--r-- | docs/markdown/Release-notes-for-0.51.0.md | 2 | ||||
-rw-r--r-- | docs/markdown/Release-notes-for-0.54.0.md | 4 | ||||
-rw-r--r-- | docs/markdown/Release-notes-for-0.55.0.md | 2 | ||||
-rw-r--r-- | docs/markdown/Release-notes-for-0.56.0.md | 4 | ||||
-rw-r--r-- | docs/markdown/Release-notes-for-0.57.0.md | 2 | ||||
-rw-r--r-- | docs/markdown/Using-multiple-build-directories.md | 6 |
14 files changed, 21 insertions, 21 deletions
diff --git a/docs/markdown/Continuous-Integration.md b/docs/markdown/Continuous-Integration.md index ec0b4e0..0d787d2 100644 --- a/docs/markdown/Continuous-Integration.md +++ b/docs/markdown/Continuous-Integration.md @@ -36,8 +36,8 @@ script: - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then echo FROM YOUR/REPO:eoan > 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 builddir && meson test -C builddir"; fi - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then SDKROOT=$(xcodebuild -version -sdk macosx Path) meson builddir && meson test -C builddir; fi + - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker run withgit /bin/sh -c "cd /root && TRAVIS=true CC=$CC CXX=$CXX meson setup builddir && meson test -C builddir"; fi + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then SDKROOT=$(xcodebuild -version -sdk macosx Path) meson setup builddir && meson test -C builddir; fi ``` ## CircleCi for Linux (with Docker) @@ -192,7 +192,7 @@ install: - pip install meson ninja script: - - meson builddir + - meson setup builddir - meson compile -C builddir - meson test -C builddir ``` diff --git a/docs/markdown/Creating-releases.md b/docs/markdown/Creating-releases.md index dfdc579..638125c 100644 --- a/docs/markdown/Creating-releases.md +++ b/docs/markdown/Creating-releases.md @@ -82,7 +82,7 @@ For example: ```sh git clone https://github.com/myproject cd myproject/subprojects/mysubproject -meson builddir +meson setup builddir meson dist -C builddir ``` This produces `builddir/meson-dist/mysubproject-1.0.tar.xz` tarball. diff --git a/docs/markdown/Cross-compilation.md b/docs/markdown/Cross-compilation.md index 0f982d8..fb22222 100644 --- a/docs/markdown/Cross-compilation.md +++ b/docs/markdown/Cross-compilation.md @@ -371,5 +371,5 @@ file called x86-linux, then the following command would start a cross build using that cross files: ```sh -meson builddir/ --cross-file x86-linux +meson setup builddir/ --cross-file x86-linux ``` diff --git a/docs/markdown/Dependencies.md b/docs/markdown/Dependencies.md index 7c55a91..0938e06 100644 --- a/docs/markdown/Dependencies.md +++ b/docs/markdown/Dependencies.md @@ -261,7 +261,7 @@ to be using the same compiler. This can be achieved using Dub's variable when running Meson. ``` dub build urld --compiler=dmd -DC="dmd" meson builddir +DC="dmd" meson setup builddir ``` ## Config tool diff --git a/docs/markdown/GuiTutorial.md b/docs/markdown/GuiTutorial.md index 3a7c3e5..6990eef 100644 --- a/docs/markdown/GuiTutorial.md +++ b/docs/markdown/GuiTutorial.md @@ -64,7 +64,7 @@ executable('sdlprog', 'sdlprog.c') With this done we can start the build with the following command: - meson builddir + meson setup builddir Here `builddir` is the _build directory_, everything that is generated during the build is put in that directory. When run, it should look diff --git a/docs/markdown/IDE-integration.md b/docs/markdown/IDE-integration.md index e64eccf..c60aeef 100644 --- a/docs/markdown/IDE-integration.md +++ b/docs/markdown/IDE-integration.md @@ -20,7 +20,7 @@ that the source resides in an Eclipse-like directory called `workspace/project/build`. First, we initialize Meson by running the following command in the source directory. - meson builddir + meson setup builddir With this command Meson will configure the project and also generate introspection information that is stored in `intro-*.json` files in diff --git a/docs/markdown/IndepthTutorial.md b/docs/markdown/IndepthTutorial.md index 957449d..5f53a6f 100644 --- a/docs/markdown/IndepthTutorial.md +++ b/docs/markdown/IndepthTutorial.md @@ -138,7 +138,7 @@ test suite, we just need to execute the following commands (starting at source tree root directory). ```console -$ meson builddir && cd builddir +$ meson setup builddir && cd builddir $ meson compile $ meson test ``` diff --git a/docs/markdown/Quick-guide.md b/docs/markdown/Quick-guide.md index c1de820..3a86904 100644 --- a/docs/markdown/Quick-guide.md +++ b/docs/markdown/Quick-guide.md @@ -75,7 +75,7 @@ Troubleshooting: -- Common Issues: ```console -$ meson builddir +$ meson setup builddir $ bash: /usr/bin/meson: No such file or directory ``` @@ -102,7 +102,7 @@ are working on. The steps to take are very simple. ```console $ cd /path/to/source/root -$ meson builddir && cd builddir +$ meson setup builddir && cd builddir $ meson compile $ meson test ``` diff --git a/docs/markdown/Release-notes-for-0.51.0.md b/docs/markdown/Release-notes-for-0.51.0.md index 0a644a3..e015a95 100644 --- a/docs/markdown/Release-notes-for-0.51.0.md +++ b/docs/markdown/Release-notes-for-0.51.0.md @@ -136,7 +136,7 @@ If you have installed something to `/tmp/dep`, which has a layout like: /tmp/dep/bin ``` -then invoke Meson as `meson builddir/ -Dcmake_prefix_path=/tmp/dep` +then invoke Meson as `meson setup builddir/ -Dcmake_prefix_path=/tmp/dep` ## Tests that should fail but did not are now errors diff --git a/docs/markdown/Release-notes-for-0.54.0.md b/docs/markdown/Release-notes-for-0.54.0.md index 3b060a5..f9bfcf6 100644 --- a/docs/markdown/Release-notes-for-0.54.0.md +++ b/docs/markdown/Release-notes-for-0.54.0.md @@ -120,12 +120,12 @@ value < 1 lets the backend decide how many threads to use. For msbuild this means `-m`, for ninja it means passing no arguments. ```console -meson builddir --backend vs +meson setup builddir --backend vs meson compile -C builddir -j0 # this is the same as `msbuild builddir/my.sln -m` ``` ```console -meson builddir +meson setup builddir meson compile -C builddir -j3 # this is the same as `ninja -C builddir -j3` ``` diff --git a/docs/markdown/Release-notes-for-0.55.0.md b/docs/markdown/Release-notes-for-0.55.0.md index b5e9c0a..8d3b4ba 100644 --- a/docs/markdown/Release-notes-for-0.55.0.md +++ b/docs/markdown/Release-notes-for-0.55.0.md @@ -245,7 +245,7 @@ used to force fallback for specific subprojects. Example: ``` -meson builddir/ --force-fallback-for=foo,bar +meson setup builddir/ --force-fallback-for=foo,bar ``` ## Implicit dependency fallback diff --git a/docs/markdown/Release-notes-for-0.56.0.md b/docs/markdown/Release-notes-for-0.56.0.md index c196fde..368681f 100644 --- a/docs/markdown/Release-notes-for-0.56.0.md +++ b/docs/markdown/Release-notes-for-0.56.0.md @@ -154,13 +154,13 @@ foo = 'other val' ``` ```console -meson builddir/ --native-file my.ini +meson setup builddir/ --native-file my.ini ``` Will result in the option foo having the value `other val`, ```console -meson builddir/ --native-file my.ini -Dfoo='different val' +meson setup builddir/ --native-file my.ini -Dfoo='different val' ``` Will result in the option foo having the value `different val`, diff --git a/docs/markdown/Release-notes-for-0.57.0.md b/docs/markdown/Release-notes-for-0.57.0.md index 4892b40..4ac003c 100644 --- a/docs/markdown/Release-notes-for-0.57.0.md +++ b/docs/markdown/Release-notes-for-0.57.0.md @@ -187,7 +187,7 @@ For example: ```sh git clone https://github.com/myproject cd myproject/subprojects/mysubproject -meson builddir +meson setup builddir meson dist -C builddir ``` diff --git a/docs/markdown/Using-multiple-build-directories.md b/docs/markdown/Using-multiple-build-directories.md index 557f344..2e6fa74 100644 --- a/docs/markdown/Using-multiple-build-directories.md +++ b/docs/markdown/Using-multiple-build-directories.md @@ -39,7 +39,7 @@ builds as fast as possible. This is the default project type for Meson, so setting it up is simple. mkdir builddir - meson builddir + meson setup builddir Another common setup is to build with debug and optimizations to, for example, run performance tests. Setting this up is just as simple. @@ -51,7 +51,7 @@ For systems where the default compiler is GCC, we would like to compile with Clang, too. So let's do that. mkdir buildclang - CC=clang CXX=clang++ meson buildclang + CC=clang CXX=clang++ meson setup buildclang You can add cross builds, too. As an example, let's set up a Linux -> Windows cross compilation build using MinGW. @@ -84,7 +84,7 @@ The steps to run it with Meson are very simple. rm -rf buildscan mkdir buildscan - scan-build meson buildscan + scan-build meson setup buildscan cd buildscan scan-build ninja |