Merge pull request #293 from Creepsky/development

1.7.16

.appveyor.yml

@@ -0,0 +1,83 @@
+# Notes:
+#   - Minimal appveyor.yml file is an empty file. All sections are optional.
+#   - Indent each level of configuration with 2 spaces. Do not use tabs!
+#   - All section names are case-sensitive.
+#   - Section names should be unique on each level.
+
+#---------------------------------#
+#      general configuration      #
+#---------------------------------#
+
+# branches to build
+branches:
+  # blacklist
+  except:
+    - gh-pages
+
+#---------------------------------#
+#    environment configuration    #
+#---------------------------------#
+
+# Build worker image (VM template)
+image: Visual Studio 2017
+
+# scripts that run after cloning repository
+install:
+  - pip install conan
+
+#---------------------------------#
+#       build configuration       #
+#---------------------------------#
+
+# build platform, i.e. x86, x64, Any CPU. This setting is optional.
+platform: x64
+
+# build Configuration, i.e. Debug, Release, etc.
+configuration: Release
+
+build:
+  parallel: true                  # enable MSBuild parallel builds
+  project: creepMiner.vcxproj     # path to Visual Studio solution or project
+
+  # MSBuild verbosity level
+  verbosity: normal
+
+# scripts to run before build
+before_build:
+  - mkdir C:\projects\creepMiner\bin\Release
+  - cd C:\projects\creepminer
+  - conan install . -o Poco:shared=False -o OpenSSL:shared=False -o zlib:shared=False --build=missing
+  - cmake CMakeLists.txt -G "Visual Studio 15 2017 Win64" -DUSE_CUDA=OFF -DUSE_OPENCL=OFF -DCMAKE_BUILD_TYPE=RELEASE
+
+# scripts to run after build
+after_build:
+  - CPack -C Release
+
+#---------------------------------#
+#      artifacts configuration    #
+#---------------------------------#
+
+artifacts:
+  # pushing a single file
+  - path: '*.exe'
+  - path: '*.zip'
+
+#---------------------------------#
+#     deployment configuration    #
+#---------------------------------#
+
+# providers: Local, FTP, WebDeploy, AzureCS, AzureBlob, S3, NuGet, Environment
+# provider names are case-sensitive!
+deploy:
+
+    # Deploy to GitHub Releases
+  - provider: GitHub
+    artifact: /.*\.(exe|zip)
+    draft: false
+    prerelease: false
+    force_update: true
+    auth_token:
+      secure: cIGGvYiRLrapIH5uW9tl18cGB7qgBTTkrOo+yFo0Hcv7zl0KYu0qUaxFRvKLj1Yi
+    on:
+      branch: master
+      appveyor_repo_tag: true       # deploy on tag push only

.gitignore

@@ -18,7 +18,6 @@
 x64/
 x86/
 bld/
-[Bb]in/
 [Oo]bj/
 [Ll]og/
 
@@ -336,7 +335,6 @@ hs_err_pid*
 *.pydevproject
 .metadata
 .gradle
-bin/
 tmp/
 *.tmp
 *.bak
@@ -398,8 +396,6 @@ buildNumber.properties
 makefile
 mining.conf
 *.graphml
