Merge remote-tracking branch 'official/master' into ivs

.github/CONTRIBUTING.rst

@@ -1,3 +1,3 @@
-Please read `contributing guide <https://github.com/ruslo/hunter/wiki/dev.contribution>`__ before sending pull requests.
+Please read `contributing guide <https://docs.hunter.sh/en/latest/contributing.html>`__ before sending pull requests or reporting bugs.
 
 Thanks.

.gitignore

@@ -25,3 +25,7 @@ _Base
 # emacs junk
 *.*~
 *~
+
+# Clion
+.idea/
+

.travis.yml

@@ -1,11 +1,11 @@
 # OSX/Linux (https://github.com/travis-ci-tester/toolchain-table)
 
+# Workaround for https://github.com/travis-ci/travis-ci/issues/8363
 language:
-  - cpp
+  - minimal
 
 os:
   - linux
-  - osx
 
 # Container-based infrastructure (Linux)
 # * https://docs.travis-ci.com/user/migrating-from-legacy/#How-can-I-use-container-based-infrastructure%3F
@@ -14,48 +14,16 @@ sudo:
 
 # Install packages differs for container-based infrastructure
 # * https://docs.travis-ci.com/user/migrating-from-legacy/#How-do-I-install-APT-sources-and-packages%3F
-# * http://stackoverflow.com/a/30925448/2288008
 addons:
   apt:
-    sources:
-      - ubuntu-toolchain-r-test
     packages:
-      - python3
-      - python-enchant # for documentation
+      - python3-pip
+      - enchant # for documentation
 
-      # python3-pip package is not available, use 'easy_install3':
-      # * https://github.com/travis-ci/apt-package-whitelist/issues/768
-      - python3-setuptools # easy_install3
-
-      # https://github.com/travis-ci-tester/travis-test-clang-cxx-11
-      - libstdc++-4.8-dev
-
-      # https://github.com/travis-ci-tester/travis-test-gcc-cxx-11
-      - g++-4.8
+dist:
+  - trusty
 
 env:
-  - PROJECT_DIR=tests/simple TOOLCHAIN=default
-  - PROJECT_DIR=tests/issue/22 TOOLCHAIN=default
-  - PROJECT_DIR=tests/issue/24/unit TOOLCHAIN=default
-  - PROJECT_DIR=tests/issue/107 TOOLCHAIN=default
-  - PROJECT_DIR=tests/issue/109/unit TOOLCHAIN=default
-  - PROJECT_DIR=tests/autotools-merge-lipo TOOLCHAIN=default
-  - PROJECT_DIR=tests/hunter_create_args_file TOOLCHAIN=default
-  - PROJECT_DIR=tests/hunter_create_dependency_entry TOOLCHAIN=default
-  - PROJECT_DIR=tests/hunter_create_deps_info TOOLCHAIN=default
-  - PROJECT_DIR=tests/hunter_download_cache_meta_file TOOLCHAIN=default
-  - PROJECT_DIR=tests/hunter_download_cache_raw_file TOOLCHAIN=default
-  - PROJECT_DIR=tests/hunter_generate_qt_info TOOLCHAIN=default
-  - PROJECT_DIR=tests/hunter_get_package_deps TOOLCHAIN=default
-  - PROJECT_DIR=tests/hunter_get_package_deps_recurse TOOLCHAIN=default
-  - PROJECT_DIR=tests/hunter_pack_directory TOOLCHAIN=default
-  - PROJECT_DIR=tests/hunter_register_dependency TOOLCHAIN=default
-  - PROJECT_DIR=tests/hunter_setup_msvc TOOLCHAIN=default
-  - PROJECT_DIR=tests/hunter_sleep_before_download TOOLCHAIN=default
-  - PROJECT_DIR=tests/hunter_unpack_directory TOOLCHAIN=default
-  - PROJECT_DIR=tests/hunter_init_not_found_counter TOOLCHAIN=default
-  - PROJECT_DIR=tests/hunter_check_toolchain_definition TOOLCHAIN=default
-
   - TOOLCHAIN=generate-documentation-test
 
 install:
@@ -68,7 +36,7 @@ install:
   # Install Python package 'requests'
   # 'easy_install3' is not installed by 'brew install python3' on OS X 10.9 Maverick
   - if [[ "`uname`" == "Darwin" ]]; then pip3 install requests; fi
