Merge branch 'master' into multicastvnc

Author: bk138

.appveyor.yml

@@ -0,0 +1,60 @@
+
+environment:
+  matrix:
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
+      DEVENV_EXE: C:\"Program Files (x86)"\"Microsoft Visual Studio 14.0"\Common7\IDE\devenv.exe
+      VSDEVCMD_BAT: C:\"Program Files (x86)"\"Microsoft Visual Studio 14.0"\Common7\Tools\VsDevCmd.bat
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+      DEVENV_EXE: C:\"Program Files (x86)"\"Microsoft Visual Studio"\2017\Community\Common7\IDE\devenv.exe
+      VSDEVCMD_BAT: C:\"Program Files (x86)"\"Microsoft Visual Studio"\2017\Community\Common7\Tools\VsDevCmd.bat
+
+install:
+  - if not exist deps mkdir deps
+  - cd deps
+  # zlib
+  - curl -fsSL -o zlib.tar.gz https://github.com/madler/zlib/archive/v1.2.8.tar.gz
+  - 7z x zlib.tar.gz -so | 7z x -si -ttar > nul
+  - move zlib-1.2.8 zlib
+  - cd zlib
+  - cmake .
+  - cmake --build .
+  - cd ..
+  # libPNG
+  - curl -fsSL -o libpng.tar.gz http://prdownloads.sourceforge.net/libpng/libpng-1.6.28.tar.gz?download
+  - 7z x libpng.tar.gz -so | 7z x -si -ttar > nul
+  - move libpng-1.6.28 libpng
+  - cd libpng
+  - cmake . -DZLIB_INCLUDE_DIR=..\zlib -DZLIB_LIBRARY=..\zlib\debug\zlibstaticd.lib
+  - cmake --build .
+  - cd ..
+  # Berkeley DB - required by SASL
+  - curl -fsSL -o db-4.1.25.tar.gz http://download.oracle.com/berkeley-db/db-4.1.25.tar.gz
+  - 7z x db-4.1.25.tar.gz -so | 7z x -si -ttar > nul
+  - move db-4.1.25 db
+  - cd db\build_win32
+  - echo using devenv %DEVENV_EXE%
+  - '%DEVENV_EXE% db_dll.dsp /upgrade'
+  - msbuild /p:Configuration=Release db_dll.vcxproj
+  - cd ..\..
+  # Cyrus SASL
+  - curl -fsSL -o cyrus-sasl-2.1.26.tar.gz https://www.cyrusimap.org/releases/cyrus-sasl-2.1.26.tar.gz
+  - 7z x cyrus-sasl-2.1.26.tar.gz -so | 7z x -si -ttar > nul
+  - move cyrus-sasl-2.1.26 sasl
+  - cd sasl
+  - patch -p1 -i ..\sasl-fix-snprintf-macro.patch
+  - echo using vsdevcmd %VSDEVCMD_BAT%
+  - '%VSDEVCMD_BAT%'
+  - nmake /f NTMakefile OPENSSL_INCLUDE=c:\OpenSSL-Win32\include OPENSSL_LIBPATH=c:\OpenSSL-Win32\lib DB_INCLUDE=c:\projects\libvncserver\deps\db\build_win32 DB_LIBPATH=c:\projects\libvncserver\deps\db\build_win32\release DB_LIB=libdb41.lib install
+  - cd ..
+  # go back to source root
+  - cd ..
+
+build_script:
+  - mkdir build
+  - cd build 
+  - cmake --version
+  - cmake .. -DZLIB_INCLUDE_DIR=..\deps\zlib -DZLIB_LIBRARY=..\deps\zlib\debug\zlibstaticd.lib -DPNG_PNG_INCLUDE_DIR=..\deps\libpng -DPNG_LIBRARY=..\deps\libpng\debug\libpng16_staticd.lib -D SASL2_INCLUDE_DIR=c:\cmu\include -D LIBSASL2_LIBRARIES=c:\cmu\lib\libsasl.lib ..
+  - cmake --build .
+  - ctest -C Debug --output-on-failure
+
+

.gitignore

@@ -2,44 +2,24 @@
 *~
 Makefile
 Makefile.in
-compile
-configure
-configure.lineno
-config.status
-config.log
 LibVNCServer.spec.in
 LibVNCServer.spec
-x11vnc.spec.in
-.deps
-.libs
-aclocal.m4
-autom4te.cache
 libvncserver-config
 *.pc
-_configs.sed
-config.h
 LibVNCServer*.tar.gz
-upload_beta.sh
-stamp-*
-x11vnc*.tar.gz
 config.h.in
 rfbconfig.h
 rfbconfig.h.in
-install-sh
-missing
-mkinstalldirs
-depcomp
-description-pak
-libvncserver*.deb
 *.o
-*.lo
-CVS
+*.a
+*.so
+*.so.*
 client_examples/SDLvncviewer
 client_examples/backchannel
 client_examples/gtkvncviewer
 client_examples/ppmtest
-config.guess
-config.sub
+client_examples/vnc2mpg
+build/
 examples/zippy
 examples/backchannel
 examples/blooptest
@@ -58,29 +38,23 @@ examples/simple
 examples/simple15
 examples/storepasswd
 examples/vncev
-libtool
-libvncclient/libvncclient.la
-libvncserver/libvncserver.la
 test/blooptest
 test/cargstest
 test/copyrecttest
 test/cursortest
 test/encodingstest
+test/wstest
 /test/tjbench
 /test/tjunittest
 vncterm/LinuxVNC
 vncterm/VNCommand
 vncterm/example
 /vncterm/linuxvnc
 /vncterm/vncommand
-x11vnc.spec
-x11vnc/x11vnc
 CMakeCache.txt
-cmake_install.cmake
+*.cmake
 /CMakeFiles
 /rfbproto.pdf
 /rfbproto.rst
 /vencrypt.txt
 /INSTALL
-.dirstamp
-/ltmain.sh

.travis.yml

@@ -1,4 +1,6 @@
 language: c
+dist: trusty
+sudo: required
 
 os:
   - linux
@@ -9,7 +11,20 @@ compiler:
   - clang
 
 before_install:
-- 'if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export CFLAGS="-I/usr/local/opt/openssl/include $CFLAGS" LDFLAGS="-L/usr/local/opt/openssl/lib $LDFLAGS"; fi'
+- |
+  if [[ "${TRAVIS_OS_NAME}" == "linux" ]]; then
+    CMAKE_URL="http://www.cmake.org/files/v3.7/cmake-3.7.2-Linux-x86_64.tar.gz"
+    mkdir -p ${TRAVIS_BUILD_DIR}/deps/cmake && travis_retry wget --quiet -O - ${CMAKE_URL} | tar --strip-components=1 -xz -C ${TRAVIS_BUILD_DIR}/deps/cmake
+    export PATH=${TRAVIS_BUILD_DIR}/deps/cmake/bin:${PATH}
+  fi
+
+# Build steps
+script:
+  - mkdir build
+  - cd build
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get update; sudo apt-get --no-install-suggests --no-install-recommends install libsdl2-dev liblzo2-dev; fi
+  - if [[ "${TRAVIS_OS_NAME}" == "osx" ]]; then brew update; brew install sdl2; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then cmake .. -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl; else cmake ..; fi
+  - cmake --build .
+  - ctest --output-on-failure
 
-# before build script, run autoreconf
-before_script: autoreconf -fiv