Merge branch 'master' into osx

Author: ruslo

.travis.yml

@@ -1,17 +1,25 @@
 language:
     - objective-c
 
+install:
+  # install cmake toolchains and script
+  - POLLY_VERSION="0.7.1"
+  - wget "https://github.com/ruslo/polly/archive/v${POLLY_VERSION}.tar.gz"
+  - tar xf "v${POLLY_VERSION}.tar.gz"
+  - export PATH="`pwd`/polly-${POLLY_VERSION}/bin:${PATH}"
+
 script:
-    - ./run-test.sh
-    - export FILE_TO_UPLOAD=$(ls *.txt)
-    - echo "Deploying to GitHub releases: $FILE_TO_UPLOAD"
+  - build.py --verbose --pack TGZ --config Release
+
+before_deploy:
+  - export FILE_TO_UPLOAD=$(ls _builds/default-Release/Foo-*.tar.gz)
 
 deploy:
-    provider: releases
-    api_key:
-        - secure: "kmV8Pzv+2otsNk8R9CtTU/qE4lgr4Jhul6j6vrueTlUhkA2K2jtMd93hDEA23h/7bsULl1p2yE6WhLiFl8zMC7KrBEcqCycHybmYQ/WezRg3dKXAQFpXs8k23K2QJLr+r6DvOf4OLLOnYhW2Z0qDvBOHVk4tFG9jV/kXrCLK8HRjW09hLNz5Cidrtu9pXHxkFh6+UP1v8cpmuC1BsMoH/9eN6vPUKTeKY/GD3jwJuUTWljmiQluWuvNdoGNaer1IZE7GI7DZ/NL+48kGKkO4Qf7Tmm0XttaoPM8eyJl9fYkKpxkghI7MJOQDnLojNr94XNHd0QpjfKypNRv/qkxiiI/ZtUZfkDIif2o4DupBS+pG8RdKIvT6mGtrn7jGJlbgNaEiierJVztLZ2Ice0I3Jp9gUtkLE/ebpix/fZcRRJIAHJg9YArwK6QMU7RReito5kW5jAXm3Z9KdQhM2ffY9xczT/QA6V703hfcnq6zwiYKN0xh5LAh4OTerH6iTWTKZP+PubL3areo9TaAsUDu1T3wO77yXiVy2cZX78ooIF1GAwiNGGoYf24jb7k8BzdJUQLXSKBmgwPCAsxqbBKT7yarJCTivMJ8hTvlX7ZHrss6ILdi8oV0hU0OzZZ5Jv0pVTmDd93i3sUP6ma1Ddabf6sw+BLfNOR05IGH0KPDU3A="
-    file_glob: true
-    file: "${FILE_TO_UPLOAD}"
-    skip_cleanup: true
-    on:
-        tags: true
+  provider: releases
+  api_key:
+    - secure: "kmV8Pzv+2otsNk8R9CtTU/qE4lgr4Jhul6j6vrueTlUhkA2K2jtMd93hDEA23h/7bsULl1p2yE6WhLiFl8zMC7KrBEcqCycHybmYQ/WezRg3dKXAQFpXs8k23K2QJLr+r6DvOf4OLLOnYhW2Z0qDvBOHVk4tFG9jV/kXrCLK8HRjW09hLNz5Cidrtu9pXHxkFh6+UP1v8cpmuC1BsMoH/9eN6vPUKTeKY/GD3jwJuUTWljmiQluWuvNdoGNaer1IZE7GI7DZ/NL+48kGKkO4Qf7Tmm0XttaoPM8eyJl9fYkKpxkghI7MJOQDnLojNr94XNHd0QpjfKypNRv/qkxiiI/ZtUZfkDIif2o4DupBS+pG8RdKIvT6mGtrn7jGJlbgNaEiierJVztLZ2Ice0I3Jp9gUtkLE/ebpix/fZcRRJIAHJg9YArwK6QMU7RReito5kW5jAXm3Z9KdQhM2ffY9xczT/QA6V703hfcnq6zwiYKN0xh5LAh4OTerH6iTWTKZP+PubL3areo9TaAsUDu1T3wO77yXiVy2cZX78ooIF1GAwiNGGoYf24jb7k8BzdJUQLXSKBmgwPCAsxqbBKT7yarJCTivMJ8hTvlX7ZHrss6ILdi8oV0hU0OzZZ5Jv0pVTmDd93i3sUP6ma1Ddabf6sw+BLfNOR05IGH0KPDU3A="
+  file_glob: true
+  file: "${FILE_TO_UPLOAD}"
+  skip_cleanup: true
+  on:
+    tags: true

CMakeLists.txt

@@ -0,0 +1,25 @@
+cmake_minimum_required(VERSION 2.8)
+project(Foo)
+
+add_library(foo foo.cpp)
+add_executable(boo foo.cpp)
+
+install(TARGETS foo DESTINATION lib)
+install(TARGETS boo DESTINATION bin)
+
+string(COMPARE EQUAL "$ENV{TRAVIS_TAG}" "" is_empty)
+if(NOT is_empty)
+  string(REGEX REPLACE "^v([0-9]+)\\.[0-9]+\\.[0-9]+$" "\\1" major_ver "$ENV{TRAVIS_TAG}")
+  string(REGEX REPLACE "^v[0-9]+\\.([0-9]+)\\.[0-9]+$" "\\1" minor_ver "$ENV{TRAVIS_TAG}")
+  string(REGEX REPLACE "^v[0-9]+\\.[0-9]+\\.([0-9]+)$" "\\1" patch_ver "$ENV{TRAVIS_TAG}")
+else()
+  set(major_ver 0)
+  set(minor_ver 0)
+  set(patch_ver 0)
+endif()
+
+set(CPACK_PACKAGE_VERSION_MAJOR ${major_ver})
+set(CPACK_PACKAGE_VERSION_MINOR ${minor_ver})
+set(CPACK_PACKAGE_VERSION_PATCH ${patch_ver})
+
+include(CPack)

foo.cpp

@@ -0,0 +1,5 @@
+#include <iostream>
+
+int main() {
+  std::cout << "Hello" << std::endl;
+}