diff --git a/404.rst b/404.rst new file mode 100644 index 00000000000..d003c9fb2bf --- /dev/null +++ b/404.rst @@ -0,0 +1,14 @@ +:orphan: + +Page Not Found +============== + +Unfortunately, the page you are looking for does not exist or was removed. + +You can look into our reference tree, or use the search bar for a desired topic. + +If you think this is an error and the page should be there, please open an `issue `_ . + +.. image:: images/frogarian.png + :width: 240 px + :align: center diff --git a/changelog.rst b/changelog.rst index fecd3832925..641cb52da54 100644 --- a/changelog.rst +++ b/changelog.rst @@ -21,12 +21,19 @@ Check https://github.com/conan-io/conan for issues and more details about develo Conan 1.25 shouldn't break any existing 1.0 recipe or command line invocation. If it does, please submit a report on GitHub. Read more about the :ref:`Conan stability commitment`. +1.25.2 (19-May-2020) +-------------------- + +- Bugfix: Previously conan always set ``cpp_std`` option in meson project, even if ``cppstd`` option was not set in conan profile. Now it sets the option only if ``cppstd`` profile option has a concrete value. `#7047 `_ +- Bugfix: Fix deploy generator management of relative symlinks. `#7044 `_ +- Bugfix: Fixes an issue where Apple Framework lookup wasn't working on RelWithDebInfo. `#7041 `_ +- Bugfix: Fix broken ``AutoToolsBuildEnvironment`` when a profile:build is defined. `#7032 `_ + 1.25.1 (13-May-2020) -------------------- - Feature: Add missing gcc versions: 6.5, 7.5, 8.4, 10.1. `#6993 `_ . Docs `here `__ - Bugfix: Resumable download introduced a bug when there is a fronted (like Apache) to Artifactory or other server that gzips the returned files, returning an incorrect ``Content-Length`` header that doesn't match the real content length. `#6996 `_ -- Bugfix: Fix deploy generator in regards to relative symlinks. `#6994 `_ - Bugfix: Set ``shared_linker_flags`` to CMake ``MODULE`` targets too in ``cmake`` generators, not only to ``SHARED_LIBRARIES``. `#6983 `_ - Bugfix: Fix `conan_get_policy` return value. `#6982 `_ - Bugfix: Fix json output serialization for ``cpp_info.components``. `#6966 `_ diff --git a/conf.py b/conf.py index 085c09a88be..91679d35a41 100644 --- a/conf.py +++ b/conf.py @@ -37,12 +37,13 @@ 'conan', 'sphinxcontrib.spelling', 'sphinx_sitemap', + 'notfound.extension', ] # The short X.Y version. version = "1.25" # The full version, including alpha/beta/rc tags. -release = u'1.25.1' +release = u'1.25.2' dir_path = os.path.dirname(os.path.realpath(__file__)) if not os.path.exists(os.path.join(dir_path, "versions.json")): @@ -396,6 +397,9 @@ linkcheck_timeout = 90 linkcheck_retries = 2 +# Not Found +notfound_pagename = 'Page Not Found' + # copy legacy redirects def copy_legacy_redirects(app, docname): # Sphinx expects two arguments @@ -453,7 +457,7 @@ def copy_legacy_redirects(app, docname): # Sphinx expects two arguments """ - + if app.builder.name == 'html': for html_src_path, dst_path in redirect_files.items(): target_path = app.outdir + '/' + html_src_path diff --git a/images/frogarian.png b/images/frogarian.png new file mode 100644 index 00000000000..4e62d700d1f Binary files /dev/null and b/images/frogarian.png differ diff --git a/integrations/deployment/flatpak.rst b/integrations/deployment/flatpak.rst index ed82bf942f7..a76f6eb4552 100644 --- a/integrations/deployment/flatpak.rst +++ b/integrations/deployment/flatpak.rst @@ -12,14 +12,14 @@ The major advantage of ``Flatpak`` is sandboxing: each application runs in its o (e.g. network, bluetooth, host filesystem, etc.). ``Flatpak`` also offers a set of runtimes for various Linux desktop applications, e.g. `Freedesktop `_, `GNOME `_ and `KDE `_. -The `packaging process `__ is: +The `packaging process `__ is: - Install the flatpak runtime, flatpak-builder and SDK. - Create a manifest ``.json`` - Run the ``flatpak-builder`` in order to produce the application -- `Publish `__ the application for further distribution +- `Publish `__ the application for further distribution -With help of conan's :ref:`json generator`, the `manifest `_ creation could be easily automated. For example, the custom script could generate ``build-commands`` and ``sources`` entries within the manifest file: +With help of conan's :ref:`json generator`, the `manifest `_ creation could be easily automated. For example, the custom script could generate ``build-commands`` and ``sources`` entries within the manifest file: .. code-block:: python @@ -62,4 +62,4 @@ With help of conan's :ref:`json generator`, the `mani manifest["modules"][0]["sources"].extend(sources) manifest["modules"][0]["build-commands"].extend(build_commands) -Alternatively, ``flatpak`` allows distributing the `single-file `_ package. Such package, however, cannot be run or installed on its own, it's needed to be imported to the local repository on another machine. +Alternatively, ``flatpak`` allows distributing the `single-file `_ package. Such package, however, cannot be run or installed on its own, it's needed to be imported to the local repository on another machine. diff --git a/integrations/deployment/makeself.rst b/integrations/deployment/makeself.rst index 4e0312597d4..3a8dc10adaf 100644 --- a/integrations/deployment/makeself.rst +++ b/integrations/deployment/makeself.rst @@ -4,7 +4,7 @@ Makeself -------- `Makeself `_ is a small command-line utility to generate self-extracting archives for Unix. It is pretty popular and it -is used by `VirtualBox `_ and `CMake `_ projects. +is used by `VirtualBox `_ and `CMake `_ projects. Makeself creates archives that are just small startup scripts (*.run*, *.bin* or *.sh*) concatenated with tarballs. diff --git a/reference/conanfile/attributes.rst b/reference/conanfile/attributes.rst index 7ce24f84bb3..d050564d755 100644 --- a/reference/conanfile/attributes.rst +++ b/reference/conanfile/attributes.rst @@ -100,8 +100,8 @@ This attribute can contain several, comma separated licenses. It is a text strin contain any text, including hyperlinks to license files elsewhere. However, we strongly recommend packagers of Open-Source projects to use -[SPDX](https://spdx.org/) identifiers from the [SPDX license -list](https://spdx.org/licenses/) instead of free-formed text. This will help +[SPDX](https://spdx.dev/) identifiers from the [SPDX license +list](https://spdx.dev/licenses/) instead of free-formed text. This will help people wanting to automate license compatibility checks, like consumers of your package, or you if your package has Open-Source dependencies. diff --git a/requirements.txt b/requirements.txt index 0eb3ccdbb06..9c718a8a865 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,7 @@ sphinx==1.7.9 sphinx-sitemap>=2.1.0 sphinxcontrib-spelling +sphinx-notfound-page elasticsearch>=6.0.0,<7.0.0 boto3 requests