From 59d4f771d280cbea0d0afc9579e127225751c028 Mon Sep 17 00:00:00 2001 From: Eli Schwartz Date: Wed, 9 Jun 2021 14:57:15 -0400 Subject: editorconfig: add setting to trim trailing whitespace and clean up all outstanding issues Skip 'test cases/common/141 special characters/meson.build' since it intentionally uses trailing newlines. --- docs/markdown/Adding-new-projects-to-wrapdb.md | 2 +- docs/markdown/Commands.md | 2 +- docs/markdown/Getting-meson_ptbr.md | 10 +++++----- docs/markdown/Release-notes-for-0.57.0.md | 13 ++++++------- docs/markdown/Release-notes-for-0.58.0.md | 3 +-- docs/markdown/Release-notes-for-0.59.0.md | 3 +-- 6 files changed, 15 insertions(+), 18 deletions(-) (limited to 'docs/markdown') diff --git a/docs/markdown/Adding-new-projects-to-wrapdb.md b/docs/markdown/Adding-new-projects-to-wrapdb.md index 7b51c9a..03998cd 100644 --- a/docs/markdown/Adding-new-projects-to-wrapdb.md +++ b/docs/markdown/Adding-new-projects-to-wrapdb.md @@ -130,7 +130,7 @@ git commit -a -m 'Add wrap files for libfoo-1.0.0' git push -u origin libfoo ``` -Now you should create a pull request on GitHub. +Now you should create a pull request on GitHub. If packaging review requires you to do changes, use the `--amend` argument to `commit` so that your branch will have only one commit. diff --git a/docs/markdown/Commands.md b/docs/markdown/Commands.md index ea68cc8..d53f651 100644 --- a/docs/markdown/Commands.md +++ b/docs/markdown/Commands.md @@ -62,7 +62,7 @@ Builds a default or a specified target of a configured Meson project. - `NAME`: name of the target from `meson.build` (e.g. `foo` from `executable('foo', ...)`). - `PATH`: path to the target relative to the root `meson.build` file. Note: relative path for a target specified in the root `meson.build` is `./`. - `TYPE`: type of the target. Can be one of the following: 'executable', 'static_library', 'shared_library', 'shared_module', 'custom', 'run', 'jar'. - + `PATH` and/or `TYPE` can be omitted if the resulting `TARGET` can be used to uniquely identify the target in `meson.build`. diff --git a/docs/markdown/Getting-meson_ptbr.md b/docs/markdown/Getting-meson_ptbr.md index f2e2811..b5af345 100644 --- a/docs/markdown/Getting-meson_ptbr.md +++ b/docs/markdown/Getting-meson_ptbr.md @@ -1,6 +1,6 @@ # Obtendo o Meson -Meson é implementado em Python 3, e requer a versão 3.6 ou mais nova. +Meson é implementado em Python 3, e requer a versão 3.6 ou mais nova. se o seu sistema operacional provê um gerenciador de pacotes, você deve instalar o Meson com ele. Para plataformas que não tem um gerenciador de pacotes, você precisa baixa-lo da [página inicial do Python]. Veja abaixo @@ -26,7 +26,7 @@ plataformas. O Meson está disponível no [Indice de Pacotes do Python] e pode ser instalado com `sudo pip3 install meson` que requer root e vai instala-lo para todo o sistema. -Se você já baixou uma cópia do código do Meson, você pode instalar com +Se você já baixou uma cópia do código do Meson, você pode instalar com `sudo pip3 install path/to/source/root/`. Como alternativa, você pode usar o `pip3 install --user meson` que vai instalar @@ -54,7 +54,7 @@ Clang, Visual Studio, MinGW, ICC, ARMCC, etc. Você deve usar a versão provida pelo seu gerenciador de pacotes se possível, caso contrário, baixe o binário executável da [página de *release* do projeto Ninja](https://github.com/ninja-build/ninja/releases). -Se você apenas usa o *backend* do Visual Studio (`--backend=vs`) para gerar soluções do Visual Studio no Windows ou o +Se você apenas usa o *backend* do Visual Studio (`--backend=vs`) para gerar soluções do Visual Studio no Windows ou o *backend* do XCode (`--backend=xcode`) para gerar projetos no macOS, você não precisa do Ninja. @@ -72,7 +72,7 @@ que você selecione as opções do instalador como a seguir: ![passo 3 do instalador](images/py3-install-3.png "Opções Avançadas: ative 'Instalar para todos usuários'") -Com isso, você terá o `python` e o `pip` no `PATH`, e você poderá instalar o Meson com o pip. Você também vai poder +Com isso, você terá o `python` e o `pip` no `PATH`, e você poderá instalar o Meson com o pip. Você também vai poder executar o comando `meson` em qualquer shell no Windows ao invés de ter que executar `py -3` com o caminho completo para o *script* `meson.py`. @@ -80,7 +80,7 @@ o *script* `meson.py`. Se você está usando o MSYS2 no Windows como seu ambiente de desenvolvimento, por favor se certifique que você não esteja usando o pacote `msys/python` para -fornecer o Python 3. Uso o `mingw32/mingw-w64-i686-python3` ou o +fornecer o Python 3. Uso o `mingw32/mingw-w64-i686-python3` ou o If you are using MSYS2 on Windows as your development environment, please make sure that you **do not use** the `msys/python` package to provide Python 3. Use either `mingw32/mingw-w64-i686-python3` or `mingw64/mingw-w64-x86_64-python3` diff --git a/docs/markdown/Release-notes-for-0.57.0.md b/docs/markdown/Release-notes-for-0.57.0.md index 595ebec..14fa030 100644 --- a/docs/markdown/Release-notes-for-0.57.0.md +++ b/docs/markdown/Release-notes-for-0.57.0.md @@ -105,7 +105,7 @@ Run Time Checking can be enabled by manually adding `/RTC1` or other RTC flags o The `debug` buildtype for clang-cl added additional arguments compared to MSVC, which had more to do with optimization than debug. The arguments removed are `/Ob0`, `/Od`, `/RTC1`. (`/Zi` was also removed, but it is already added by default when debug is enabled.) -If these are important issues for you and would like builtin toggle options, +If these are important issues for you and would like builtin toggle options, please file an issue in the Meson bug tracker. ## Buildtype remains even if dependent options are changed @@ -154,17 +154,17 @@ Currently supports `glib-compile-schemas`, `gio-querymodules`, and ## "Edit and continue" (/ZI) is no longer used by default for Visual Studio -Meson was adding the `/ZI` compiler argument as an argument for Visual Studio -in debug mode. This enables the `edit-and-continue` debugging in +Meson was adding the `/ZI` compiler argument as an argument for Visual Studio +in debug mode. This enables the `edit-and-continue` debugging in Visual Studio IDE's. -Unfortunately, it is also extremely expensive and breaks certain use cases such -as link time code generation. Edit and continue can be enabled by manually by +Unfortunately, it is also extremely expensive and breaks certain use cases such +as link time code generation. Edit and continue can be enabled by manually by adding `/ZI` to compiler arguments. The `/ZI` argument has now been replaced by the `/Zi` argument for debug builds. -If this is an important issue for you and would like a builtin toggle option, +If this is an important issue for you and would like a builtin toggle option, please file an issue in the Meson bug tracker. ## Minimum required Python version updated to 3.6 @@ -357,4 +357,3 @@ also allows `//` as the id. This way, `meson rewrite kwargs set project All keys of the `configuration_data` object can be obtained with the `keys()` method as an alphabetically sorted array. - diff --git a/docs/markdown/Release-notes-for-0.58.0.md b/docs/markdown/Release-notes-for-0.58.0.md index 9a23abb..7187dc1 100644 --- a/docs/markdown/Release-notes-for-0.58.0.md +++ b/docs/markdown/Release-notes-for-0.58.0.md @@ -266,7 +266,7 @@ argument that will be separated by space. ## Specify man page locale during installation Locale directories can now be passed to `install_man`: - + ```meson # instead of # install_data('foo.fr.1', install_dir: join_paths(get_option('mandir'), 'fr', 'man1'), rename: 'foo.1')` @@ -354,4 +354,3 @@ The `b_sanitize` option for enabling Address sanitizer now works with the Visual Studio compilers. This requires [a sufficiently new version of Visual Studio](https://devblogs.microsoft.com/cppblog/address-sanitizer-for-msvc-now-generally-available/). - diff --git a/docs/markdown/Release-notes-for-0.59.0.md b/docs/markdown/Release-notes-for-0.59.0.md index b6ce654..a8fbc35 100644 --- a/docs/markdown/Release-notes-for-0.59.0.md +++ b/docs/markdown/Release-notes-for-0.59.0.md @@ -121,7 +121,7 @@ if intl_found conf.set('ENABLE_NLS', 1) endif ``` - + one may simply use: ``` @@ -232,4 +232,3 @@ the cache upon installation. Most applications do that using a custom script, but it can now be done by Meson directly. See [`gnome.post_install()`](Gnome-module.md#gnomepost_install). - -- cgit v1.1