conan: Add support for deploying to conan.io

.travis.yml

@@ -4,32 +4,40 @@ cache:
   directories:
   - container
 env:
-- CMAKE_GENERATOR="Unix Makefiles" CMAKE_VERSION="latest" DEPLOY="1"
-- CMAKE_GENERATOR="Ninja" CMAKE_VERSION="latest"
-- CMAKE_GENERATOR="Unix Makefiles" CMAKE_VERSION="3.0"
-- CMAKE_GENERATOR="Ninja" CMAKE_VERSION="3.0"
-- CMAKE_GENERATOR="Unix Makefiles" CMAKE_VERSION="latest" COVERAGE="--use-cmake-coverage"
+  matrix:
+  - CMAKE_GENERATOR="Unix Makefiles" CMAKE_VERSION="latest" DEPLOY="1"
+  - CMAKE_GENERATOR="Ninja" CMAKE_VERSION="latest"
+  - CMAKE_GENERATOR="Unix Makefiles" CMAKE_VERSION="3.0"
+  - CMAKE_GENERATOR="Ninja" CMAKE_VERSION="3.0"
+  - CMAKE_GENERATOR="Unix Makefiles" CMAKE_VERSION="latest" COVERAGE="--use-cmake-coverage"
+  global:
+  - secure: adljeqAATRn9f8EsV5FLW5B2utlX/n4DzfiEnJWonjlN+Aw8vEv7MrbCbQtP3qeR4DUr/7/qVkN0fVndN/wsesmTuTD1K/G1W4BNdePuOgWxCdbbgAxDHnfJ8YxKbezXS7y9zwfCYGVkyNqcszuU8QxPUCbBP+e6QaycabAPB+g=
+  - secure: QtxtzXXlr72oLovd34OOjhZXPC20qmOaCR3cNWC7EZT1ZrQBYw3yEMrAujbWVo8X7dLO3PWqmAPkD2VEwVPIdmpVRpUzbVINicDHP4uNZDovJSjB1gk0BjFWGdtQv++lV6C807TYURf/ZquvMPlwJijf15Ch3vRfc7Xjbhtd3OY=
+  - secure: lawrGhhJVtBysGT/rxtpmFpC1NIGJ4oW4PUwt5XDKjOiIYa6IdczEknFwqf5RDMKL0bC58YhFnn3JB4Mg4r1xxD/SOKuLu/15ykj7bE3KI/j0NpOEFLm4GlJw1T+u5nEiPP8DY4s9PZI274pGBfFi7X/w3anjdo71x79cPHLu8I=
+addons:
+  apt:
+    sources:
+    - deadsnakes
+    packages:
+    - python3.4-dev
 install:
 - eval $(curl -LSs --retry 100 --connect-timeout 3 public-travis-scripts.polysquare.org/bootstrap.py
-  | python /dev/stdin -d container -s setup/bii/setup.py -e bash -p /dev/stdout --cmake-version
-  ${CMAKE_VERSION})
+  | python /dev/stdin -d container -s setup/conan/setup.py -e bash -p /dev/stdout
+  --cmake-version ${CMAKE_VERSION})
 script:
-- polysquare_run check/bii/check.py ${COVERAGE} --cmake-namespace psq --generator
-  "${CMAKE_GENERATOR}" --block "smspillaz/cmake-header-language"
+- polysquare_run check/conan/check.py ${COVERAGE} --cmake-namespace psq --generator
+  "${CMAKE_GENERATOR}"
 before_cache:
 - polysquare_cleanup
 after_success:
-- polysquare_run coverage/bii/coverage.py
+- polysquare_run coverage/cmake/coverage.py
 before_deploy:
-- polysquare_run deploy/bii/deploy.py
+- polysquare_run deploy/conan/deploy.py --package="cmake-header-language"
 deploy:
-  provider: biicode
+  provider: script
+  script: "./travis-deploy"
   skip_cleanup: true
-  user:
-    secure: cUx4AGReNUNvOT+Xqfbwil232ORzcIrz9nlcQj8Z+R1mn+sxrGAU6tQ8PzItKOP2yJY6OME9E8Gqw6dkaBruGYnDa+mfyMf3ZNDBT/C/9OPc/XtnF5OVI+ftukv5DHzm3P9QTsfT7Oy7AJCWaZMpt0RqoBbZObMpWYaSqCY7Iyw=
-  password:
-    secure: kT862uvMJaRInrTDEx331+i8FAjsQWjrHtNhQ/Wl3qqJYsYk9BFPGszGZPK61ZGuxRRkcawsdnrCFFVOZBj2sPLAmBsAvDJHdW4H2s004P2a3JK9yWSwXylFVPHIpiBnyMJutlLm8tqyIXhvuRVbHTxvncHOCAlDcLpWs2WszEk=
   on:
     repo: polysquare/cmake-header-language
     branch: master
