Skip to content

Commit 3478a1c

Browse files
authored
Fixed some typos and little tweaks (#4249)
* Fixed some typos and little tweaks * Split MyPath
1 parent e616447 commit 3478a1c

File tree

3 files changed

+28
-10
lines changed

3 files changed

+28
-10
lines changed

reference/commands/config.rst

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,12 @@ You can force certain files to be copied over by using the ``!`` negation syntax
101101
102102
$ conan config install http://github.com/user/conan_config/.git --type git
103103
104+
- Install the configuration from a specific Git branch:
105+
106+
.. code-block:: text
107+
108+
$ conan config install http://github.com/user/conan_config/.git --args="--branch mybranch"
109+
104110
- Install from a URL skipping SSL verification:
105111

106112
.. code-block:: text
@@ -144,7 +150,7 @@ The packages containing configuration follow some special rules:
144150
- They cannot contain ``requires`` to other packages
145151
- The configuration packages are created with ``conan create`` and ``conan export-pkg`` as other packages, and uploaded to the servers with ``conan upload``
146152

147-
To install configuration from a Conan configuration package, it is possible:
153+
To install a configuration from a Conan configuration package, it is possible:
148154

149155
- To generate a lockfile file with ``--lockfile-out``. This lockfile file can be passed to ``conan config install-pkg --lockfile`` (it will automatically loaded it if is named ``conan.lock`` and found in the current directory) in the future to guarantee the same exact version.
150156
- Version ranges can be used ``conan config install-pkg "myconf/[>=1.0 <2]"`` is correct, and it will install the latest one in that range.
@@ -189,7 +195,7 @@ And if they had a layout with different ``global.conf`` for the different platfo
189195
nix/global.conf
190196
191197
192-
They, they could create and upload their configuration package as:
198+
They could create and upload their configuration package as:
193199

194200
.. code-block:: bash
195201

reference/config_files/profiles.rst

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -285,8 +285,8 @@ the prefix of the variable. It is useful to automatically get the append/prepend
285285
# Prepend another PATH to "MyPath1"
286286
MyPath1=+(path)/other path/path12
287287
288-
# Unset the variable "MyPath1"
289-
MyPath1=!
288+
# Unset the variable "MyPath2"
289+
MyPath2=!
290290
291291
292292
Then, the result of applying this profile is:
@@ -295,7 +295,7 @@ Then, the result of applying this profile is:
295295
* ``MyPath1``:
296296
* Unix: ``/other path/path12:/some/path11``
297297
* Windows: ``/other path/path12;/some/path11``
298-
* ``mypkg*:PATH``: ``None``
298+
* ``MyPath2``: if system environment had defined ``MyPath2``, this will be unset by Conan
299299

300300
.. warning::
301301

@@ -309,6 +309,17 @@ Then, the result of applying this profile is:
309309

310310
- This section allows to use patterns to limit which packages are affected by the buildenv. See :ref:`this section <reference_config_files_profile_patterns>` for more details.
311311

312+
For example:
313+
314+
.. code-block:: text
315+
316+
[buildenv]
317+
MyPath=MyValue
318+
mypkg/*:MyPath=MyOtherValue
319+
320+
This will result in ``MyPath=MyValue`` for all the packages, and ``MyPath=MyOtherValue`` only for the ``mypkg`` package.
321+
322+
312323

313324
.. _reference_config_files_profiles_runenv:
314325

@@ -653,7 +664,7 @@ Some of the capabilities of the profile templates are:
653664
.. code-block:: jinja
654665
:caption: *profile_vars*
655666
656-
{% set version = subprocess.check_output(['clang++', "-dumpversion]).strip() %}
667+
{% set version = subprocess.check_output(['clang++', "-dumpversion"]).strip() %}
657668
[settings]
658669
compiler.version={{ version }}
659670

reference/config_files/settings.rst

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,8 @@ Here you can find a brief explanation of each of the architectures defined as ``
153153
- **asm.js**: The subset of JavaScript that can be used as low-level target for compilers, not really a processor architecture, it's produced
154154
by Emscripten. Conan treats it as an architecture to align with build systems design (e.g. GNU auto tools and CMake).
155155
- **wasm**: The Web Assembly, not really a processor architecture, but byte-code format for Web, it's produced by Emscripten. Conan treats it
156-
as an architecture to align with build systems design (e.g. GNU auto tools and CMake).
156+
as an architecture to align with build systems design (e.g. GNU auto tools, CMake, etc).
157+
- **wasm64**: The Web Assembly 64 bit, same as **wasm** but for 64 bit. Conan will add the necessary flags to the compiler to produce 64 bit Web Assembly code.
157158
- **sh4le**: The Hitachi SH-4 SuperH architecture.
158159
- **e2k-v2**: The Elbrus 2000 v2 512 bit VLIW (Very Long Instruction Word) architecture (Elbrus 2CM, Elbrus 2C+ CPUs) originally developed by MCST (Moscow Center of SPARC Technologies).
159160
- **e2k-v3**: The Elbrus 2000 v3 512 bit VLIW (Very Long Instruction Word) architecture (Elbrus 2S, aka Elbrus 4C, CPU) originally developed by MCST (Moscow Center of SPARC Technologies).
@@ -172,17 +173,17 @@ C++ standard libraries (aka compiler.libcxx)
172173
``compiler.libcxx`` sub-setting defines C++ standard libraries implementation to be used. The sub-setting applies only to certain compilers,
173174
e.g. it applies to *clang*, *apple-clang* and *gcc*, but doesn't apply to *Visual Studio*.
174175

175-
- **libstdc++** (gcc, clang, apple-clang, sun-cc): `The GNU C++ Library <https://gcc.gnu.org/onlinedocs/libstdc++/>`__. NOTE that this implicitly
176+
- **libstdc++** (gcc, clang, apple-clang, sun-cc, intel-cc, mcst-lcc, emcc): `The GNU C++ Library <https://gcc.gnu.org/onlinedocs/libstdc++/>`__. NOTE that this implicitly
176177
defines **_GLIBCXX_USE_CXX11_ABI=0** to use old ABI. Might be a wise choice for old systems, such as CentOS 6. On Linux systems,
177178
you may need to install `libstdc++-dev <https://packages.debian.org/sid/libstdc++-dev>`_ (package name could be different in various distros)
178179
in order to use the standard library. NOTE that on Apple systems usage of **libstdc++** has been deprecated.
179180

180-
- **libstdc++11** (gcc, clang, apple-clang): `The GNU C++ Library <https://gcc.gnu.org/onlinedocs/libstdc++/>`__. NOTE that this implicitly
181+
- **libstdc++11** (gcc, clang, intel-cc, mcst-lcc, emcc): `The GNU C++ Library <https://gcc.gnu.org/onlinedocs/libstdc++/>`__. NOTE that this implicitly
181182
defines **_GLIBCXX_USE_CXX11_ABI=1** to use new ABI. Might be a wise choice for newer systems, such as Ubuntu 20. On Linux systems,
182183
you may need to install `libstdc++-dev <https://packages.debian.org/sid/libstdc++-dev>`_ (package name could be different in various distros)
183184
in order to use the standard library. NOTE that on Apple systems usage of **libstdc++** has been deprecated.
184185

185-
- **libc++** (clang, apple-clang): `LLVM libc++ <https://libcxx.llvm.org/>`__. On Linux systems, you may need to install `libc++-dev <https://packages.debian.org/sid/libc++-dev>`_
186+
- **libc++** (clang, apple-clang, intel-cc, emcc): `LLVM libc++ <https://libcxx.llvm.org/>`__. On Linux systems, you may need to install `libc++-dev <https://packages.debian.org/sid/libc++-dev>`_
186187
(package name could be different in various distros) in order to use the standard library.
187188

188189
- **c++_shared** (clang, Android only): use `LLVM libc++ <https://libcxx.llvm.org/>`__ as a shared library. Refer to the `C++ Library Support <https://developer.android.com/ndk/guides/cpp-support>`__ for the

0 commit comments

Comments
 (0)