[2.3.2-alpha]

Revert "Tidy up and fix lint errors in build scripts"

.gitignore

@@ -20,3 +20,15 @@ src/gui/gui.pro.user*
 src/gui/.qmake.stash
 src/gui/.rnd
 src/setup/win32/barrier.suo
+Makefile
+*.cmake
+**/CMakeFiles/
+CMakeCache.txt
+/rpm
+# Visual Studio 2015/2017 cache/options directory
+.vs/
+# VS Code Directory
+.vscode/
+# Transient in-project-directory dependencies
+/deps/
+/out/build/x64-Debug

.travis.yml

@@ -1,10 +0,0 @@
-language: cpp
-before_install:
-- sudo apt-get update -qq
-- sudo apt-get install -qq libxtst-dev
-- sudo apt-get install -qq qtdeclarative5-dev
-- sudo apt-get install -qq libavahi-compat-libdnssd-dev
-script: sh -x ./clean_build.sh
-# skip install phase since we have a customized install package
-# creation tool for each supported platform
-install: true

Build.properties

@@ -1,7 +1,7 @@
 #
 # Barrier build parameters
 #
-BARRIER_VERSION_MAJOR = 1
-BARRIER_VERSION_MINOR = 9
-BARRIER_VERSION_PATCH = 0
+BARRIER_VERSION_MAJOR = 2
+BARRIER_VERSION_MINOR = 3
+BARRIER_VERSION_PATCH = 2
 BARRIER_VERSION_STAGE = snapshot

CMakeLists.txt

@@ -21,6 +21,7 @@ project (barrier C CXX)
 option (BARRIER_BUILD_GUI "Build the GUI" ON)
 option (BARRIER_BUILD_INSTALLER "Build the installer" ON)
 
+set (CMAKE_EXPORT_COMPILE_COMMANDS ON)
 set (CMAKE_CXX_STANDARD 14)
 set (CMAKE_CXX_EXTENSIONS OFF)
 set (CMAKE_CXX_STANDARD_REQUIRED ON)
@@ -63,6 +64,7 @@ if (UNIX)
     include (CheckIncludeFileCXX)
     include (CheckSymbolExists)
     include (CheckCSourceCompiles)
+    include (FindPkgConfig)
 
     check_include_file_cxx (istream HAVE_ISTREAM)
     check_include_file_cxx (ostream HAVE_OSTREAM)
@@ -131,7 +133,9 @@ if (UNIX)
     # curl is used on both Linux and Mac
     find_package (CURL)
     if (CURL_FOUND)
-        list (APPEND libs curl)
+        include_directories(${CURL_INCLUDE_DIRS})
+        list (APPEND libs ${CURL_LIBRARIES})
+
     else()
         message (FATAL_ERROR "Missing library: curl")
     endif()
@@ -163,6 +167,12 @@ if (UNIX)
             link_directories("/usr/local/lib")
         endif()
 
+        if (${PKG_CONFIG_FOUND})
+            pkg_check_modules (AVAHI_COMPAT REQUIRED avahi-compat-libdns_sd)
+            include_directories (BEFORE SYSTEM ${AVAHI_COMPAT_INCLUDE_DIRS})
+            set (CMAKE_REQUIRED_INCLUDES "${CMAKE_REQUIRED_INCLUDES};${AVAHI_COMPAT_INCLUDE_DIRS}")
+        endif ()
+
         set (XKBlib "X11/Xlib.h;X11/XKBlib.h")
         set (CMAKE_EXTRA_INCLUDE_FILES "${XKBlib};X11/extensions/Xrandr.h")
         check_type_size ("XRRNotifyEvent" X11_EXTENSIONS_XRANDR_H)
@@ -187,7 +197,7 @@ if (UNIX)
             message (FATAL_ERROR "Missing header: " ${XKBlib})
         endif()
 
-        if (NOT HAVE_DNSSD)
+        if (BARRIER_BUILD_GUI AND NOT HAVE_DNSSD)
             message (FATAL_ERROR "Missing header: dns_sd.h")
         endif()
 
@@ -302,13 +312,30 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Windows")
         ${OPENSSL_ROOT}/lib/ssleay32.lib
     )
 elseif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-    set (OPENSSL_ROOT /usr/local/opt/openssl)
+    find_program(BREW_PROGRAM "brew")
+    find_program(PORT_PROGRAM "port")
+    
+    if (IS_DIRECTORY /opt/local AND PORT_PROGRAM)
+        # macports
+        set (OPENSSL_ROOT /opt/local)
+
+        set (OPENSSL_LIBS
+            ${OPENSSL_ROOT}/lib/libssl.a
+            ${OPENSSL_ROOT}/lib/libcrypto.a
+            z
+        )
+    elseif (IS_DIRECTORY /usr/local/opt/openssl AND BREW_PROGRAM)
+        # brew
+        set (OPENSSL_ROOT /usr/local/opt/openssl)
+
+        include_directories (BEFORE SYSTEM ${OPENSSL_ROOT}/include)
+
+        set (OPENSSL_LIBS
+            ${OPENSSL_ROOT}/lib/libssl.a
+            ${OPENSSL_ROOT}/lib/libcrypto.a
+        )
+    endif()
 