-    condition: ${DEPLOY} = 1
+    condition: "${DEPLOY} = 1"

CMakeLists.txt

@@ -3,31 +3,17 @@
 # Main entry point for PolysquareCMakeHeaderLanguageTests tests.
 #
 # See /LICENCE.md for Copyright information
-
-if (NOT CMAKE_SCRIPT_MODE_FILE)
-
-    project (PolysquareCMakeHeaderLanguageTests NONE)
-    set (NEW_POLICIES CMP0025 CMP0056)
-
-    foreach (POLICY ${NEW_POLICIES})
-
-        if (POLICY ${POLICY})
-
-            cmake_policy (SET ${POLICY} NEW)
-
-        endif ()
-
-    endforeach ()
-
-endif ()
+include ("${CMAKE_CURRENT_LIST_DIR}/conanbuildinfo.cmake")
+set (_CURRENT_LIST_FILE "${CMAKE_CURRENT_LIST_FILE}")
+set (CMAKE_MODULE_PATH
+     "${CMAKE_CURRENT_LIST_DIR}"
+     ${CONAN_CMAKE_MODULE_PATH}  # NOLINT:correctness/quotes
+     ${CMAKE_MODULE_PATH})  # NOLINT:correctness/quotes
 
 cmake_minimum_required (VERSION 2.8)
 
-set (_CURRENT_LIST_FILE "${CMAKE_CURRENT_LIST_FILE}")
-set (CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR};${CMAKE_MODULE_PATH}")
-
-include ("smspillaz/cmake-unit/CMakeUnitRunner")
-include ("smspillaz/cmake-unit/CMakeUnit")
+include ("cmake/cmake-unit/CMakeUnitRunner")
+include ("cmake/cmake-unit/CMakeUnit")
 include (DetermineHeaderLanguage)
 
 # Add source and header files in the following include hierarchy:

DetermineHeaderLanguage.cmake

@@ -4,15 +4,7 @@
 # can be used to determine which language mode certain tools should run in.
 #
 # See /LICENCE.md for Copyright information
-if (NOT BIICODE)
-
-    set (CMAKE_MODULE_PATH
-         "${CMAKE_CURRENT_LIST_DIR}/bii/deps"
-         "${CMAKE_MODULE_PATH}")
-
-endif (NOT BIICODE)
-
-include ("smspillaz/cmake-include-guard/IncludeGuard")
+include ("cmake/cmake-include-guard/IncludeGuard")
 cmake_include_guard (SET_MODULE_PATH)
 
 include (CMakeParseArguments)

appveyor.yml

@@ -20,13 +20,13 @@ before_build:
 install:
  - ps: $env:PATH="C:\\MinGW\bin;C:\\Python34;C:\\Python34\\Scripts;C:\\Python27;C:\\Python27\Scripts;C:\\Ruby21\bin:$env:PATH"
  - ps: wget public-travis-scripts.polysquare.org/bootstrap.py -OutFile bootstrap
- - ps: python bootstrap -d "C:/container" -s setup/bii/setup.py -e powershell -p test-env.ps1 --no-mdl --cmake-version latest
+ - ps: python bootstrap -d "C:/container" -s setup/conan/setup.py -e powershell -p test-env.ps1 --no-mdl --cmake-version latest
  - ps: . ./test-env
 
 build: false
 
 test_script:
- - ps: polysquare_run check/bii/check.py --no-mdl --generator "$env:CMAKE_GENERATOR" --block "smspillaz/cmake-header-language" --namespace "psq"
+ - ps: polysquare_run check/conan/check.py --no-mdl --generator "$env:CMAKE_GENERATOR" --namespace "psq"
 
 after_test:
  - ps: polysquare_cleanup

conanfile.py

@@ -0,0 +1,30 @@
+from conans import ConanFile
+from conans.tools import download, unzip
+import os
+
+VERSION = "0.0.1"
+
+
+class CMakeHeaderLanguageConan(ConanFile):
+    name = "cmake-header-language"
+    version = os.environ.get("CONAN_VERSION_OVERRIDE", VERSION)
+    generators = "cmake"
+    requires = ("cmake-include-guard/master@smspillaz/cmake-include-guard",
+                "cmake-unit/master@smspillaz/cmake-unit")
+    url = "http://github.com/polysquare/cmake-header-language"
+    license = "MIT"
+
+    def source(self):
+        zip_name = "cmake-header-language.zip"
+        download("https://github.com/polysquare/"
+                 "cmake-header-language/archive/{version}.zip"
+                 "".format(version="v" + VERSION),
+                 zip_name)
+        unzip(zip_name)
+        os.unlink(zip_name)
+
+    def package(self):
+        self.copy(pattern="*.cmake",
+                  dst="cmake/cmake-header-language",
+                  src="cmake-header-language-" + VERSION,
+                  keep_path=True)