Skip to content

Commit

Permalink
Fix spelling issues, reword
Browse files Browse the repository at this point in the history
  • Loading branch information
liberforce committed Oct 16, 2018
1 parent 57d8848 commit 7348b0c
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 14 deletions.
10 changes: 5 additions & 5 deletions changelog.rst
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ Check https://github.com/conan-io/conan for issues and more details about develo

- Fix: Remove warnings related to ``python_requires()``, both in linter and due to Python2. `#3706 <https://github.com/conan-io/conan/pull/3706>`_
- Fix: Use *share* folder for ``DATAROOTDIR`` in CMake and AutoTools build helpers. `#3705 <https://github.com/conan-io/conan/pull/3705>`_
- Fix: Disabled apiv2 until the new protocol becomes stable. `#3703 <https://github.com/conan-io/conan/pull/3703>`_
- Fix: Disabled `apiv2` until the new protocol becomes stable. `#3703 <https://github.com/conan-io/conan/pull/3703>`_


1.8.0 (9-October-2018)
Expand All @@ -62,15 +62,15 @@ Check https://github.com/conan-io/conan for issues and more details about develo
- Feature: Added ``libtool()`` function to the `tools.XCRun()` tool to locate the system ``libtool``. `#3515 <https://github.com/conan-io/conan/pull/3515>`_
- Feature: The tool ``tools.collect_libs()`` now search into each folder declared in ``self.cpp_info.libdirs``. `#3503 <https://github.com/conan-io/conan/pull/3503>`_
- Feature: Added definition ``CMAKE_OSX_DEPLOYMENT_TARGET`` to the ``CMake`` build helper following the ``os.version`` setting for ``Macos``. `#3486 <https://github.com/conan-io/conan/pull/3486>`_
- Feature: The upload of files now uses the `conanmanifest.txt` file to know if a file has to be uploaded or not. It avoid associated issues with the metainformation of the files permissions contained in the `tgz` files. `#3480 <https://github.com/conan-io/conan/pull/3480>`_
- Feature: The upload of files now uses the `conanmanifest.txt` file to know if a file has to be uploaded or not. It avoids issues associated with the metadata of the files permissions contained in the `tgz` files. `#3480 <https://github.com/conan-io/conan/pull/3480>`_
- Feature: The `default_options` in a `conanfile.py` can be specified now as a dictionary. `#3477 <https://github.com/conan-io/conan/pull/3477>`_
- Feature: The command `conan config install` now support relative paths. `#3468 <https://github.com/conan-io/conan/pull/3468>`_
- Feature: Added a definition `CONAN_IN_LOCAL_CACHE` to the `CMake()` build helper. `#3450 <https://github.com/conan-io/conan/pull/3450>`_
- Feature: Improved `AptTool` at `SystemPackageTool` adding a function `add_repository` to add new apt repositories. `#3445 <https://github.com/conan-io/conan/pull/3445>`_
- Feature: Experimental and initial support for the REST apiv2 that will allow transfers in one step and revisions in the future. `#3442 <https://github.com/conan-io/conan/pull/3442>`_
- Feature: Experimental and initial support for the REST `apiv2` that will allow transfers in one step and revisions in the future. `#3442 <https://github.com/conan-io/conan/pull/3442>`_
- Feature: Improve the output of a :command:`conan install` command printing dependencies when a binary is not found. `#3438 <https://github.com/conan-io/conan/pull/3438>`_
- Feature: New `b2` generator. It replaces the old incomplete `boost_build` generator that is now deprecated. `#3416 <https://github.com/conan-io/conan/pull/3416>`_
- Feature: New ``tool.replace_path_in_file`` to replace Windows paths in a file doing case-insensitive comparisson and indisctinct path separators comparisson: "/" == "\\" `#3399 <https://github.com/conan-io/conan/pull/3399>`_
- Feature: New ``tool.replace_path_in_file`` to replace Windows paths in a file doing case-insensitive comparison and indistinct path separators comparison: "/" == "\\" `#3399 <https://github.com/conan-io/conan/pull/3399>`_
- Feature: **[Experimental]** Add SCM support for SVN. `#3192 <https://github.com/conan-io/conan/pull/3192>`_
- Fix: ``None`` option value was not being propagated upstream in the dependency graph `#3684 <https://github.com/conan-io/conan/pull/3684>`_
- Fix: Apply ``system_requirements()`` always on install, in case the folder was removed. `#3647 <https://github.com/conan-io/conan/pull/3647>`_
Expand All @@ -92,7 +92,7 @@ Check https://github.com/conan-io/conan for issues and more details about develo
- Bugfix: Renamed ``os`` (reserved symbol) parameter to ``os_`` in the ``get_gnu_triplet`` tool. `#3603 <https://github.com/conan-io/conan/pull/3603>`_
- Bugfix: :command:`conan get` command now works correctly with enabled ``short paths``. `#3600 <https://github.com/conan-io/conan/pull/3600>`_
- Bugfix: Fixed ``scm`` replacement of the variable when exporting a conanfile. `#3576 <https://github.com/conan-io/conan/pull/3576>`_
- Bugfix: Apiv2 was retrying the downloads even when a 404 error was raised. `#3562 <https://github.com/conan-io/conan/pull/3562>`_
- Bugfix: `apiv2` was retrying the downloads even when a 404 error was raised. `#3562 <https://github.com/conan-io/conan/pull/3562>`_
- Bugfix: Fixed ``export_sources`` excluded patterns containing symlinks. `#3537 <https://github.com/conan-io/conan/pull/3537>`_
- Bugfix: Fixed bug with transitive private dependencies. `#3525 <https://github.com/conan-io/conan/pull/3525>`_
- Bugfix: ``get_cased_path`` crashed when the path didn't exist. `#3516 <https://github.com/conan-io/conan/pull/3516>`_
Expand Down
2 changes: 1 addition & 1 deletion extending/plugins.rst
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ Other useful task where a plugin may come handy are the upload and download acti
download/upload as a whole and for fine download tasks such as recipe and package downloads/uploads.

