Merge branch 'master' of https://github.com/domoticz/domoticz.git

Author: gizmocuz

.travis.yml

@@ -0,0 +1,19 @@
+branches:
+  except:
+    - /^[0-9]/
+language: cpp
+compiler:
+  - gcc
+before_install:
+  - sudo apt-get update -qq
+  - sudo apt-get install -y build-essential
+  - sudo apt-get install -y nano cmake libboost1.48-all-dev libsqlite3-dev curl libcurl4-openssl-dev libusb-dev zlib1g-dev libssl-dev libudev-dev git
+  - git clone https://github.com/OpenZWave/open-zwave.git
+  - ln -s open-zwave open-zwave-read-only
+  - git fetch --unshallow
+script:
+  - (cd open-zwave-read-only; make)
+  - cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_LIBRARY_PATH=open-zwave-read-only
+  - make
+before_deploy:
+  - tar czf domoticz_${TRAVIS_BUILD_NUMBER}.tgz domoticz History.txt License.txt svnversion.h domoticz.sh --exclude .git www/ scripts/ Config/

appveyor.yml

@@ -0,0 +1,16 @@
+version: 1.0.{build}
+os: Visual Studio 2015
+
+install:
+- ps: cinst innosetup
+
+build_script:
+- cd msbuild
+- appveyor DownloadFile https://github.com/domoticz/win32-libraries/blob/master/WindowsLibraries.zip?raw=true
+- '7z x WindowsLibraries.zip > NUL:'
+- cd ..
+- msbuild msbuild\domoticz.sln /p:Configuration=Release /verbosity:minimal /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
+- '"C:\Program Files (x86)\Inno Setup 5\ISCC.exe" msbuild\WindowsInstaller\DomoticzSetup.iss'
+
+artifacts:
+- path: msbuild\WindowsInstaller\DomoticzSetup*.exe