-!/bin/*.dll
-!/bin/public/*
 build/
 
 # Visual Code
@@ -414,4 +410,20 @@ Makefile
 cmake_install.cmake
 install_manifest.txt
 compile_commands.json
-CTestTestfile.cmake
+CTestTestfile.cmake
+CMakeSettings.json
+
+# conan
+conanbuildinfo.cmake
+conanbuildinfo.txt
+conaninfo.txt
+conan_imports_manifest.txt
+
+CPackConfig.cmake
+CPackSourceConfig.cmake
+_CPack_Packages/
+lib/
+*.deb
+*.rpm
+*.tar*
+bin

.travis.yml

@@ -1,24 +1,83 @@
 language: cpp
-sudo: true
-dist: trusty
-compiler: gcc
-env: CXX=g++-5 CXXFLAGS="-std=c++14"
-os: linux
-group: stable
-cache:
-  directories:
-  - $TRAVIS_BUILD_DIR/poco-1.7.8p3-all
+sudo: false
 before_install:
-- if [ "$(ls -A poco-1.7.8p3-all)" ]; then cd poco-1.7.8p3-all && sudo ldconfig && sudo make install; else ./install-poco.sh; fi
-install:
-- if [ "$CXX" = "g++" ]; then export CXX="g++-5" CC="gcc-5"; fi
-addons:
-  apt:
-    sources:
-    - ubuntu-toolchain-r-test
-    packages:
-    - g++-5
-script: 
-- cd $TRAVIS_BUILD_DIR/
-- cmake CMakeLists.txt -DCMAKE_BUILD_TYPE=Release -DNO_GPU=ON
-- make
+- eval "${MATRIX_EVAL}"
+matrix:
+  fast_finish: true
+  include:
+#  - os: osx
+#    compiler: clang
+#    script:
+#    - conan install . --build=missing
+#    - cmake . -DNO_GPU=ON
+#    - make -j$(nproc)
+#    env:
+#    - NAME="osx clang" MATRIX_EVAL="brew install conan"
+#    cache:
+#      directories:
+#      - "$HOME/.conan"
+  - os: linux
+    addons:
+      apt:
+        sources:
+        - ubuntu-toolchain-r-test
+        packages:
+        - g++-5
+        - rpm
+    env:
+    - NAME="linux g++-5" MATRIX_EVAL="CC=gcc-5 && CXX=g++-5"
+    script:
+    - pip install conan --user
+    - conan install . --build=missing
+    - cmake . -DNO_GPU=ON
+    - make -j$(nproc)
+    - make package
+    cache:
+      directories:
+      - "$HOME/.conan"
+    deploy:
+      provider: releases
+      skip_cleanup: true
+      file_glob: true
+      file:
+      - "*.deb"
+      - "*.tar.gz"
+      on:
+        tags: true
+      api_key:
+        secure: xs3GCmymdo/fo46+ELma466ZdnYtYnQtV68EE3wbhXJD1Kc4Wq+rRiHXIpR+fhWhDFsbaiM0KIhjbMwwmphnXOhcVXvcufxqtvMxEySWx9uPOsIQ+LoeElmiU4AmmnEerVOEYDACj//KianI6Zm70PIwUBYGBaW41x97jhe4WLoQdKPj/ORsEGh/oZtJfI05qXzW1UdF6labSD/4jcx6CEsiFFCAh7EeAZjB0rhqfknp1IGn3N1G+rN43zYgMs9D3ww9PRDZdGlMqYk4cJglCQQAqQa0I71LtNcgkKNxfh4JBz8qyHRrTPr4tQXhtz9IPrQFLmSKtCvTJjjmUZ5RE2FqhVPXxswBKEv43tsDklqDt/qGjlcuMZwnn3c18R2gkBx2kXpyie6ujXIxrWaiao6Mp+OS2knzb5ebI4fqj6G8+mwQNheuR5qcmnZVfgv6CyCLxVgIOZEGaq6TBS9+6FiP6pqpKP3ySM/etmQB8GwDz53aUYirykL7sjunYMxiqf7T6XSwqHiZJWZUVZVPNxhEft2BVaxwhCf78KasZd0tzFfsEb0NM8vfKSAkj4zTdYTW3it6iSjH30PJbOjDuYSMC1Aje/T5q8JnPXJcIB2/i1BkAp37VXgC6ebOT/cSQsliVptzZx4ZXjuIN8zkuf6ka6NYNKVYOFRv5pChJoc=
+      branch: master
+  - os: linux
+    addons:
+      apt:
+        sources:
+        - ubuntu-toolchain-r-test
+        packages:
+        - g++-6
+    env:
+    - NAME="linux g++-6" MATRIX_EVAL="CC=gcc-6 && CXX=g++-6"
+    script:
+    - pip install conan --user
+    - conan install . --build=missing
+    - cmake . -DNO_GPU=ON
+    - make -j$(nproc)
+    cache:
+      directories:
+      - "$HOME/.conan"
+  - os: linux
+    addons:
+      apt:
+        sources:
+        - ubuntu-toolchain-r-test
+        packages:
+        - g++-7
+    env:
+    - NAME="linux g++-7" - MATRIX_EVAL="CC=gcc-7 && CXX=g++-7"
+    script:
+    - pip install conan --user
+    - conan install . --build=missing
+    - cmake . -DNO_GPU=ON
+    - make -j$(nproc)
+    cache:
+      directories:
+      - "$HOME/.conan"