-    include_directories (BEFORE SYSTEM ${OPENSSL_ROOT}/include)
-    set (OPENSSL_LIBS
-        ${OPENSSL_ROOT}/lib/libssl.a
-        ${OPENSSL_ROOT}/lib/libcrypto.a
-    )
 elseif (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
     set (OPENSSL_LIBS ssl crypto)
 else()
@@ -322,6 +349,12 @@ else()
     set (OPENSSL_LIBS ${lib_ssl} ${lib_crypto})
 endif()
 
+
+# Check we have the *required* Qt5 libs.
+find_package(Qt5Core REQUIRED)
+find_package(Qt5Network REQUIRED)
+find_package(Qt5Widgets REQUIRED)
+
 #
 # Configure_file... but for directories, recursively.
 #
@@ -364,12 +397,20 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
     set (BARRIER_BUNDLE_BINARY_DIR ${BARRIER_BUNDLE_APP_DIR}/Contents/MacOS)
 
     configure_files (${BARRIER_BUNDLE_SOURCE_DIR} ${BARRIER_BUNDLE_DIR})
+
+    if (CMAKE_BUILD_TYPE STREQUAL "Release")
+        add_custom_target(Barrier_dmg ALL
+                          bash build_installer.sh
+                          DEPENDS barrier barriers barrierc
+                          WORKING_DIRECTORY ${BARRIER_BUNDLE_DIR})
+    endif()
 endif()
 
 #
 # Windows installer
 #
 if (${CMAKE_SYSTEM_NAME} MATCHES "Windows")
+        set (BARRIER_WIX_VERSION "${BARRIER_VERSION_MAJOR}.${BARRIER_VERSION_MINOR}.${BARRIER_VERSION_PATCH}")
         message (STATUS "Configuring the wix installer")
         configure_files (${CMAKE_CURRENT_SOURCE_DIR}/dist/wix ${CMAKE_BINARY_DIR}/installer-wix)
         message (STATUS "Configuring the inno installer")

README.md

@@ -1,8 +1,21 @@
 # Barrier
 
-Eliminate the barrier between your machines.
+Eliminate the barrier between your machines. 
+Find [releases here](https://github.com/debauchee/barrier/releases).
 
-Master branch build status:   [![Build Status](https://travis-ci.org/debauchee/barrier.svg?branch=master)](https://travis-ci.org/debauchee/barrier)
+### Contact info:
+
+- `#barrier` on freenode
+
+#### CI Build Status
+
+Master branch overall build status: [![Build Status](https://dev.azure.com/debauchee/Barrier/_apis/build/status/debauchee.barrier?branchName=master)](https://dev.azure.com/debauchee/Barrier/_build/latest?definitionId=1&branchName=master)
+* Linux Build Status: [![Build Status](https://dev.azure.com/debauchee/Barrier/_apis/build/status/debauchee.barrier?branchName=master&jobName=Linux%20Build)](https://dev.azure.com/debauchee/Barrier/_build/latest?definitionId=1&branchName=master)
+* Mac Build Status: [![Build Status](https://dev.azure.com/debauchee/Barrier/_apis/build/status/debauchee.barrier?branchName=master&jobName=Mac%20Build)](https://dev.azure.com/debauchee/Barrier/_build/latest?definitionId=1&branchName=master)
+* Windows Debug Build Status: [![Build Status](https://dev.azure.com/debauchee/Barrier/_apis/build/status/debauchee.barrier?branchName=master&jobName=Windows%20Build&configuration=Windows%20Build%20Debug)](https://dev.azure.com/debauchee/Barrier/_build/latest?definitionId=1&branchName=master)
+* Windows Release Build Status: [![Build Status](https://dev.azure.com/debauchee/Barrier/_apis/build/status/debauchee.barrier?branchName=master&jobName=Windows%20Build&configuration=Windows%20Build%20Release%20with%20Release%20Installer)](https://dev.azure.com/debauchee/Barrier/_build/latest?definitionId=1&branchName=master)
+
+Our CI Builds are provided by Microsoft Azure Pipelines.
 
 ### What is it?
 
@@ -10,7 +23,7 @@ Barrier is KVM software forked from Symless's synergy 1.9 codebase. Synergy was
 
 ### What's different?
 
-Whereas synergy has moved beyond its goals from the 1.x era, barrier aims to maintain that simplicity. Barrier will let you use your keyboard and mouse from machine A to control machine B (or more). That's it.
+Whereas synergy has moved beyond its goals from the 1.x era, Barrier aims to maintain that simplicity. Barrier will let you use your keyboard and mouse from machine A to control machine B (or more). It's that simple.
 
 ### Project goals
 
@@ -22,10 +35,28 @@ Communication. Everything we do is in the open. Our issue tracker will let you s
 
 ### Contact & support
 
-Please be aware that the *only* way to draw our attention to a bug is to create a new PR in the issue tracker. Write a clear, concise, detailed report and you will get a clear, concise, detailed response. Priority is always give to issues that affect a wider range of users.
+Please be aware that the *only* way to draw our attention to a bug is to create a new PR in the issue tracker. Write a clear, concise, detailed report and you will get a clear, concise, detailed response. Priority is always given to issues that affect a wider range of users.
 
 For short and simple questions or to just say hello find us on the Freenode IRC network in the #barrier channel.
 
 ### Contributions
 
 At this time we are looking for developers to help fix the issues found in the issue tracker. Submit pull requests once you've polished up your patch and we'll review and possibly merge it.
+
+### FAQ
+
+Q: Does drag and drop work on linux?
+
+A: No
+
+Q: What OSes are supported?
+
+A:
+  - Windows 7, 8, 8.1, and 10
+  - MacOS/OS X
+  - Linux
+  - FreeBSD
+
+Q: Are 32-bit versions of Windows supported?
+
+A: No

_config.yml

@@ -0,0 +1 @@
+theme: jekyll-theme-slate

azure-pipelines.yml

@@ -0,0 +1,97 @@
+trigger:
+  tags:
+    include:
+    - '*'
+  branches:
+    include:
+    - '*'
+
+jobs:
+- job: WinBuild
+  displayName: Windows Build
+  pool:
+    vmImage: 'vs2017-win2016'
+  strategy:
+    matrix:
+      Debug:
+        CI_ENV_BUILD_TYPE: Debug
+      Release with Release Installer:
+        CI_ENV_BUILD_TYPE: Release
+  steps:
+    # Gather Dependencies
+    - task: PowerShell@2
+      displayName: Download Bonjour SDK-like
+      inputs:
+        filePath: azure-pipelines/download_install_bonjour_sdk_like.ps1
+    - task: UsePythonVersion@0
+      displayName: Selecting Python Installer for QLI Installer
+      inputs:
+        versionSpec: '3.7'
+    - task: PowerShell@2
+      displayName: Installing QT
+      condition: ne(variables['CacheRestored'], 'true')
+      inputs:
+        filePath: azure-pipelines/download_install_qt.ps1
+    # Build time!
+    - powershell: Copy-Item azure-pipelines\build_env_tmpl.bat build_env.bat
+      displayName: Layering Azure Pipeline's build_env.bat
+    - script: |
+          call "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Enterprise\\Common7\\Tools\\vsdevcmd" -arch=x64 && clean_build.bat
+      displayName: Clean Build
+    - task: ArchiveFiles@2
+      displayName: Archive Completed Build Directory
+      inputs:
+        rootFolderOrFile: build\bin\$(CI_ENV_BUILD_TYPE)\
+        includeRootFolder: true
+        archiveFile: $(Build.ArtifactStagingDirectory)\$(CI_ENV_BUILD_TYPE).zip
+    - task: PublishBuildArtifacts@1
+      displayName: Publish Completed Build Directory Archive Build Artifact
+      inputs:
+        pathtoPublish: $(Build.ArtifactStagingDirectory)\$(CI_ENV_BUILD_TYPE).zip
+        artifactName: Windows $(CI_ENV_BUILD_TYPE)
+    - script: choco install innosetup --version 5.6.1.20190126 --allow-downgrade
+      displayName: Ensure desired version of Inno Setup is installed.
+      condition: eq(variables['CI_ENV_BUILD_TYPE'], 'Release')
+    - script: build_installer.bat
+      displayName: Build Installer
+      condition: eq(variables['CI_ENV_BUILD_TYPE'], 'Release')
+    - task: PublishBuildArtifacts@1
+      displayName: Publish Release Installer
+      condition: eq(variables['CI_ENV_BUILD_TYPE'], 'Release')
+      inputs:
+        pathtoPublish: build\installer-inno\bin
+        artifactName: Windows Release Installer
+
+- job: LinuxBuild
+  displayName: Linux Build
+  pool:
+    vmImage: 'ubuntu-16.04'
+  steps:
+    - script: sudo apt-get update -y
+    - script: sudo apt-get install -y libxtst-dev qtdeclarative5-dev libavahi-compat-libdnssd-dev libcurl4-openssl-dev
+      displayName: Install Dependencies
+    - script: sh -x ./clean_build.sh
+      displayName: Clean Build
+
+- job: MacBuild
+  displayName: Mac Build
+  pool:
+    vmImage: 'macOS-10.14'
+  strategy:
+    matrix:
+      Release:
+        B_BUILD_TYPE: Release
+        BARRIER_VERSION_STAGE: Release
+  steps:
+    - script: brew install https://raw.githubusercontent.com/Homebrew/homebrew-core/aac86fc018c48d7b6f23a2e7535276899774567a/Formula/qt.rb
+      displayName: Installed Pinned Qt
+    - script: brew install https://raw.githubusercontent.com/Homebrew/homebrew-core/aac86fc018c48d7b6f23a2e7535276899774567a/Formula/openssl.rb
+      displayName: Installed Pinned OpenSSL
+    - script: sh -x ./clean_build.sh
+      displayName: Clean Build
+    - task: PublishBuildArtifacts@1
+      displayName: Publish Release DMG
+      condition: eq(variables['B_BUILD_TYPE'], 'Release')
+      inputs:
+        pathtoPublish: build/bundle
+        artifactName: Mac Release Disk Image and App

azure-pipelines/build_env_tmpl.bat

@@ -0,0 +1,6 @@
+set B_BUILD_TYPE=%CI_ENV_BUILD_TYPE%
+set B_QT_ROOT=%cd%\deps\Qt
+set B_QT_VER=Qt5.12.3\5.12.3
+set B_QT_MSVC=msvc2017_64
+set B_BONJOUR=%cd%\deps\BonjourSDKLike
+

azure-pipelines/download_install_bonjour_sdk_like.ps1

@@ -0,0 +1,12 @@
+$ErrorActionPreference = "Stop"
+
+New-Item -Force -ItemType Directory -Path ".\deps\"
+$Wc = New-Object System.Net.WebClient
+$Wc.DownloadFile('https://github.com/nelsonjchen/mDNSResponder/releases/download/v2019.05.08.1/x64_RelWithDebInfo.zip', 'deps\BonjourSDKLike.zip') ;
+Write-Output 'Downloaded BonjourSDKLike Zip'
+Write-Output 'Unzipping BonjourSDKLike Zip'
+Remove-Item -Recurse -Force -ErrorAction Ignore .\deps\BonjourSDKLike
+Expand-Archive .\deps\BonjourSDKLike.zip -DestinationPath .\deps\BonjourSDKLike
+Write-Output 'Installed BonjourSDKLike Zip'
+Remove-Item deps\BonjourSDKLike.zip
+Write-Output 'Deleted BonjourSDKLike Zip'

azure-pipelines/download_install_qt.ps1

@@ -0,0 +1,26 @@
+$ErrorActionPreference = "Stop"
+
+$qli_install_version = '2019.05.26.1'
+$qt_version = '5.12.3'
+
+New-Item -Force -ItemType Directory -Path ".\deps\"
+
+Write-Output 'Downloading QLI Installer'
+$Wc = New-Object System.Net.WebClient
+$Wc.DownloadFile("https://github.com/nelsonjchen/qli-installer/archive/v$qli_install_version.zip", '.\deps\qli-installer.zip') ;
+Write-Output 'Downloaded QLI Installer'
+
+Write-Output 'Extracting QLI Installer'
+Expand-Archive deps\qli-installer.zip deps\
+Move-Item .\deps\qli-installer-$qli_install_version\ .\deps\qli-installer
+Write-Output 'Extracted QLI Installer'
+
+Write-Output 'Installing QLI Installer Dependencies'
+pip install -r .\deps\qli-installer\requirements.txt
+Write-Output 'Installed QLI Installer Dependencies'
+
+Write-Output 'Starting QT Installer'
+$Env:QLI_OUT_DIR = ".\deps\Qt\Qt$qt_version"
+$Env:QLI_BASE_URL = "http://mirrors.ocf.berkeley.edu/qt/online/qtsdkrepository/"
+python .\deps\qli-installer\qli-installer.py $qt_version windows desktop win64_msvc2017_64
+Write-Output 'Installed QT Installer'

build_installer.bat

@@ -1,25 +1,24 @@
 @echo off
-set WIX_ROOT=C:\Program Files (x86)\WiX Toolset v3.11
+set INNO_ROOT=C:\Program Files (x86)\Inno Setup 5
 
 set savedir=%cd%
 cd /d %~dp0
 
 if not exist build\bin\Release goto buildproject
 
-cd build\installer
-if ERRORLEVEL 1 goto buildproject
-
 echo Building 64-bit Windows installer...
-"%WIX_ROOT%\bin\candle.exe" -nologo -arch x64 -dConfiguration=Release -dPlatform=x64 -ext WixUtilExtension -ext WixFirewallExtension Product.wxs -o Barrier.wixobj
-if ERRORLEVEL 1 goto failed
-"%WIX_ROOT%\bin\light.exe" -nologo -ext WixUtilExtension -ext WixFirewallExtension -ext WixUIExtension Barrier.wixobj -o bin\Barrier.msi
+
+cd build\installer-inno
+if ERRORLEVEL 1 goto buildproject
+"%INNO_ROOT%\ISCC.exe" /Qp barrier.iss
 if ERRORLEVEL 1 goto failed
+
 echo Build completed successfully
 goto done
 
 :buildproject
 echo To build a 64-bit Windows installer:
-echo  - set Q_BUILD_TYPE=Release in build_env.bat
+echo  - set B_BUILD_TYPE=Release in build_env.bat
 echo  - also set other environmental overrides necessary for your build environment
 echo  - run clean_build.bat to build Barrier and verify that it succeeds
 echo  - re-run this script to create the installation package
@@ -29,7 +28,7 @@ goto done
 echo Build failed
 
 :done
-set WIX_ROOT=
+set INNO_ROOT=
 
 cd /d %savedir%
 set savedir=

clean_build.bat

@@ -3,13 +3,25 @@
 REM defaults - override them by creating a build_env.bat file
 set B_BUILD_TYPE=Debug
 set B_QT_ROOT=C:\Qt
-set B_QT_VER=5.6.3
-set B_QT_MSVC=msvc2015_64
+set B_QT_VER=5.11.1
+set B_QT_MSVC=msvc2017_64
 set B_BONJOUR=C:\Program Files\Bonjour SDK
 
 set savedir=%cd%
 cd /d %~dp0
 
+REM cmake generator name for the target build system
+if "%VisualStudioVersion%"=="15.0" (
+    set cmake_gen=Visual Studio 15 2017
+) else if "%VisualStudioVersion%"=="16.0" (
+    set cmake_gen=Visual Studio 16 2019
+) else (
+    echo Visual Studio version was not detected.
+    echo Did you forget to run inside a VS developer prompt?
+    echo Using the default cmake generator.
+    set cmake_gen=Visual Studio 16 2019
+)
+
 if exist build_env.bat call build_env.bat
 
 REM needed by cmake to set bonjour include dir
@@ -25,7 +37,7 @@ rmdir /q /s build
 mkdir build
 if ERRORLEVEL 1 goto failed
 cd build
-cmake -G "Visual Studio 15 2017 Win64" -D CMAKE_BUILD_TYPE=%B_BUILD_TYPE% -D CMAKE_PREFIX_PATH="%B_QT_FULLPATH%" -D DNSSD_LIB="%B_BONJOUR%\Lib\x64\dnssd.lib" -D QT_VERSION=%B_QT_VER% ..
+cmake -G "%cmake_gen%" -A x64 -D CMAKE_BUILD_TYPE=%B_BUILD_TYPE% -D CMAKE_PREFIX_PATH="%B_QT_FULLPATH%" -D DNSSD_LIB="%B_BONJOUR%\Lib\x64\dnssd.lib" -D QT_VERSION=%B_QT_VER% ..
 if ERRORLEVEL 1 goto failed
 echo @msbuild barrier.sln /p:Platform="x64" /p:Configuration=%B_BUILD_TYPE% /m %B_BUILD_OPTIONS% > make.bat
 call make.bat
@@ -69,3 +81,4 @@ set B_BONJOUR=
 set BONJOUR_SDK_HOME=
 set B_QT_FULLPATH=
 set savedir=
+set cmake_gen=

clean_build.sh

@@ -14,7 +14,7 @@ if [ "$(uname)" = "Darwin" ]; then
     # OSX needs a lot of extra help, poor thing
     # run the osx_environment.sh script to fix paths
     . ./osx_environment.sh
-    B_CMAKE_FLAGS="-DCMAKE_OSX_SYSROOT=/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.9 $B_CMAKE_FLAGS"
+    B_CMAKE_FLAGS="-DCMAKE_OSX_SYSROOT=$(xcode-select --print-path)/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.9 $B_CMAKE_FLAGS"
 fi
 # allow local customizations to build environment
 [ -r ./build_env.sh ] && . ./build_env.sh

cmake/Version.cmake

@@ -1,8 +1,8 @@
 cmake_minimum_required (VERSION 3.4)
 
 set (BARRIER_VERSION_MAJOR 2)
-set (BARRIER_VERSION_MINOR 0)
-set (BARRIER_VERSION_PATCH 0)
+set (BARRIER_VERSION_MINOR 3)
+set (BARRIER_VERSION_PATCH 2)
 
 #
 # Barrier Version
@@ -44,24 +44,24 @@ if (NOT DEFINED BARRIER_REVISION)
     if (DEFINED ENV{GIT_COMMIT})
         string (SUBSTRING $ENV{GIT_COMMIT} 0 8 BARRIER_REVISION)
     else()
-        execute_process (
-            COMMAND git rev-parse --short=8 HEAD
-            WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-            OUTPUT_VARIABLE BARRIER_REVISION
-            OUTPUT_STRIP_TRAILING_WHITESPACE
-        )
+        find_program (GIT_BINARY git)
+        if (NOT GIT_BINARY STREQUAL "GIT_BINARY-NOTFOUND")
+            execute_process (
+                COMMAND git rev-parse --short=8 HEAD
+                WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+                OUTPUT_VARIABLE BARRIER_REVISION
+                OUTPUT_STRIP_TRAILING_WHITESPACE
+            )
+        endif()
     endif()
 endif()
 
-if (DEFINED BARRIER_REVISION)
-    string(LENGTH ${BARRIER_REVISION} BARRIER_REVISION_LENGTH)
-    if (NOT ((BARRIER_REVISION MATCHES "^[a-f0-9]+") AND (BARRIER_REVISION_LENGTH EQUAL "8")))
-        message (FATAL_ERROR "BARRIER_REVISION ('${BARRIER_REVISION}') should be a short commit hash")
-    endif()
-    unset (BARRIER_REVISION_LENGTH)
-else()
-	set (BARRIER_REVISION "0badc0de")
+string(LENGTH "${BARRIER_REVISION}" BARRIER_REVISION_LENGTH)
+if (NOT BARRIER_REVISION_LENGTH EQUAL 8 OR NOT BARRIER_REVISION MATCHES "^[a-f0-9]+")
+    set (BARRIER_REVISION "00000000")
+    message (WARNING "revision not found. setting to ${BARRIER_REVISION}")
 endif()
+unset (BARRIER_REVISION_LENGTH)
 
 if (DEFINED ENV{BUILD_NUMBER})
     set (BARRIER_BUILD_NUMBER $ENV{BUILD_NUMBER})

debian/changelog

@@ -0,0 +1,5 @@
+barrier (2.1-1) unstable; urgency=low
+
+  * Initial release (Closes: #123456)
+
+ -- Debauchee Open Source Group <debauchee.oss@gmail.com>  Sat, 01 Apr 2018 00:00:00 +0000

dist/inno/barrier.iss.in

@@ -6,6 +6,7 @@
 #define MyAppServiceName "Barrier"
 #define MyAppServiceExe "barrierd.exe"
 #define MyAppServiceDesc "Manages the Barrier background processes."
+#define MyAppListenerDesc "Barrier Listener"
 
 [Setup]
 AppId={{41036EA6-3F7A-4803-8AE0-469E5E91EFCC}
@@ -40,6 +41,10 @@ Name: "{commonprograms}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"
 Name: "{commondesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon
 
 [Run]
+; there's no "check if exists" or "insert if not exists" for netsh's firewall commands
+; to avoid duplicate entries remove the existing rule (fails if it doesn't exist) before adding
+Filename: {sys}\netsh.exe; Parameters: "advfirewall firewall delete rule name=""{#MyAppListenerDesc}"""; Flags: runhidden
+Filename: {sys}\netsh.exe; Parameters: "advfirewall firewall add rule name=""{#MyAppListenerDesc}"" protocol=TCP dir=in localport=24800 action=allow"; Flags: runhidden
 Filename: {sys}\sc.exe; Parameters: "create {#MyAppServiceName} start= auto binPath= ""{app}\{#MyAppServiceExe}"""; Flags: runhidden
 Filename: {sys}\sc.exe; Parameters: "description {#MyAppServiceName} ""{#MyAppServiceDesc}"""; Flags: runhidden
 Filename: {sys}\sc.exe; Parameters: "start {#MyAppServiceName}"; Flags: runhidden
@@ -51,6 +56,7 @@ Type: files; Name: "{app}\barrierd.log"
 [UninstallRun]
 Filename: {sys}\sc.exe; Parameters: "stop {#MyAppServiceName}"; Flags: runhidden
 Filename: {sys}\sc.exe; Parameters: "delete {#MyAppServiceName}"; Flags: runhidden
+Filename: {sys}\netsh.exe; Parameters: "advfirewall firewall delete rule name=""{#MyAppListenerDesc}"""; Flags: runhidden
 
 [CustomMessages]
 DependenciesDir="redist"
@@ -68,7 +74,7 @@ begin
 	// initialize windows version
 	initwinversion();
 
-  vcredist2017('14'); // min allowed version is 14.0
+	vcredist2017('14'); // min allowed version is 14.0
 
 	Result := true;
 end;

dist/macos/bundle/build_installer.sh.in

@@ -3,12 +3,6 @@
 # change this to rename the installer package
 B_DMG="Barrier-@BARRIER_VERSION@.dmg"
 
-# sanity check so we don't distribute packages full of debug symbols
-if [ "@CMAKE_BUILD_TYPE@" != "Release" ]; then
-    echo Will only build installers for Release builds
-    exit 1
-fi
-
 cd @CMAKE_CURRENT_SOURCE_DIR@/build/bundle || exit 1
 
 B_REREF_SCRIPT=@CMAKE_CURRENT_SOURCE_DIR@/build/bundle/reref_dylibs.sh
@@ -41,7 +35,10 @@ cp @CMAKE_RUNTIME_OUTPUT_DIRECTORY@/* . || exit 1
 # TODO: this is hacky and will probably break if there is more than one qt
 # version installed. need a better way to find this library
 B_COCOA=$(find /usr/local/Cellar/qt -type f -name libqcocoa.dylib | head -1)
-if [ $? -ne 0 ] || [ "x$B_COCOA" = "x" ]; then
+if [ "x$B_COCOA" = "x" ]; then
+    B_COCOA=$(find /opt/local/libexec/qt5/plugins -type f -name libqcocoa.dylib | head -1)
+fi
+if [ "x$B_COCOA" = "x" ]; then
     echo "Could not find cocoa platform plugin"
     exit 1
 fi
@@ -65,6 +62,14 @@ $B_REREF_SCRIPT platforms/libqcocoa.dylib ../ || exit 1
 printf "%s\n" "#!/bin/sh" "cd \$(dirname \$0)" "exec ./barrier" > barrier.sh
 chmod +x barrier.sh
 
+echo "Barrier.app created successfully"
+
+# sanity check so we don't distribute a dmg with debug symbols
+if [ "@CMAKE_BUILD_TYPE@" != "Release" ]; then
+    echo "dmg only created for Release builds"
+    exit 1
+fi
+
 # create the DMG to be distributed in build/bundle
 cd ../../..
 hdiutil create -size 64m -fs HFS+ -volname "Barrier" temp.dmg || exit 1
@@ -74,4 +79,4 @@ hdiutil detach mnt || exit 1
 hdiutil convert temp.dmg -format UDZO -o $B_DMG || exit 1
 rm temp.dmg
 
-echo "Installer created successfully"
+echo "dmg $B_DMB created successfully"

dist/macos/bundle/reref_dylibs.sh

@@ -21,6 +21,8 @@ B_LIBS=$(otool -XL $B_TARGET | awk '{ print $1 }' | grep -Ev '^(/usr/lib|/System
 [ $? -ne 0 ] && exit 1
 for B_LIB in $B_LIBS; do
     B_LIB_NAME=$(basename $B_LIB)
+    # otool reports barrier as "barrier:" which fails self-reference test below
+    B_LIB_NAME=${B_LIB_NAME//:}
 
     # ignore self-references
     [ "$B_TARGET" = "$B_LIB_NAME" ] && continue

dist/rpm/barrier.spec.in

@@ -1,27 +1,105 @@
+%global barrier_revision @BARRIER_REVISION@
+Summary: Keyboard and mouse sharing solution
 Name: barrier
 Version: @BARRIER_VERSION@
-Summary: Keyboard and mouse sharing solution
-Group: Applications/Productivity
-URL: https://github.com/debauchee/barrier/
-Source: https://github.com/debauchee/barrier/
-Vendor: Debauchee
-Packager: Debauchee <todo@mail.com>
+Release: @BARRIER_BUILD_NUMBER@%{?dist}
 License: GPLv2
-Release: @BARRIER_BUILD_NUMBER@@BARRIER_SNAPSHOT_INFO@%{?dist}
+Group: System Environment/Daemons
+URL: https://github.com/debauchee/barrier
+Source0: https://github.com/debauchee/barrier/archive/v%{version}.tar.gz
+
+BuildRequires: cmake3
+BuildRequires: avahi-compat-libdns_sd-devel
+BuildRequires: libX11-devel
+BuildRequires: libXtst-devel
+BuildRequires: qt5-qtbase-devel
+BuildRequires: libcurl-devel
+BuildRequires: desktop-file-utils
+BuildRequires: openssl-devel
 
 %description
 Barrier allows you to share one mouse and keyboard between multiple computers.
 Work seamlessly across Windows, macOS and Linux.
 
+%prep
+%setup -q -n %{name}-%{version}
+
+
+%build
+%{cmake3} -DSYNERGY_VERSION_STAGE:STRING=@BARRIER_VERSION_STAGE@ -DSYNERGY_REVISION:STRING=%{barrier_revision} .
+make %{?_smp_mflags}
+
+
+%install
+install -D -p -m 0755 bin/barrier %{buildroot}%{_bindir}/barrier
+install -D -p -m 0755 bin/barrierc %{buildroot}%{_bindir}/barrierc
+install -D -p -m 0755 bin/barriers %{buildroot}%{_bindir}/barriers
+install -D -p -m 0644 doc/barrierc.1 %{buildroot}%{_mandir}/man1/barrierc.1
+install -D -p -m 0644 doc/barriers.1 %{buildroot}%{_mandir}/man1/barriers.1
+install -D -p -m 0644 res/barrier.desktop %{buildroot}%{_datadir}/applications/barrier.desktop
+install -D -p -m 0644 res/barrier.svg %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/barrier.svg
+
+cd %{buildroot}%{_bindir}
+
+mkdir -p %{buildroot}%{_datadir}/metainfo
+## Write AppStream
+cat <<END> %{buildroot}%{_datadir}/metainfo/%{name}.appdata.xml
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright 2018 Ding-Yi Chen <dchen@redhat.com> -->
+<component type="desktop-application">
+  <id>%{name}</id>
+  <metadata_license>FSFAP</metadata_license>
+  <project_license>GPLv2</project_license>
+  <name>barrier</name>
+  <summary>Share mouse and keyboard between multiple computers over the network</summary>
+
+  <description>
+    <p>
+      Barrier allows you to share one mouse and keyboard between multiple computers.
+      Work seamlessly across Windows, macOS and Linux.
+    </p>
+  </description>
+
+  <launchable type="desktop-id">%{name}.desktop</launchable>
+
+  <url type="homepage">https://github.com/debauchee/barrier</url>
+
+  <provides>
+    <binary>barrier</binary>
+    <binary>barrierc</binary>
+    <binary>barriers</binary>
+  </provides>
+
+  <releases>
+    <release version="%{version}" date="2019-03-21" />
+  </releases>
+</component>
+END
+
+desktop-file-install --delete-original \
+  --dir %{buildroot}%{_datadir}/applications \
+  --set-icon=%{_datadir}/icons/hicolor/scalable/apps/barrier.svg \
+  %{buildroot}%{_datadir}/applications/barrier.desktop
+
+desktop-file-validate %{buildroot}/%{_datadir}/applications/barrier.desktop
+
 %files
-%defattr(755,root,root,-)
+# None of the documentation files are actually useful here, they all point to
+# the online website, so include just one, the README
+%doc LICENSE ChangeLog res/Readme.txt doc/barrier.conf.example*
 %{_bindir}/barrier
 %{_bindir}/barrierc
 %{_bindir}/barriers
-%{_bindir}/syntool
-%attr(644,-,-) %{_datarootdir}/applications/barrier.desktop
-%attr(644,-,-) %{_datarootdir}/icons/hicolor/scalable/apps/barrier.svg
+%{_datadir}/icons/hicolor/scalable/apps/barrier.svg
+%{_datadir}/applications/barrier.desktop
+%{_datadir}/metainfo/%{name}.appdata.xml
+%{_mandir}/man1/barrierc.1*
+%{_mandir}/man1/barriers.1*
 
 %changelog
+* Thu Mar 21 2019 wendall911 <wendallc@83864.com>
+- Actual working spec file for Fedora
+
 * Sat Jan 27 2018 Debauchee <todo@mail.com>
 - Initial version of the package
+

dist/wix/Include.wxi.in

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Include>
     <?define Name="Barrier" ?>
-    <?define Version="@BARRIER_VERSION@" ?>
+    <?define Version="@BARRIER_WIX_VERSION@" ?>
     <?define QtVersion="@QT_VERSION@" ?>
     <?define Author="Debauchee Open Source Group" ?>
     <?define BinPath="@CMAKE_RUNTIME_OUTPUT_DIRECTORY@/$(var.Configuration)" ?>
@@ -11,12 +11,12 @@
         <?define ProgramFilesFolder="ProgramFiles64Folder" ?>
         <?define PlatformSimpleName="64-bit" ?>
         <?define UpgradeGuid="E8A4FA54-14B9-4FD1-8E00-7BC46555FDA0" ?>
-        <?define QtPath="E:\Qt\$(var.QtVersion)\msvc2015_64" ?>
+        <?define QtPath="@CMAKE_PREFIX_PATH@" ?>
     <?else ?>
         <?define ProgramFilesFolder="ProgramFilesFolder" ?>
         <?define PlatformSimpleName="32-bit" ?>
         <?define UpgradeGuid="BE0B9FD8-45E2-4A8E-A0D8-1F774D074A78" ?>
-        <?define QtPath="E:\Qt\$(var.QtVersion)\msvc2015" ?>
+        <?define QtPath="@CMAKE_PREFIX_PATH@" ?>
     <?endif ?>
     <?define QtBinPath="$(var.QtPath)\bin" ?>
     <?define QtPlatformPath="$(var.QtPath)\plugins\platforms" ?>

dist/wix/Product.wxs

@@ -31,7 +31,6 @@
 		<Property Id="ARPPRODUCTICON" Value="barrier.ico"/>
 		<Property Id="WIXUI_INSTALLDIR" Value="INSTALLFOLDER"/>
 		<Property Id="MSIRESTARTMANAGERCONTROL" Value="Disable"/>
-    </Condition>
 		<CustomAction ExeCommand="" FileKey="GuiProgram" Id="StartGui" Return="asyncNoWait"/>
 		<UI>
 			<Publish Control="Finish" Dialog="ExitDialog" Event="DoAction" Value="StartGui">NOT Installed</Publish>
@@ -60,8 +59,6 @@
 					<fire:FirewallException Id="ServerFirewallException" IgnoreFailure="yes" Name="$(var.Name)" Scope="any"/>
 				</File>
 				<File Source="$(var.BinPath)/barrierc.exe"/>
-				<File Source="$(var.BinPath)/syntool.exe"/>
-				<File Source="$(var.BinPath)/synwinhk.dll"/>
 				<File Source="$(var.OpenSSLBinPath)/libeay32.dll"/>
 				<File Source="$(var.OpenSSLBinPath)/ssleay32.dll"/>
 				<File Source="$(var.OpenSSLBinPath)/openssl.exe"/>

doc/barrierc.1

@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.6.
-.TH BARRIERC "1" "March 2018" "barrierc 2.0.0, protocol version 1.6" "User Commands"
+.TH BARRIERC "1" "May 2018" "barrierc 2.1.0-snapshot" "User Commands"
 .SH NAME
 barrierc \- Barrier Keyboard/Mouse Client
 .SH SYNOPSIS
@@ -59,9 +59,10 @@ display version information and exit.
 .PP
 Default options are marked with a *
 .PP
-The server address is of the form: [<hostname>][:<port>].  The hostname
-must be the address or hostname of the server.  The port overrides the
-default port, 24800.
+The server address is of the form: [<hostname>][:<port>]. The hostname
+must be the address or hostname of the server. Placing brackets around
+an IPv6 address is required when also specifying a port number and
+optional otherwise. The default port number is 24800.
 .SH COPYRIGHT
 Copyright \(co 2018 Debauchee Open Source Group
 .br

doc/barriers.1

@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.6.
-.TH BARRIERS "1" "March 2018" "barriers 2.0.0, protocol version 1.6" "User Commands"
+.TH BARRIERS "1" "May 2018" "barriers 2.1.0-snapshot" "User Commands"
 .SH NAME
 barriers \- Barrier Keyboard/Mouse Server
 .SH SYNOPSIS
@@ -63,13 +63,14 @@ Default options are marked with a *
 .PP
 The argument for \fB\-\-address\fR is of the form: [<hostname>][:<port>].  The
 hostname must be the address or hostname of an interface on the system.
-The default is to listen on all interfaces.  The port overrides the
-default port, 24800.
+Placing brackets around an IPv6 address is required when also specifying
+a port number and optional otherwise. The default is to listen on all
+interfaces using port number 24800.
 .PP
 If no configuration file pathname is provided then the first of the
 following to load successfully sets the configuration:
 .IP
-$HOME/.barrier.conf
+$HOME/.local/share/barrier/barrier.conf
 \fI\,/etc/barrier.conf\/\fP
 .SH COPYRIGHT
 Copyright \(co 2018 Debauchee Open Source Group

osx_environment.sh

@@ -1,16 +1,51 @@
-#!/bin/sh
+#!/bin/bash
+
+# Checks if directory exists, otherwise asks to install package.
+function check_dir_exists() {
+    local path=$1
+    local package=$2
+
+    if [ ! -d "$path" ]; then
+        echo "Please install $package"
+        exit 1
+    fi
+}
 
 if [ ! $BARRIER_BUILD_ENV ]; then
+    check_dir_exists '/Applications/Xcode.app' 'Xcode'
 
-    printf "Modifying environment for Barrier build..."
+    printf "Modifying environment for Barrier build...\n"
 
-    QT_PATH=$(brew --prefix qt)
-    OPENSSL_PATH=$(brew --prefix openssl)
+    if command -v port; then
+        printf "Detected Macports\n"
+
+        check_dir_exists '/opt/local/lib/cmake/Qt5' 'qt5-qtbase port'
+
+        export BARRIER_BUILD_MACPORTS=1
+        export CMAKE_PREFIX_PATH="/opt/local/lib/cmake/Qt5:$CMAKE_PREFIX_PATH"
+        export LD_LIBRARY_PATH="/opt/local/lib:$LD_LIBRARY_PATH"
+        export CPATH="/opt/local/include:$CPATH"
+        export PKG_CONFIG_PATH="/opt/local/libexec/qt5/lib/pkgconfig:$PKG_CONFIG_PATH"
+
+    elif command -v brew; then
+        printf "Detected Homebrew\n"
+        QT_PATH=$(brew --prefix qt)
+        OPENSSL_PATH=$(brew --prefix openssl)
+
+        check_dir_exists "$QT_PATH" 'qt'
+        check_dir_exists "$OPENSSL_PATH" 'openssl'
+
+        export BARRIER_BUILD_BREW=1
+        export CMAKE_PREFIX_PATH="$QT_PATH:$CMAKE_PREFIX_PATH"
+        export LD_LIBRARY_PATH="$OPENSSL_PATH/lib:$LD_LIBRARY_PATH"
+        export CPATH="$OPENSSL_PATH/include:$CPATH"
+        export PKG_CONFIG_PATH="$OPENSSL_PATH/lib/pkgconfig:$PKG_CONFIG_PATH"
+
+    else
+        printf "Neither Homebrew nor Macports is installed. Can't get dependency paths\n"
+        exit 1
+    fi
 
-    export CMAKE_PREFIX_PATH="$QT_PATH:$CMAKE_PREFIX_PATH"
-    export LD_LIBRARY_PATH="$OPENSSL_PATH/lib:$LD_LIBRARY_PATH"
-    export CPATH="$OPENSSL_PATH/include:$CPATH"
-    export PKG_CONFIG_PATH="$OPENSSL_PATH/lib/pkgconfig:$PKG_CONFIG_PATH"
     export BARRIER_BUILD_ENV=1
 
     printf "done\n"

pre-build.bat

@@ -0,0 +1 @@
+%comspec% /k "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\Tools\VsDevCmd.bat"

res/barrier.desktop

@@ -1,10 +1,8 @@
 [Desktop Entry]
 Type=Application
-Version=1.0
 Name=Barrier
 Comment=Keyboard and mouse sharing solution
-Path=/usr/bin
-Exec=/usr/bin/barrier
+Exec=barrier
 Icon=barrier
 Terminal=false
 Categories=Utility;

res/barrier2.desktop

@@ -1,11 +0,0 @@
-[Desktop Entry]
-Type=Application
-Version=1.0
-Name=Barrier
-Comment=Keyboard and mouse sharing solution
-Path=/usr/bin
-Exec=/usr/bin/barrier2
-Icon=barrier
-Terminal=false
-Categories=Utility;
-Keywords=keyboard;mouse;sharing;network;share;

res/openssl/barrier.conf

@@ -31,7 +31,7 @@ commonName = supplied
 emailAddress = optional
 
 [req]
-default_bits = 1024 # Size of keys
+default_bits = 2048 # Size of keys
 default_keyfile = key.pem # name of generated keys
 default_md = md5 # message digest algorithm
 string_mask = nombstr # permitted characters

snap/snapcraft.yaml

@@ -0,0 +1,84 @@
+name: barrier
+base: core18
+version: master
+version-script: git describe --tags --long | sed "s/^v//"
+adopt-info: appstream-flathub
+grade: stable # must be 'stable' to release into candidate/stable channels
+confinement: strict # use 'strict' once you have the right plugs and slots
+icon: res/barrier.svg
+license: GPL-2.0
+
+apps:
+  barrier:
+    command: desktop-launch barrier #first run might take longer
+    desktop: usr/share/applications/barrier.desktop
+    common-id: com.github.debauchee.barrier
+    plugs: &plugs
+      - desktop
+      - desktop-legacy
+      - home
+      - joystick
+      - network
+      - opengl
+      - pulseaudio
+      - screen-inhibit-control
+      - unity7
+      - wayland
+      - x11
+  barrierc:
+    command: desktop-launch barrierc
+    plugs: *plugs
+  barriers:
+    command: desktop-launch barriers
+    plugs: *plugs
+
+parts:
+  desktop-qt5:
+    source: https://github.com/ubuntu/snapcraft-desktop-helpers.git
+    source-subdir: qt
+    plugin: make
+
+  barrier:
+    source: .
+    plugin: cmake
+    configflags:
+      - "-DCMAKE_INSTALL_PREFIX=/usr"
+      - "-DCMAKE_BUILD_TYPE=Release"
+    build-packages:
+      - xorg-dev
+      - libcurl4-openssl-dev
+      - libavahi-compat-libdnssd-dev
+      - libssl-dev
+      - libx11-dev
+      - qtbase5-dev
+      - qt5-style-plugins
+      - libxinerama-dev
+      - libxrandr-dev
+      - libxrender-dev
+      - libxtst-dev
+      - qtdeclarative5-dev
+      - libavahi-common-dev
+      - libqt5svg5-dev
+    stage-packages:
+      - libxinerama1
+      - libxrandr2
+      - libxrender1
+      - libqt5gui5
+      - libqt5x11extras5
+      - libqt5svg5
+      - libxtst6
+      - libavahi-client3
+      - libavahi-common3
+      - libavahi-compat-libdnssd1
+    after: [desktop-qt5]
+
+  fix-icon:
+    plugin: nil
+    override-build:
+      sed -i 's|Icon=barrier|Icon=/usr/share/icons/hicolor/scalable/apps/barrier.svg|' $SNAPCRAFT_STAGE/usr/share/applications/barrier.desktop
+    after: [barrier]
+
+  appstream-flathub:
+    plugin: dump
+    source: https://github.com/flathub/com.github.debauchee.barrier.git
+    parse-info: [com.github.debauchee.barrier.appdata.xml]

src/cmd/CMakeLists.txt

@@ -16,7 +16,6 @@
 
 add_subdirectory(barrierc)
 add_subdirectory(barriers)
-add_subdirectory(syntool)
 
 if (WIN32)
 	add_subdirectory(barrierd)

src/cmd/barrierc/CMakeLists.txt

@@ -29,6 +29,7 @@ if (WIN32)
         tb_idle.ico
         tb_run.ico
         tb_wait.ico
+        barrierc.exe.manifest
     )
 elseif (APPLE)
     file(GLOB arch_headers "OSX*.h")

src/cmd/barrierc/barrierc.exe.manifest

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"><trustInfo xmlns="urn:schemas-microsoft-com:asm.v3"><security><requestedPrivileges><requestedExecutionLevel level="asInvoker" uiAccess="false"></requestedExecutionLevel></requestedPrivileges></security></trustInfo><application xmlns="urn:schemas-microsoft-com:asm.v3"><windowsSettings><dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitor</dpiAwareness><dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware></windowsSettings></application></assembly>

src/cmd/barriers/CMakeLists.txt

@@ -29,6 +29,7 @@ if (WIN32)
         tb_idle.ico
         tb_run.ico
         tb_wait.ico
+        barriers.exe.manifest
     )
 elseif (APPLE)
     file(GLOB arch_headers "OSX*.h")

src/cmd/barriers/barriers.exe.manifest

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"><trustInfo xmlns="urn:schemas-microsoft-com:asm.v3"><security><requestedPrivileges><requestedExecutionLevel level="asInvoker" uiAccess="false"></requestedExecutionLevel></requestedPrivileges></security></trustInfo><application xmlns="urn:schemas-microsoft-com:asm.v3"><windowsSettings><dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware></windowsSettings></application></assembly>

src/cmd/syntool/CMakeLists.txt

@@ -1,27 +0,0 @@
-# barrier -- mouse and keyboard sharing utility
-# Copyright (C) 2014-2016 Symless Ltd.
-# 
-# This package is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# found in the file LICENSE that should have accompanied this file.
-# 
-# This package is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-file(GLOB headers "*.h")
-file(GLOB sources "*.cpp")
-
-add_executable(syntool ${sources})
-target_link_libraries(syntool
-    synlib arch base client common io ipc mt net platform server ${libs} ${OPENSSL_LIBS})
-
-if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-    install (TARGETS syntool DESTINATION ${BARRIER_BUNDLE_BINARY_DIR})
-elseif (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
-    install (TARGETS syntool DESTINATION bin)
-endif()

src/cmd/syntool/syntool.cpp

@@ -1,31 +0,0 @@
-/*
- * barrier -- mouse and keyboard sharing utility
- * Copyright (C) 2014-2016 Symless Ltd.
- * 
- * This package is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * found in the file LICENSE that should have accompanied this file.
- * 
- * This package is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "barrier/ToolApp.h"
-#include "arch/Arch.h"
-
-int
-main(int argc, char** argv) 
-{
-#if SYSAPI_WIN32
-    // record window instance for tray icon, etc
-    ArchMiscWindows::setInstanceWin32(GetModuleHandle(NULL));
-#endif
-
-    ToolApp app;
-    return app.run(argc, argv);
-}

src/gui/CMakeLists.txt

@@ -22,7 +22,7 @@ add_executable (barrier WIN32
 
 include_directories (./src)
 
-qt5_use_modules (barrier Core Widgets Network)
+target_link_libraries (barrier Qt5::Core Qt5::Widgets Qt5::Network)
 target_compile_definitions (barrier PRIVATE -DBARRIER_VERSION_STAGE="${BARRIER_VERSION_STAGE}")
 target_compile_definitions (barrier PRIVATE -DBARRIER_REVISION="${BARRIER_REVISION}")
 
@@ -36,8 +36,7 @@ if (WIN32)
 elseif (APPLE)
     find_library(APPSERVICES_LIB ApplicationServices)
     target_link_libraries(barrier ${APPSERVICES_LIB})
-elseif (${CMAKE_SYSTEM_NAME} MATCHES "Linux" OR
-        ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
+else()
     target_link_libraries (barrier dns_sd)
 endif()
 
@@ -45,6 +44,8 @@ if (HAVE_X11)
     target_link_libraries (barrier X11)
 endif()
 
+target_link_libraries (barrier common)
+
 if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
     install (TARGETS barrier DESTINATION ${BARRIER_BUNDLE_BINARY_DIR})
 elseif (${CMAKE_SYSTEM_NAME} MATCHES "Linux")

src/gui/gui.ts

@@ -456,7 +456,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re
     </message>
     <message>
         <location filename="res/MainWindowBase.ui" line="373"/>
-        <source>&amp;Apply</source>
+        <source>&amp;Reload</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

src/gui/res/lang/gui_af-ZA.ts

@@ -454,7 +454,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re
     </message>
     <message>
         <location filename="res/MainWindowBase.ui" line="373"/>
-        <source>&amp;Apply</source>
+        <source>&amp;Reload</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

src/gui/res/lang/gui_ar.ts

@@ -454,7 +454,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re
     </message>
     <message>
         <location filename="res/MainWindowBase.ui" line="373"/>
-        <source>&amp;Apply</source>
+        <source>&amp;Reload</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

src/gui/res/lang/gui_bg-BG.ts

@@ -454,7 +454,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re
     </message>
     <message>
         <location filename="res/MainWindowBase.ui" line="373"/>
-        <source>&amp;Apply</source>
+        <source>&amp;Reload</source>
         <translation type="finished">Приложи</translation>
     </message>
     <message>

src/gui/res/lang/gui_ca-AD.ts

@@ -454,7 +454,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re
     </message>
     <message>
         <location filename="res/MainWindowBase.ui" line="373"/>
-        <source>&amp;Apply</source>
+        <source>&amp;Reload</source>
         <translation type="finished">Aplicar</translation>
     </message>
     <message>

src/gui/res/lang/gui_cs-CZ.ts

@@ -454,7 +454,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re
     </message>
     <message>
         <location filename="res/MainWindowBase.ui" line="373"/>
-        <source>&amp;Apply</source>
+        <source>&amp;Reload</source>
         <translation type="finished">&amp;Použít</translation>
     </message>
     <message>

src/gui/res/lang/gui_cy.ts

@@ -454,7 +454,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re
     </message>
     <message>
         <location filename="res/MainWindowBase.ui" line="373"/>
-        <source>&amp;Apply</source>
+        <source>&amp;Reload</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

src/gui/res/lang/gui_da.ts

@@ -454,7 +454,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re
     </message>
     <message>
         <location filename="res/MainWindowBase.ui" line="373"/>
-        <source>&amp;Apply</source>
+        <source>&amp;Reload</source>
         <translation type="finished">&amp;Anvend</translation>
     </message>
     <message>

src/gui/res/lang/gui_de.ts

@@ -454,7 +454,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re
     </message>
     <message>
         <location filename="res/MainWindowBase.ui" line="373"/>
-        <source>&amp;Apply</source>
+        <source>&amp;Reload</source>
         <translation type="finished">&amp;Anwenden</translation>
     </message>
     <message>

src/gui/res/lang/gui_es.ts

@@ -454,7 +454,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re
     </message>
     <message>
         <location filename="res/MainWindowBase.ui" line="373"/>
-        <source>&amp;Apply</source>
+        <source>&amp;Reload</source>
         <translation type="finished">Aplicar</translation>
     </message>
     <message>
@@ -1408,4 +1408,4 @@ Server response:
         <translation type="unfinished"></translation>
     </message>
 </context>
-</TS>
+</TS>

src/gui/res/lang/gui_et-EE.ts

@@ -454,7 +454,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re
     </message>
     <message>
         <location filename="res/MainWindowBase.ui" line="373"/>
-        <source>&amp;Apply</source>
+        <source>&amp;Reload</source>
         <translation type="finished">Rakenda</translation>
     </message>
     <message>

src/gui/res/lang/gui_fi.ts

@@ -454,7 +454,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re
     </message>
     <message>
         <location filename="res/MainWindowBase.ui" line="373"/>
-        <source>&amp;Apply</source>
+        <source>&amp;Reload</source>
         <translation type="finished">Käytä</translation>
     </message>
     <message>

src/gui/res/lang/gui_fr.ts

@@ -454,7 +454,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re
     </message>
     <message>
         <location filename="res/MainWindowBase.ui" line="373"/>
-        <source>&amp;Apply</source>
+        <source>&amp;Reload</source>
         <translation type="finished">Appliquer</translation>
     </message>
     <message>

src/gui/res/lang/gui_gl.ts

@@ -454,7 +454,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re
     </message>
     <message>
         <location filename="res/MainWindowBase.ui" line="373"/>
-        <source>&amp;Apply</source>
+        <source>&amp;Reload</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

src/gui/res/lang/gui_grk.ts

@@ -454,7 +454,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re
     </message>
     <message>
         <location filename="res/MainWindowBase.ui" line="373"/>
-        <source>&amp;Apply</source>
+        <source>&amp;Reload</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

src/gui/res/lang/gui_he.ts

@@ -454,7 +454,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re
     </message>
     <message>
         <location filename="res/MainWindowBase.ui" line="373"/>
-        <source>&amp;Apply</source>
+        <source>&amp;Reload</source>
         <translation type="finished">&amp;שמור שינויים</translation>
     </message>
     <message>

src/gui/res/lang/gui_hi.ts

@@ -454,7 +454,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re
     </message>
     <message>
         <location filename="res/MainWindowBase.ui" line="373"/>
-        <source>&amp;Apply</source>
+        <source>&amp;Reload</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

src/gui/res/lang/gui_hr-HR.ts

@@ -454,7 +454,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re
     </message>
     <message>
         <location filename="res/MainWindowBase.ui" line="373"/>
-        <source>&amp;Apply</source>
+        <source>&amp;Reload</source>
         <translation type="finished">&amp;Primijeni</translation>
     </message>
     <message>

src/gui/res/lang/gui_hu-HU.ts

@@ -454,7 +454,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re
     </message>
     <message>
         <location filename="res/MainWindowBase.ui" line="373"/>
-        <source>&amp;Apply</source>
+        <source>&amp;Reload</source>
         <translation type="finished">Alkalmaz</translation>
     </message>
     <message>

src/gui/res/lang/gui_id.ts

@@ -454,7 +454,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re
     </message>
     <message>
         <location filename="res/MainWindowBase.ui" line="373"/>
-        <source>&amp;Apply</source>
+        <source>&amp;Reload</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

src/gui/res/lang/gui_is-IS.ts

@@ -454,7 +454,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re
     </message>
     <message>
         <location filename="res/MainWindowBase.ui" line="373"/>
-        <source>&amp;Apply</source>
+        <source>&amp;Reload</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

src/gui/res/lang/gui_it.ts

@@ -454,7 +454,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re
     </message>
     <message>
         <location filename="res/MainWindowBase.ui" line="373"/>
-        <source>&amp;Apply</source>
+        <source>&amp;Reload</source>
         <translation type="finished">Applica</translation>
     </message>
     <message>

src/gui/res/lang/gui_ja-JP.ts

@@ -454,7 +454,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re
     </message>
     <message>
         <location filename="res/MainWindowBase.ui" line="373"/>
-        <source>&amp;Apply</source>
+        <source>&amp;Reload</source>
         <translation type="finished">適用</translation>
     </message>
     <message>

src/gui/res/lang/gui_ko.ts

@@ -454,7 +454,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re
     </message>
     <message>
         <location filename="res/MainWindowBase.ui" line="373"/>
-        <source>&amp;Apply</source>
+        <source>&amp;Reload</source>
         <translation type="finished">적용(&amp;A)</translation>
     </message>
     <message>

src/gui/res/lang/gui_lt.ts

@@ -454,7 +454,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re
     </message>
     <message>
         <location filename="res/MainWindowBase.ui" line="373"/>
-        <source>&amp;Apply</source>
+        <source>&amp;Reload</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

src/gui/res/lang/gui_lv.ts

@@ -454,7 +454,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re
     </message>
     <message>
         <location filename="res/MainWindowBase.ui" line="373"/>
-        <source>&amp;Apply</source>
+        <source>&amp;Reload</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

src/gui/res/lang/gui_mr.ts

@@ -454,7 +454,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re
     </message>
     <message>
         <location filename="res/MainWindowBase.ui" line="373"/>
-        <source>&amp;Apply</source>
+        <source>&amp;Reload</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

src/gui/res/lang/gui_nl-NL.ts

@@ -454,7 +454,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re
     </message>
     <message>
         <location filename="res/MainWindowBase.ui" line="373"/>
-        <source>&amp;Apply</source>
+        <source>&amp;Reload</source>
         <translation type="finished">Toep&amp;assen</translation>
     </message>
     <message>

src/gui/res/lang/gui_no.ts

@@ -454,7 +454,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re
     </message>
     <message>
         <location filename="res/MainWindowBase.ui" line="373"/>
-        <source>&amp;Apply</source>
+        <source>&amp;Reload</source>
         <translation type="finished">&amp;Bruk</translation>
     </message>
     <message>

src/gui/res/lang/gui_pes-IR.ts

@@ -454,7 +454,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re
     </message>
     <message>
         <location filename="res/MainWindowBase.ui" line="373"/>
-        <source>&amp;Apply</source>
+        <source>&amp;Reload</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

src/gui/res/lang/gui_pl-PL.ts

@@ -454,7 +454,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re
     </message>
     <message>
         <location filename="res/MainWindowBase.ui" line="373"/>
-        <source>&amp;Apply</source>
+        <source>&amp;Reload</source>
         <translation type="finished">&amp;Zastosuj</translation>
     </message>
     <message>

src/gui/res/lang/gui_pt-BR.ts

@@ -454,7 +454,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re
     </message>
     <message>
         <location filename="res/MainWindowBase.ui" line="373"/>
-        <source>&amp;Apply</source>
+        <source>&amp;Reload</source>
         <translation type="finished">Aplicar</translation>
     </message>
     <message>

src/gui/res/lang/gui_pt-PT.ts

@@ -454,7 +454,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re
     </message>
     <message>
         <location filename="res/MainWindowBase.ui" line="373"/>
-        <source>&amp;Apply</source>
+        <source>&amp;Reload</source>
         <translation type="finished">&amp;Aplicar</translation>
     </message>
     <message>