diff options
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/markdown/Continuous-Integration.md | 19 | ||||
| -rw-r--r-- | docs/markdown/Reference-tables.md | 1 | ||||
| -rw-r--r-- | docs/markdown/Syntax.md | 2 | ||||
| -rw-r--r-- | docs/markdown/howtox.md | 6 | ||||
| -rw-r--r-- | docs/markdown/snippets/builtin-python.md | 9 |
5 files changed, 27 insertions, 10 deletions
diff --git a/docs/markdown/Continuous-Integration.md b/docs/markdown/Continuous-Integration.md index 96e8e5d..60e76d1 100644 --- a/docs/markdown/Continuous-Integration.md +++ b/docs/markdown/Continuous-Integration.md @@ -52,13 +52,14 @@ your best bet. Here's a sample `yml` file for use with that. ```yaml os: Visual Studio 2015 -matrix: - - arch: x86 - compiler: msvc2010 - - arch: x86 - compiler: msvc2015 - - arch: x64 - compiler: msvc2015 +environment: + matrix: + - arch: x86 + compiler: msvc2010 + - arch: x86 + compiler: msvc2015 + - arch: x64 + compiler: msvc2015 platform: - x64 @@ -66,10 +67,10 @@ platform: install: # Use the x86 python only when building for x86 for the cpython tests. # For all other archs (including, say, arm), use the x64 python. - - ps: (new-object net.webclient).DownloadFile('https://dl.dropboxusercontent.com/u/37517477/ninja.exe', 'C:\projects\meson\ninja.exe') + - ps: (new-object net.webclient).DownloadFile('https://www.dropbox.com/s/cyghxjrvgplu7sy/ninja.exe?dl=1', 'C:\projects\meson\ninja.exe') - cmd: if %arch%==x86 (set MESON_PYTHON_PATH=C:\python34) else (set MESON_PYTHON_PATH=C:\python34-x64) - cmd: echo Using Python at %MESON_PYTHON_PATH% - - cmd: %MESON_PYTHON_PATH%\pip install meson + - cmd: "%MESON_PYTHON_PATH%\\pip install meson" - cmd: if %compiler%==msvc2010 ( call "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" %arch% ) - cmd: if %compiler%==msvc2015 ( call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" %arch% ) diff --git a/docs/markdown/Reference-tables.md b/docs/markdown/Reference-tables.md index b604fb6..ff28662 100644 --- a/docs/markdown/Reference-tables.md +++ b/docs/markdown/Reference-tables.md @@ -55,6 +55,7 @@ These are provided by the `.system()` method call. | linux | | | darwin | Either OSX or iOS | | windows | Any version of Windows | +| cygwin | The Cygwin environment for Windows | Any string not listed above is not guaranteed to remain stable in future releases.
\ No newline at end of file diff --git a/docs/markdown/Syntax.md b/docs/markdown/Syntax.md index 88b9bbb..84403f4 100644 --- a/docs/markdown/Syntax.md +++ b/docs/markdown/Syntax.md @@ -84,7 +84,7 @@ single quote do it like this: single quote = 'contains a \' character' ``` -Similarly `\n` gets converted to a newline and `\\\\` to a single +Similarly `\n` gets converted to a newline and `\\` to a single backslash. #### String concatenation diff --git a/docs/markdown/howtox.md b/docs/markdown/howtox.md index c4aa9c5..4e7e220 100644 --- a/docs/markdown/howtox.md +++ b/docs/markdown/howtox.md @@ -125,6 +125,12 @@ Install scan-build and configure your project. Then do this: $ ninja scan-build ``` +You can use the `SCAN_BUILD` environment variable to choose the scan-build executable. +```console +$ SCAN_BUILD=<your exe> ninja scan-build +``` + + ## Use profile guided optimization Using profile guided optimization with GCC is a two phase operation. First we set up the project with profile measurements enabled and compile it. diff --git a/docs/markdown/snippets/builtin-python.md b/docs/markdown/snippets/builtin-python.md new file mode 100644 index 0000000..01bb6e0 --- /dev/null +++ b/docs/markdown/snippets/builtin-python.md @@ -0,0 +1,9 @@ +# Embedded Python in Windows MSI packages + +Meson now ships an internal version of Python in the MSI installer packages. +This means that it can run Python scripts that are part of your build +transparently. That is, if you do the following: + + myprog = find_program('myscript.py') + +Then Meson will run the script with its internal Python version if necessary. |