-  - if [[ "`uname`" == "Linux" ]]; then travis_retry easy_install3 --user requests==2.10.0; fi
+  - if [[ "`uname`" == "Linux" ]]; then travis_retry pip3 install --user requests; fi
 
   # Install latest Polly toolchains and scripts
   - wget https://github.com/ruslo/polly/archive/master.zip
@@ -87,18 +55,8 @@ install:
   - export ANDROID_NDK_r11c="`pwd`/_ci/android-ndk-r11c"
 
 script:
-  - >
-    if [[ "${TOOLCHAIN}" == "generate-documentation-test" && "`uname`" == "Linux" ]];
-    then
-      cd docs
-      ./jenkins.sh
-    fi
-
-  - >
-    if [[ "${TOOLCHAIN}" != "generate-documentation-test" ]];
-    then
-      python3 ./jenkins.py
-    fi
+  - cd docs
+  - ./jenkins.sh
 
 branches:
   except:

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2013-2016, Ruslan Baratov
+Copyright (c) 2013-2017, Ruslan Baratov
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,

README.rst

@@ -7,31 +7,36 @@ https://github.com/ivsgroup/hunter_master
 Hunter
 ======
 
-Cross-platform package manager for C++ (based on CMake ``ExternalProject``).
-Supported platforms: **Linux**, **Mac**, **Windows**, **iOS**, **Android**, **Raspberry Pi**.
+|gitter| |rtfd| |travis| |appveyor| |license|
 
+CMake-driven cross-platform package manager for C++.
+Supported platforms: **Linux**, **Mac**, **Windows**, **iOS**, **Android**, **Raspberry Pi**.
 
 * Documentation: https://docs.hunter.sh
-* Supported Packages: https://docs.hunter.sh/en/latest/packages.html
+* Packages: https://docs.hunter.sh/en/latest/packages.html
 * Sources: https://github.com/ruslo/hunter
 * Reporting issues: https://github.com/ruslo/hunter/issues/new
 * Contributing guide: https://docs.hunter.sh/en/latest/contributing.html
-* License: `BSD 2-Clause <https://raw.githubusercontent.com/ruslo/hunter/master/LICENSE>`_
 * Contacts: https://docs.hunter.sh/en/latest/contacts.html
-* |gitter|
+* `Per package testing table <https://github.com/ingenue/hunter/branches/all>`_
 
 .. |gitter| image:: https://badges.gitter.im/ruslo/hunter.svg
   :target: https://gitter.im/ruslo/hunter
-
-CI
---
-
-* Travis CI OSX/Linux: |TravisCI|
-* AppVeyor CI Windows: |AppVeyor|
-* `Per package deep testing table <https://github.com/ingenue/hunter/branches/all>`_
-
-.. |TravisCI| image:: https://travis-ci.org/ruslo/hunter.svg?branch=master
-  :target: https://travis-ci.org/ruslo/hunter/builds
+  :alt: Gitter public chat room
+
+.. |rtfd| image:: https://readthedocs.org/projects/hunter/badge/?version=latest
+  :target: http://hunter.readthedocs.io/en/latest/?badge=latest
+  :alt: Documentation status
+
+.. |travis| image:: https://img.shields.io/travis/ingenue/hunter/pkg.gtest.svg?style=flat-square&label=Linux%20OSX%20Android%20iOS
+  :target: https://travis-ci.org/ingenue/hunter/builds
+  :alt: Travis CI
+
+.. |appveyor| image:: https://img.shields.io/appveyor/ci/ingenue/hunter/pkg.gtest.svg?style=flat-square&label=Windows
+  :target: https://ci.appveyor.com/project/ingenue/hunter/history
+  :alt: AppVeyor CI
+
+.. |license| image:: https://img.shields.io/github/license/ruslo/hunter.svg
+  :target: https://github.com/ruslo/hunter/blob/master/LICENSE
+  :alt: LICENSE
 
-.. |AppVeyor| image:: https://ci.appveyor.com/api/projects/status/ubo6jse3lh5ciyvv/branch/master?svg=true
-  :target: https://ci.appveyor.com/project/ruslo/hunter/history