For example they can be used to sign the packages (including a file with the signature) when the package is created and and checking that
signature everytime they are downloaded.
signature every time they are downloaded.

.. code-block:: python
:caption: *signing_plugin.py*
Expand Down
12 changes: 6 additions & 6 deletions reference/build_helpers/autotools.rst
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,18 @@ This helper sets ``LIBS``, ``LDFLAGS``, ``CFLAGS``, ``CXXFLAGS`` and ``CPPFLAGS`

.. code-block:: python
:emphasize-lines: 13, 14, 15
from conans import ConanFile, AutoToolsBuildEnvironment
class ExampleConan(ConanFile):
settings = "os", "compiler", "build_type", "arch"
requires = "Poco/1.9.0@pocoproject/stable"
default_options = {"Poco:shared": True, "OpenSSL:shared": True}
def imports(self):
self.copy("*.dll", dst="bin", src="bin")
self.copy("*.dylib*", dst="bin", src="lib")
def build(self):
autotools = AutoToolsBuildEnvironment(self)
autotools.configure()
Expand Down Expand Up @@ -220,8 +220,8 @@ Configures `Autotools` project with the given parameters.

.. warning::

From Conan 1.8 this build helper sets the output library directory via ``--libdir`` automatically to ``${prefix}/lib``. This means that
if you are using the ``install()`` to package with AutoTools, library artifacts will be stored in the ``lib`` directory unless indicated
Since Conan 1.8 this build helper sets the output library directory via ``--libdir`` automatically to ``${prefix}/lib``. This means that
if you are using the ``install()`` method to package with AutoTools, library artifacts will be stored in the ``lib`` directory unless indicated
explicitly by the user.

This change was introduced in order to fix issues detected in some Linux distributions where libraries were being installed to the
Expand All @@ -231,7 +231,7 @@ Configures `Autotools` project with the given parameters.
This was considered a bug in the build helper, as it should be as much deterministic as possible when building the same package for the
same settings and generally for any other user input.

If you were already modelling the ``lib64`` folder in your recipe, make sure you use ``lib`` for ``self.cpp_info.libdirs`` or inject
If you were already modeling the ``lib64`` folder in your recipe, make sure you use ``lib`` for ``self.cpp_info.libdirs`` or inject
the argument in the Autotools' ``configure()`` method:

.. code-block:: python
Expand Down
8 changes: 6 additions & 2 deletions spelling_wordlist.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,11 @@ astroid
Astroid
auth
autodetect
Autodetected
autotools
Autotools
Autodetected
backend
Bincrafters
bindirs
bintray
Bintray
Expand Down Expand Up @@ -184,6 +185,7 @@ OpenSSL
openSUSE
os
OSInfo
overridable
param
pc
PkgConfig
Expand Down Expand Up @@ -223,9 +225,9 @@ Raspbian
rcfile
Readme
refactor
refactorings
Refactor
refactored
refactorings
regex
repo
Repo
Expand Down Expand Up @@ -262,6 +264,8 @@ subfolders
subsetting
subsettings
sudo
svn
SVN
symlink
symlinked
symlinks
Expand Down

0 comments on commit 7348b0c

Please sign in to comment.