Updated change log and stage for RC2

Removed Windows hook DLL

.cirrus.yml

@@ -0,0 +1,63 @@
+gcp_credentials: ENCRYPTED[d3110e2399b82e1d2adb6f9294917064a448a4d102c42c5023815723841db4ff7aa1d0df64a44281ed25b3adbeb08eff]
+
+windows_task:
+  gce_instance:
+    image_project: buildcluster-237411
+    image_name: windows2019-vs2017-ramdisk
+    platform: windows
+    zone: us-central1-a
+    type: n1-highcpu-16
+    disk: 32
+    use_ssd: true
+
+  env: 
+    BONJOUR_SDK_HOME: C:\Program Files\Bonjour SDK\
+    CMAKE_PREFIX_PATH: C:\Qt\5.9.5\msvc2017_64
+    CIRRUS_WORKING_DIR: D:\
+
+  build_script:
+    - .\CI\Windows\build.bat
+
+ubuntu1604_task:
+  use_compute_credits: true
+  container:
+    dockerfile: CI/ubuntu1604.Dockerfile
+  build_script: 
+    - pwd; ls -la
+    - chmod +x ./CI/build.sh
+    - ./CI/build.sh
+
+ubuntu1804_task:
+  use_compute_credits: true
+  container:
+    dockerfile: CI/ubuntu1804.Dockerfile
+  build_script: 
+    - pwd; ls -la
+    - chmod +x ./CI/build.sh
+    - ./CI/build.sh
+
+ubuntu1904_task:
+  use_compute_credits: true
+  container:
+    dockerfile: CI/ubuntu1904.Dockerfile
+  build_script: 
+    - pwd; ls -la
+    - chmod +x ./CI/build.sh
+    - ./CI/build.sh
+
+macos_task:
+    use_compute_credits: true
+    osx_instance:
+        image: mojave-xcode-10.2
+        
+    env:
+        PATH: /usr/local/opt/qt/bin:$PATH
+
+    install_script:
+        - brew install qt
+        - brew install openssl@1.1
+    build_script:
+        - mkdir build
+        - cd build
+        - cmake  -DCMAKE_OSX_DEPLOYMENT_TARGET=10.10 -DCMAKE_OSX_ARCHITECTURES=x86_64 -DCMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE -DCMAKE_CONFIGURATION_TYPES=$CMAKE_BUILD_TYPE ..
+        - make

.editorconfig

@@ -1,9 +0,0 @@
-root = true
-
-[*]
-end_of_line = lf
-charset = utf-8
-trim_trailing_whitespace = true
-insert_final_newline = true
-indent_style = space
-indent_size = 4

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,88 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: Client goes crazy when I mash the keyboard
+labels: bug, triage
+assignees: ''
+
+---
+
+### Operating Systems ###
+
+---BEGIN HELP---
+
+Remember: Delete the help text (between `---BEGIN HELP---` and `---END HELP---`).
+Technical support: https://symless.com/contact/customer-support?help-option=GitHub
+
+For example:
+
+Server: niceOS 10.42
+Client: Awesome XP SP13
+
+Please distinguish which operating system is the client and which is the server. The server is the computer that the mouse and keyboard are shared from.
+
+---END HELP---
+
+### Synergy Version ###
+
+---BEGIN HELP---
+
+If you're not using the latest version of Synergy, please update first:
+https://symless.com/synergy/downloads
+
+Please don't rely on Linux package manager versioning, they often get it wrong. If using the command line, you can use the `--version` arg to get your installed Synergy version, like so:
+
+Synergy 1: `synergys --version`
+Synergy 2: `synergy-core --server --version`
+
+If you're using the Synergy 1 config app (main Synergy app) then go to the Help menu, and click About. In Synergy 2 Beta, the version is displayed at all times.
+
+---END HELP---
+
+### Steps to Reproduce ###
+
+---BEGIN HELP---
+
+This is the most important part. Try to remember exactly what exact steps caused the bug. Please make sure the steps are numbered and concise, like so:
+
+1. Do a little dance
+2. Make a little love
+3. Get down tonight
+
+Expected: Awesome things to happen
+Actual: Not so awesome things happened
+
+Before submitting, try to reproduce the bug based on the steps you provided.
+
+---END HELP---
+
+### Log URLs ###
+
+# README & DELETE #
+
+---BEGIN HELP---
+
+Please do not paste entire logs here, it looks really silly. Instead, upload your logs, and share the URLs to the uploaded logs. Here's how you that:
+
+Synergy 1: https://symless.com/help/s1-troubleshooting/s1-sending-logs
+Synergy 2: https://symless.com/help/s2-troubleshooting/s2-sending-logs
+
+Make sure you say which log is for which computer, and also which computer is the client and which one is the server. This helps to avoid any confusion.
+
+---END HELP---
+
+### Extra Info ###
+
+# README & DELETE #
+
+---BEGIN HELP---
+
+* Attach any screenshots
+* What maybe causing it?
+* Are there any workarounds?
+* What other apps are you running?
+* Does it stop you using Synergy entirely?
+* Did restarting Synergy or the computer help?
+* Is there anything else you can think of
+
+---END HELP---

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -1,80 +0,0 @@
-name: Bug Report
-description: File a bug report (for questions, ideas & support, use the Discussions tab, or IRC for quick answers, but make sure to stay on the channel!)
-body:
-  - type: markdown
-    attributes:
-      value: |
-        Thanks for taking the time to fill out this bug report!
-  - type: textarea
-    id: what-happened
-    attributes:
-      label: What happened?
-      description: Also tell us, what did you expect to happen?
-      placeholder: Tell us what you see! Screenshots are also helpful - please attach to the issue (when created), rather than linking to image hosting sites.
-    validations:
-      required: true
-  - type: dropdown
-    id: version
-    attributes:
-      label: Version
-      description: What version of Barrier are you running?
-      options:
-        - v2.0.0-RC1
-        - v2.0.0-RC2
-        - v2.0.0
-        - v2.1.1
-        - v2.1.2
-        - v2.3.0
-        - v2.3.1
-        - v2.3.2-alpha
-        - v2.3.2
-        - v2.3.3
-        - v2.3.4
-        - v2.4.0
-        - From Git HEAD or commit (specify below)
-    validations:
-      required: true
-  - type: input
-    id: git-commit-if
-    attributes:
-      label: Git commit hash (if applicable)
-      description: "When building Barrier from Git, what commit hash did you checkout from?"
-      placeholder: b0c0b42b
-    validations:
-      required: false
-  - type: textarea
-    id: pkg-mgr-origin
-    attributes:
-      label: If applicable, where did you install Barrier from?
-      description: This includes Snaps, Flatpaks, and self-built executables.
-    validations:
-      required: false
-  - type: dropdown
-    id: os
-    attributes:
-      label: What OSes are you seeing the problem on? (Check all that apply)
-      multiple: true
-      options:
-        - Linux
-        - Windows
-        - macOS
-    validations:
-      required: true
-  - type: textarea
-    id: os-version
-    attributes:
-      label: What OS versions are you using?
-      description: This applies to both client(s) and the server.
-    validations:
-      required: true
-  - type: textarea
-    id: logs
-    attributes:
-      label: Relevant log output
-      description: Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks.
-      render: shell
-  - type: textarea
-    id: misc-info
-    attributes:
-      label: Any other information
-      description: Please enter any other information we should know, if applicable.

.github/ISSUE_TEMPLATE/config.yml

@@ -1 +0,0 @@
-blank_issues_enabled: false

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,21 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: Make beep sound when moving from client to server
+labels: enhancement, triage
+assignees: ''
+
+---
+
+### Problem ###
+
+[A clear and concise description of what the problem is. ]
+
+### Solution ###
+
+[A clear and concise description of what you want to happen.]
+
+### More Info ###
+
+- Describe alternatives you've considered
+- Add any other context or screenshots about the feature request here

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,4 +0,0 @@
-## Contributor Checklist:
-
-* [ ] I have created a file in the `doc/newsfragments` directory *IF* it is a
-      user-visible change (and make sure to read the `README.md` in that directory) 

.gitignore

@@ -1,4 +1,3 @@
-build_env.*
 config.h
 .DS_Store
 *.pyc
@@ -19,16 +18,9 @@ config.h
 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
+src/setup/win32/synergy.suo
+/.idea
+/cmake-build-debug
+/CMakeLists.txt.user
+/.vs
+/CMakeLists.txt.*

.gitmodules

@@ -1,9 +0,0 @@
-[submodule "ext/gtest"]
-	path = ext/gtest
-	url = https://github.com/google/googletest.git
-[submodule "ext/gmock"]
-	path = ext/gmock
-	url = https://github.com/google/googlemock.git
-[submodule "ext/gulrak-filesystem"]
-	path = ext/gulrak-filesystem
-	url = https://github.com/gulrak/filesystem

Build.properties

@@ -1,7 +1,7 @@
 #
-# Barrier build parameters
+# Synergy build parameters
 #
-BARRIER_VERSION_MAJOR = 2
-BARRIER_VERSION_MINOR = 4
-BARRIER_VERSION_PATCH = 0
-BARRIER_VERSION_STAGE = release
+SYNERGY_VERSION_MAJOR = 1
+SYNERGY_VERSION_MINOR = 10
+SYNERGY_VERSION_PATCH = 2
+SYNERGY_VERSION_STAGE = snapshot

CI/MacOS/qtifwsilent.qs

@@ -0,0 +1,56 @@
+function Controller() {
+    installer.autoRejectMessageBoxes();
+    installer.installationFinished.connect(function() {
+        gui.clickButton(buttons.NextButton);
+    })
+}
+
+Controller.prototype.WelcomePageCallback = function() {
+    gui.clickButton(buttons.NextButton, 3000);
+}
+
+Controller.prototype.CredentialsPageCallback = function() {
+    gui.clickButton(buttons.NextButton);
+}
+
+Controller.prototype.IntroductionPageCallback = function() {
+    gui.clickButton(buttons.NextButton);
+}
+
+Controller.prototype.TargetDirectoryPageCallback = function()
+{
+    gui.currentPageWidget().TargetDirectoryLineEdit.setText(installer.value("HomeDir") + "/Qt");
+    gui.clickButton(buttons.NextButton);
+}
+
+Controller.prototype.ComponentSelectionPageCallback = function() {
+    var widget = gui.currentPageWidget();
+
+    widget.deselectAll();
+
+    widget.selectComponent("qt.595.clang_64")
+  
+    gui.clickButton(buttons.NextButton);
+}
+
+Controller.prototype.LicenseAgreementPageCallback = function() {
+    gui.currentPageWidget().AcceptLicenseRadioButton.setChecked(true);
+    gui.clickButton(buttons.NextButton);
+}
+
+Controller.prototype.StartMenuDirectoryPageCallback = function() {
+    gui.clickButton(buttons.NextButton);
+}
+
+Controller.prototype.ReadyForInstallationPageCallback = function()
+{
+    gui.clickButton(buttons.NextButton);
+}
+
+Controller.prototype.FinishedPageCallback = function() {
+var checkBoxForm = gui.currentPageWidget().LaunchQtCreatorCheckBoxForm
+if (checkBoxForm && checkBoxForm.launchQtCreatorCheckBox) {
+    checkBoxForm.launchQtCreatorCheckBox.checked = false;
+}
+    gui.clickButton(buttons.FinishButton);
+}

CI/Windows/build.bat

@@ -0,0 +1,6 @@
+SET VS_INSTALL_PATH=C:\"Program Files (x86)"\"Microsoft Visual Studio"\2019\Community\
+call %VS_INSTALL_PATH%Common7\Tools\VsDevCmd.bat
+mkdir build
+cd build
+cmake -G "Visual Studio 15 2017 Win64" -DCMAKE_BUILD_TYPE=Debug ..
+msbuild synergy-core.sln /p:Platform="x64" /p:Configuration=Debug /m

CI/Windows/qtifwsilent.qs

@@ -0,0 +1,54 @@
+function Controller() {
+    installer.autoRejectMessageBoxes();
+    installer.installationFinished.connect(function() {
+        gui.clickButton(buttons.NextButton);
+    })
+}
+
+Controller.prototype.WelcomePageCallback = function() {
+    gui.clickButton(buttons.NextButton, 3000);
+}
+
+Controller.prototype.CredentialsPageCallback = function() {
+    gui.clickButton(buttons.NextButton);
+}
+
+Controller.prototype.IntroductionPageCallback = function() {
+    gui.clickButton(buttons.NextButton);
+}
+
+Controller.prototype.TargetDirectoryPageCallback = function() {
+    gui.currentPageWidget().TargetDirectoryLineEdit.setText(installer.environmentVariable("QT_INSTALL_DIR"));
+    gui.clickButton(buttons.NextButton);
+}
+
+Controller.prototype.ComponentSelectionPageCallback = function() {
+    var widget = gui.currentPageWidget();
+    widget.deselectAll();
+    widget.selectComponent("qt.595.win32_msvc2015");
+    widget.selectComponent("qt.595.win64_msvc2015_64");
+    widget.selectComponent("qt.595.qtscript");
+    widget.selectComponent("qt.tools.vcredist_msvc2015_x86");
+    widget.selectComponent("qt.tools.vcredist_msvc2015_x64");
+    gui.clickButton(buttons.NextButton);
+}
+
+Controller.prototype.LicenseAgreementPageCallback = function() {
+    gui.currentPageWidget().AcceptLicenseRadioButton.setChecked(true);
+    gui.clickButton(buttons.NextButton);
+}
+
+Controller.prototype.StartMenuDirectoryPageCallback = function() {
+    gui.clickButton(buttons.NextButton);
+}
+
+Controller.prototype.ReadyForInstallationPageCallback = function() {
+    gui.clickButton(buttons.NextButton);
+}
+
+Controller.prototype.FinishedPageCallback = function() {
+    var checkBoxForm = gui.currentPageWidget().LaunchQtCreatorCheckBoxForm;
+    if (checkBoxForm && checkBoxForm.launchQtCreatorCheckBox)
+        checkBoxForm.launchQtCreatorCheckBox.checked = false;
+    gui.clickButton(buttons.FinishButton);
+}

CI/build.sh

@@ -0,0 +1,6 @@
+pwd
+ls -la
+mkdir build 
+cd build
+cmake ..
+make

CI/package.sh

@@ -0,0 +1,12 @@
+cd ${CIRRUS_WORKING_DIR}
+
+source ./build/version
+
+SYNERGY_VERSION="$SYNERGY_VERSION_MAJOR.$SYNERGY_VERSION_MINOR.$SYNERGY_VERSION_PATCH"
+SYNERGY_REVISION=`git rev-parse --short=8 HEAD`
+SYNERGY_DEB_VERSION="${SYNERGY_VERSION}.${SYNERGY_VERSION_STAGE}~b${BUILD_NUMBER}+${SYNERGY_REVISION}"
+
+dch --create --package "synergy" --controlmaint --distribution unstable --newversion $SYNERGY_DEB_VERSION "Initial release"
+
+export DEB_BUILD_OPTIONS="parallel=4"
+debuild --preserve-envvar SYNERGY_* --preserve-envvar GIT_COMMIT --preserve-envvar BUILD_NUMBER

CI/ubuntu1604.Dockerfile

@@ -0,0 +1,24 @@
+#
+# Ubuntu Dockerfile
+#
+# https://github.com/dockerfile/ubuntu
+#
+
+# Pull base image.
+FROM ubuntu:16.04
+
+# Install.
+RUN \
+  sed -i 's/# \(.*multiverse$\)/\1/g' /etc/apt/sources.list && \
+  apt-get update && \
+  apt-get install -y git cmake qtbase5-dev build-essential libx11-dev libxtst-dev libgl1-mesa-dev libssl-dev libavahi-compat-libdnssd-dev && \
+  apt-get install -y debhelper devscripts
+  
+# Set environment variables.
+ENV HOME /root
+
+# Define working directory.
+WORKDIR /root
+
+# Define default command.
+CMD ["bash"]

CI/ubuntu1804.Dockerfile

@@ -0,0 +1,24 @@
+#
+# Ubuntu Dockerfile
+#
+# https://github.com/dockerfile/ubuntu
+#
+
+# Pull base image.
+FROM ubuntu:18.04
+
+# Install.
+RUN \
+  sed -i 's/# \(.*multiverse$\)/\1/g' /etc/apt/sources.list && \
+  apt-get update && \
+  apt-get install -y git cmake qtbase5-dev build-essential libx11-dev libxtst-dev libgl1-mesa-dev libssl-dev libavahi-compat-libdnssd-dev && \
+  apt-get install -y debhelper devscripts
+
+# Set environment variables.
+ENV HOME /root
+
+# Define working directory.
+WORKDIR /root
+
+# Define default command.
+CMD ["bash"]

CI/ubuntu1904.Dockerfile

@@ -0,0 +1,24 @@
+#
+# Ubuntu Dockerfile
+#
+# https://github.com/dockerfile/ubuntu
+#
+
+# Pull base image.
+FROM ubuntu:19.04
+
+# Install.
+RUN \
+  sed -i 's/# \(.*multiverse$\)/\1/g' /etc/apt/sources.list && \
+  apt-get update && \
+  apt-get install -y git cmake qtbase5-dev build-essential libx11-dev libxtst-dev libgl1-mesa-dev libssl-dev libavahi-compat-libdnssd-dev && \
+  apt-get install -y debhelper devscripts
+  
+# Set environment variables.
+ENV HOME /root
+
+# Define working directory.
+WORKDIR /root
+
+# Define default command.
+CMD ["bash"]

CMakeLists.txt

@@ -1,5 +1,4 @@
-# Barrier -- mouse and keyboard sharing utility
-# Copyright (C) 2018 Debauchee Open Source Group
+# Synergy -- mouse and keyboard sharing utility
 # Copyright (C) 2012-2016 Symless Ltd.
 # Copyright (C) 2009 Nick Bolton
 #
@@ -16,14 +15,18 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 cmake_minimum_required (VERSION 3.4)
-project (barrier C CXX)
+project (synergy-core C CXX)
 
-option (BARRIER_BUILD_GUI "Build the GUI" ON)
-option (BARRIER_BUILD_INSTALLER "Build the installer" ON)
-option (BARRIER_BUILD_TESTS "Build the tests" ON)
-option (BARRIER_USE_EXTERNAL_GTEST "Use external installation of Google Test framework" OFF)
+option (SYNERGY_BUILD_LEGACY_GUI "Build the legacy GUI" ON)
+option (SYNERGY_BUILD_LEGACY_SERVICE "Build the legacy service (synergyd)" ON)
+option (SYNERGY_BUILD_LEGACY_INSTALLER "Build the legacy installer" ON)
+
+if (DEFINED ENV{SYNERGY_ENTERPRISE})
+  option (SYNERGY_ENTERPRISE "Build Enterprise" ON)
+else()
+  option (SYNERGY_ENTERPRISE "Build Enterprise" OFF)
+endif()
 
-set (CMAKE_EXPORT_COMPILE_COMMANDS ON)
 set (CMAKE_CXX_STANDARD 14)
 set (CMAKE_CXX_EXTENSIONS OFF)
 set (CMAKE_CXX_STANDARD_REQUIRED ON)
@@ -34,8 +37,10 @@ if (NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
     add_definitions (-DNDEBUG)
 endif()
 
+#
+# Synergy version
+#
 include (cmake/Version.cmake)
-include (cmake/Package.cmake)
 
 # TODO: Find out why we need these, and remove them
 if (COMMAND cmake_policy)
@@ -45,16 +50,17 @@ endif()
 
 # Add headers to source list
 if (${CMAKE_GENERATOR} STREQUAL "Unix Makefiles")
-    set (BARRIER_ADD_HEADERS FALSE)
+    set (SYNERGY_ADD_HEADERS FALSE)
 else()
-    set (BARRIER_ADD_HEADERS TRUE)
+    set (SYNERGY_ADD_HEADERS TRUE)
 endif()
 
 set (libs)
+include_directories (BEFORE SYSTEM ./ext/gtest/include)
 
 if (UNIX)
     if (NOT APPLE)
-        set (CMAKE_POSITION_INDEPENDENT_CODE TRUE)
+        set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
     endif()
 
     # For config.h, detect the libraries, functions, etc.
@@ -65,7 +71,6 @@ if (UNIX)
     include (CheckIncludeFileCXX)
     include (CheckSymbolExists)
     include (CheckCSourceCompiles)
-    include (FindPkgConfig)
 
     check_include_file_cxx (istream HAVE_ISTREAM)
     check_include_file_cxx (ostream HAVE_OSTREAM)
@@ -91,6 +96,7 @@ if (UNIX)
     check_function_exists (poll HAVE_POLL)
     check_function_exists (sigwait HAVE_POSIX_SIGWAIT)
     check_function_exists (strftime HAVE_STRFTIME)
+    check_function_exists (vsnprintf HAVE_VSNPRINTF)
     check_function_exists (inet_aton HAVE_INET_ATON)
 
     # For some reason, the check_function_exists macro doesn't detect
@@ -123,21 +129,14 @@ if (UNIX)
     check_type_size (short SIZEOF_SHORT)
 
     # pthread is used on both Linux and Mac
-    set (CMAKE_THREAD_PREFER_PTHREAD TRUE)
-    set (THREADS_PREFER_PTHREAD_FLAG TRUE)
-    find_package (Threads REQUIRED)
-    list (APPEND libs Threads::Threads)
-
-    # curl is used on both Linux and Mac
-    find_package (CURL)
-    if (CURL_FOUND)
-        include_directories(${CURL_INCLUDE_DIRS})
-        list (APPEND libs ${CURL_LIBRARIES})
-
+    check_library_exists ("pthread" pthread_create "" HAVE_PTHREAD)
+    if (HAVE_PTHREAD)
+        list (APPEND libs pthread)
     else()
-        message (FATAL_ERROR "Missing library: curl")
+        message (FATAL_ERROR "Missing library: pthread")
     endif()
 
+
     if (APPLE)
         set (CMAKE_CXX_FLAGS "--sysroot ${CMAKE_OSX_SYSROOT} ${CMAKE_CXX_FLAGS} -DGTEST_USE_OWN_TR1_TUPLE=1")
 
@@ -156,28 +155,9 @@ if (UNIX)
         )
 
     else() # not-apple
-        # FreeBSD uses /usr/local for anything not part of base
-        # Also package avahi-libdns puts dns_sd.h a bit deeper
-        if (${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
-            set (CMAKE_REQUIRED_INCLUDES "${CMAKE_REQUIRED_INCLUDES};/usr/local/include;/usr/local/include/avahi-compat-libdns_sd")
-            set (CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -L/usr/local/lib")
-            include_directories("/usr/local/include" "/usr/local/include/avahi-compat-libdns_sd")
-            link_directories("/usr/local/lib")
-        endif()
 
-        if (${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD")
-            set (CMAKE_REQUIRED_INCLUDES "${CMAKE_REQUIRED_INCLUDES};/usr/X11R6/include;/usr/local/include;/usr/local/include/avahi-compat-libdns_sd")
-            set (CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -L/usr/local/lib -L/usr/X11R6/lib")
-            include_directories("/usr/local/include" "/usr/X11R6/include" "/usr/local/include/avahi-compat-libdns_sd")
-            link_directories("/usr/local/lib")
-            link_directories("/usr/X11R6/lib")
-        endif()
-
-        if (BARRIER_BUILD_GUI AND ${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 ()
+        # add include dir for bsd (posix uses /usr/include/)
+        set (CMAKE_INCLUDE_PATH "${CMAKE_INCLUDE_PATH}:/usr/local/include")
 
         set (XKBlib "X11/Xlib.h;X11/XKBlib.h")
         set (CMAKE_EXTRA_INCLUDE_FILES "${XKBlib};X11/extensions/Xrandr.h")
@@ -192,20 +172,16 @@ if (UNIX)
         check_include_files ("X11/extensions/XTest.h" HAVE_X11_EXTENSIONS_XTEST_H)
         check_include_files ("${XKBlib}" HAVE_X11_XKBLIB_H)
         check_include_files ("X11/extensions/XInput2.h" HAVE_XI2)
-        check_include_files ("dns_sd.h" HAVE_DNSSD)
 
-        if (NOT HAVE_X11_EXTENSIONS_XTEST_H)
-            message (FATAL_ERROR "Missing header: X11/extensions/XTest.h")
+        if (HAVE_X11_EXTENSIONS_DPMS_H)
+            # Assume that function prototypes declared, when include exists.
+            set (HAVE_DPMS_PROTOTYPES 1)
         endif()
 
         if (NOT HAVE_X11_XKBLIB_H)
             message (FATAL_ERROR "Missing header: " ${XKBlib})
         endif()
 
-        if (BARRIER_BUILD_GUI AND NOT HAVE_DNSSD)
-            message (FATAL_ERROR "Missing header: dns_sd.h")
-        endif()
-
         check_library_exists ("SM;ICE" IceConnectionNumber "" HAVE_ICE)
         check_library_exists ("Xext;X11" DPMSQueryExtension "" HAVE_Xext)
         check_library_exists ("Xtst;Xext;X11" XTestQueryExtension "" HAVE_Xtst)
@@ -224,7 +200,7 @@ if (UNIX)
         if (HAVE_Xtst)
 
             # Xtxt depends on X11.
-            set (HAVE_X11 1)
+            set (HAVE_X11)
             list (APPEND libs Xtst X11)
 
         else()
@@ -266,6 +242,7 @@ if (UNIX)
     set (HAVE_CXX_EXCEPTIONS 1)
     set (HAVE_CXX_MUTABLE 1)
     set (HAVE_CXX_STDLIB 1)
+    set (HAVE_PTHREAD_SIGNAL 1)
     set (SELECT_TYPE_ARG1 int)
     set (SELECT_TYPE_ARG234 " (fd_set *)")
     set (SELECT_TYPE_ARG5 " (struct timeval *)")
@@ -291,19 +268,14 @@ elseif (${CMAKE_SYSTEM_NAME} MATCHES "Windows")
     list (APPEND libs Wtsapi32 Userenv Wininet comsuppw Shlwapi)
 
     add_definitions (
-        /DSYSAPI_WIN32=1
-        /DWINAPI_MSWINDOWS=1
-        /D_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING=1  # tr1 is used from gtest and gmock
         /DWIN32
         /D_WINDOWS
         /D_CRT_SECURE_NO_WARNINGS
-        /DBARRIER_VERSION=\"${BARRIER_VERSION}\"
+        /DSYNERGY_VERSION=\"${SYNERGY_VERSION}\"
         /D_XKEYCHECK_H
     )
 endif()
 
-include_directories("${CMAKE_SOURCE_DIR}/ext/gulrak-filesystem/include")
-
 #
 # OpenSSL
 #
@@ -317,66 +289,20 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Windows")
 
     include_directories (BEFORE SYSTEM ${OPENSSL_ROOT}/include)
     set (OPENSSL_LIBS
-        ${OPENSSL_ROOT}/lib/libeay32.lib
-        ${OPENSSL_ROOT}/lib/ssleay32.lib
+        ${OPENSSL_ROOT}/lib/libssl.lib
+        ${OPENSSL_ROOT}/lib/libcrypto.lib
     )
 elseif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-    find_program(APT_PROGRAM "apt")
-    find_program(BREW_PROGRAM "brew")
-    find_program(PORT_PROGRAM "port")
-
-    if (IS_DIRECTORY /opt/procursus AND APT_PROGRAM)
-        # procursus/apt
-        set (OPENSSL_ROOT /opt/procursus)
-
-        include_directories (BEFORE SYSTEM ${OPENSSL_ROOT}/include)
-
-        set (OPENSSL_LIBS
-            ${OPENSSL_ROOT}/lib/libssl.a
-            ${OPENSSL_ROOT}/lib/libcrypto.a
-        )
-    elseif (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
-        )
-    elseif (IS_DIRECTORY /opt/homebrew/opt/openssl AND BREW_PROGRAM)
-        # brew
-        set (OPENSSL_ROOT /opt/homebrew/opt/openssl)
-
-        include_directories (BEFORE SYSTEM ${OPENSSL_ROOT}/include)
-
-        set (OPENSSL_LIBS
-            ${OPENSSL_ROOT}/lib/libssl.a
-            ${OPENSSL_ROOT}/lib/libcrypto.a
-        )
-    endif()
-
+    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
+    )
 elseif (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
     set (OPENSSL_LIBS ssl crypto)
 else()
-    find_library (lib_ssl ssl)
-    find_library (lib_crypto crypto)
-    if (NOT lib_ssl)
-        message(FATAL_ERROR "openssl library not found")
-    elseif (NOT lib_crypto)
-        message(FATAL_ERROR "crypto library not found")
-    endif()
-    set (OPENSSL_LIBS ${lib_ssl} ${lib_crypto})
+    message (FATAL_ERROR "Couldn't find OpenSSL")
 endif()
 
 #
@@ -409,34 +335,46 @@ macro (configure_files srcDir destDir)
     endforeach (templateFile)
 endmacro (configure_files)
 
-if (${BARRIER_BUILD_INSTALLER})
+macro(generate_versionfile)
+	if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin" OR ${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+		FILE(WRITE ${CMAKE_BINARY_DIR}/version
+		"export SYNERGY_VERSION_MAJOR=\"${SYNERGY_VERSION_MAJOR}\"\n"
+		"export SYNERGY_VERSION_MINOR=\"${SYNERGY_VERSION_MINOR}\"\n"
+		"export SYNERGY_VERSION_PATCH=\"${SYNERGY_VERSION_PATCH}\"\n"
+		"export SYNERGY_VERSION_STAGE=\"${SYNERGY_VERSION_STAGE}\"\n")
+	elseif(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
+		FILE(WRITE ${CMAKE_BINARY_DIR}/version.bat
+		"SET SYNERGY_VERSION_MAJOR=${SYNERGY_VERSION_MAJOR}\n"
+		"SET SYNERGY_VERSION_MINOR=${SYNERGY_VERSION_MINOR}\n"
+		"SET SYNERGY_VERSION_PATCH=${SYNERGY_VERSION_PATCH}\n"
+		"SET SYNERGY_VERSION_STAGE=${SYNERGY_VERSION_STAGE}\n")
+	endif()
+endmacro(generate_versionfile)
+
+
+if (${SYNERGY_BUILD_LEGACY_INSTALLER})
 #
 # macOS app Bundle
 #
 if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
     set (CMAKE_INSTALL_RPATH "@loader_path/../Libraries;@loader_path/../Frameworks")
-    set (BARRIER_BUNDLE_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/dist/macos/bundle)
-    set (BARRIER_BUNDLE_DIR ${CMAKE_BINARY_DIR}/bundle)
-    set (BARRIER_BUNDLE_APP_DIR ${BARRIER_BUNDLE_DIR}/Barrier.app)
-    set (BARRIER_BUNDLE_BINARY_DIR ${BARRIER_BUNDLE_APP_DIR}/Contents/MacOS)
-
-    configure_files (${BARRIER_BUNDLE_SOURCE_DIR} ${BARRIER_BUNDLE_DIR})
-
-    add_custom_target(Barrier_MacOS ALL
-                      bash build_dist.sh
-                      DEPENDS barrier barriers barrierc
-                      WORKING_DIRECTORY ${BARRIER_BUNDLE_DIR})
+    set (SYNERGY_BUNDLE_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/dist/macos/bundle)
+    set (SYNERGY_BUNDLE_DIR ${CMAKE_BINARY_DIR}/bundle)
+    set (SYNERGY_BUNDLE_APP_DIR ${SYNERGY_BUNDLE_DIR}/Synergy.app)
+    set (SYNERGY_BUNDLE_BINARY_DIR ${SYNERGY_BUNDLE_APP_DIR}/Contents/MacOS)
+	
+	generate_versionfile()
+    configure_files (${SYNERGY_BUNDLE_SOURCE_DIR} ${SYNERGY_BUNDLE_DIR})
 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")
-        configure_files (${CMAKE_CURRENT_SOURCE_DIR}/dist/inno ${CMAKE_BINARY_DIR}/installer-inno)
+        message (STATUS "Configuring the v1 installer")
+		generate_versionfile()
+		set(QT_PATH $ENV{CMAKE_PREFIX_PATH})
+        configure_files (${CMAKE_CURRENT_SOURCE_DIR}/dist/wix ${CMAKE_BINARY_DIR}/installer)
 endif()
 
 #
@@ -444,18 +382,16 @@ endif()
 #
 if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
     configure_files (${CMAKE_CURRENT_SOURCE_DIR}/dist/rpm ${CMAKE_BINARY_DIR}/rpm)
-    install(FILES res/barrier.svg DESTINATION share/icons/hicolor/scalable/apps)
-    if("${VERSION_MAJOR}" STREQUAL "2")
-        install(FILES res/barrier2.desktop DESTINATION share/applications)
+    install(FILES res/synergy.svg DESTINATION share/icons/hicolor/scalable/apps)
+    if("${VERSION_MAJOR}" STREQUAL "2") 
+        install(FILES res/synergy2.desktop DESTINATION share/applications)
     else()
-        install(FILES res/barrier.desktop DESTINATION share/applications)
+        install(FILES res/synergy.desktop DESTINATION share/applications)
     endif()
+	generate_versionfile()
 endif()
 
 else()
-    message (STATUS "NOT configuring the installer")
+    message (STATUS "NOT configuring the v1 installer")
 endif()
-
-enable_testing()
-
 add_subdirectory (src)

ChangeLog

@@ -1,21 +1,137 @@
-v1.9.0-rc3
-============
-Bug #4132 - Laggy mouse cursor on macOS clients
+v1.11.0-stable
+==============
 
-v1.9.0-rc2
-===========
-Bug #5901 - Stored serial key corrupted on macOS
-Bug #5757 - Failure to build against OpenSSL v1.1.0
+Bug fixes:
+- #6575 Service start error on Windows
+- #6570 Hotkey capture of ctrl and cmd swapped on macOS
+- #6569 Unable to run on macOS 10.15 Catalina
+- #6566 Debug message output mistakenly as info message
+- #6561 Debian buster no longer supports CA key length of 1024
+- #6556 Function missing error from OpenSSL/TLS
+- #5959 User interface failed to load local fingerprint
+- #5294 Cursor lockout at Windows server login screen
 
-v1.9.0-rc1
-==========
-Bug #5467 - Failing to automatically download and install Bonjour
-Enhancement #5389 - Ported GUI to Qt 5
-Enhancement #4978 - Windows: Added support for Visual Studio 2015
-Enhancement #5398 - Windows: Updated OpenSSL dependency to 1.0.2k
+Enhancements:
+- #6588 Version number header with update check
+- #4957 Server fails to start up due to synwinhk.dll is in use
+
+Features:
+- #6518 Key combination that will force a server restart
+
+
+v1.10.3-stable
+==============
+
+Bug fixes:
+- #6546 Filtered out self assigned ip addresses from being displayed
+- #6541 Fixed connected info text to include without TLS encryption
+- #6527 Config app renders incorrectly on high DPI screens
+- #6526 New TLS/SSL socket handled when no socket
+- #6525 Race condition on disconnecting TLS/SSL socket
+- #6521 Access violation in TLS/SSL socket close
+- #6409 Server freezes when clipboard contains an image
+- #3705 Hotkeys not working on Mac server
+
+Enhancements:
+- #6535 Version URL and added stage check to version check
+- #6529 Cleaner redistributable use in Windows installer
+- #6528 More verbose message for Linux display errors
+- #6524 Minimize config app to system tray
+- #6523 Restore auto hide on startup for config app
+- #6522 Double click Windows tray icon to show and hide
+- #6520 Support for 32-bit Linux for legacy users
+- #6519 Support for Ubuntu 14.04 LTS for legacy users
+- #6390 Support for OpenSSL 1.1.1 for better security
+
+
+v1.10.2-stable
+==============
+
+Bug fixes:
+- #6495 Event queue memory leak in server cleanup
+- #6471 Unable to stop core retry loop in config app
+- #6460 TLS memory leak on Linux server when using client
+- #6407 Enterprise config app shows auto-config elements
+- #6403 Mouse cursor movement drifts over time
+- #6392 Hostname alert shows unnecessarily on every open
+- #6373 Compile fails on BSD Unix with dl error
+
+Enhancements:
+- #6485 Readme for master branch with download help
+- #6475 Change master branch to current version
+- #6470 CI solution with on-demand containers
+- #6397 Remember last server used in Auto Config
+- #6375 Support for Qt 5.11 framework on Windows
+
+v1.10.1-stable
+==============
+
+Bug fixes:
+- #6339 Windows validating install step freezes
+- #6374 Windows background service crashes randomly
+- #6376 Undeclared identifier compile error in VS2017
+
+Enhancements:
+- #6372 Forced use of TLS 1.2 without fallback method
+- #6338 Auto config checkbox on settings screen
+- #6384 Removal of GPL screen on Windows installer
+- #6383 Extend foreground mode for Windows daemon
+- #6382 Code comment for MSVC debugger logging
+- #6380 Compile without warnings using VS2017
+
+v1.10.0-stable
+==============
+
+Bug fixes:
+- #6347 Log to file defaults to unwritable location
+- #6345 Losing GUI config when restarting the OS
+- #4991 Oversized Bonjour protocol name could conflict
+
+Enhancements:
+- #6348 Use different hard coded Qt path for CI
+- #6346 CLI argument to control screen lock feature
+- #6344 Customizable size limit on clipboard sharing
+- #6332 Decouple version from CI build properties
+- #6319 Bonjour auto-config disabled by default
+- #6318 Hide TIS/TSM error on config app log
+- #6312 Removal of redundant CURL library
+- #6306 Show version number in config app title
+- #6305 Support for Raspbian in package config
+- #6301 Combine enterprise and community codebases
+
+v1.9.1-stable
+=============
+
+Bug fix:
+- #5964 Can't click after sleep on Mac client
+
+Enhancements:
+- #6310 More robust macOS screen shape detection
+- #6309 Update OpenSSL to v1.0.2o for better security
+
+v1.9.0-stable
+=============
+
+Bug fixes:
+- #6251 Service hangs after GUI is opened
+- #5844 Icon causes Linux package manager to fail
+- #4132 Laggy mouse cursor on macOS clients
+
+Enhancements:
+- #6116 Quieter quartz event log entry on Mac
+- #6037 Solve defects reported by PVS Studio
+- #6014 Code sign binaries on Windows
+- #6012 Jenkins integration for Ubuntu
+- #5836 Jenkins integration for macOS
+- #5834 Jenkins integration for Fedora
+- #5390 Allow tests to be skipped during build
+- #5389 Qt 5 library support for config app
+- #5019 Raspbian armhf support for Raspberry Pi
+- #4978 Visual Studio 2015 support on Windows 10
+- #4154 IPv6 support for Windows and Linux
 
 v1.8.8-stable
-==========
+=============
 Bug #5196 - Some keys on Korean and Japanese keyboards have the same keycode
 Bug #5578 - Pressing Hangul key results in alt+'a'
 Bug #5785 - Can't switch screens when cursor is in a corner
@@ -423,4 +539,3 @@ Feature #3119: Mac OS X secondary screen
 Task #2905: Unit tests: Clipboard classes
 Task #3072: Downgrade Linux build machines
 Task #3090: CXWindowsKeyState integ test args wrong
-

LICENSE

@@ -1,9 +1,8 @@
-Copyright (C) 2018 Debauchee Open Source Group
 Copyright (C) 2012-2016 Symless Ltd.
 Copyright (C) 2008-2014 Nick Bolton
 Copyright (C) 2002-2014 Chris Schoeneman
 
-This program is released under the GPL with the additional exemption
+This program is released under the GPL with the additional exemption 
 that compiling, linking, and/or using OpenSSL is allowed.
 
                     GNU GENERAL PUBLIC LICENSE
@@ -286,62 +285,3 @@ PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGES.
 
                      END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program 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, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.

README.md

@@ -1,148 +1,27 @@
-# Barrier
+# Synergy Core
 
-Eliminate the barrier between your machines.
-Find [releases for windows and macOS here](https://github.com/debauchee/barrier/releases).
-Your distro probably already has barrier packaged for it, see [distro specific packages](#distro-specific-packages)
-below for a list. Alternatively, we also provide a [flatpak](https://github.com/flathub/com.github.debauchee.barrier)
-and a [snap](https://snapcraft.io/barrier).
+This is the open source core component of Synergy, a keyboard and mouse sharing tool.
 
-### Contact info:
+**[We're hiring!](https://careers.symless.com/)** *Join the Synergy Team (Node.js, React, C++)*
 
-- `#barrier` on LiberaChat IRC network
+**News:** [We Are Putting UX First](https://symless.com/blog/putting-ux-first) (Symless Blog)
 
-#### CI Build Status
+## Recommended
 
-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)
+Things most people will need.
 
-|Platform       |Build Status|
-|            --:|:--         |
-|Linux          |[![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](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](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](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)|
-|Snap           |[![Snap Status](https://build.snapcraft.io/badge/debauchee/barrier.svg)](https://build.snapcraft.io/user/debauchee/barrier)|
+* [Download](https://symless.com/synergy/downloads) - Get the compiled version of Synergy 1 or Synergy 2.
+* [Contact Support](https://symless.com/contact/customer-support) - Open a support ticket and talk directly to the Synergy team.
+* [Help Guides](https://symless.com/synergy-help) - Self-help guides and information for when you don't want to talk to people.
+* [Join us on Slack](http://bitly.com/synergy-slack) - Talk to other Synergy users in real time using instant messaging.
+* [Symless Forums](https://symless.com/forums/forum/11-synergy/) - Discuss Synergy issues on the Symless Forums.
+* [Symless Blog](https://symless.com/blog/) - Find out what's happening with Synergy development.
 
-Our CI Builds are provided by Microsoft Azure Pipelines, Flathub, and Canonical.
+## Advanced Users
 
-### What is it?
+Not for the faint hearted. Only use these if you know what you're doing.
 
-Barrier is software that mimics the functionality of a KVM switch, which historically would allow you to use a single keyboard and mouse to control multiple computers by physically turning a dial on the box to switch the machine you're controlling at any given moment. Barrier does this in software, allowing you to tell it which machine to control by moving your mouse to the edge of the screen, or by using a keypress to switch focus to a different system.
-
-Barrier was forked from Symless's Synergy 1.9 codebase. Synergy was a commercialized reimplementation of the original CosmoSynergy written by Chris Schoeneman.
-
-At the moment, barrier is not compatible with synergy. Barrier needs to be installed on all machines that will share keyboard and mouse.
-
-### 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 one computer to control one or more other computers.
-Clipboard sharing is supported.
-That's it.
-
-### Project goals
-
-Hassle-free reliability. We are users, too. Barrier was created so that we could solve the issues we had with synergy and then share these fixes with other users.
-
-Compatibility. We use more than one operating system and you probably do, too. Windows, OSX, Linux, FreeBSD... Barrier should "just work". We will also have our eye on Wayland when the time comes.
-
-Communication. Everything we do is in the open. Our issue tracker will let you see if others are having the same problem you're having and will allow you to add additional information. You will also be able to see when progress is made and how the issue gets resolved.
-
-### Usage
-
-Install and run barrier on each machine that will be sharing.
-On the machine with the keyboard and mouse, make it the server.
-
-Click the "Configure server" button and drag a new screen onto the grid for each client machine.
-Ensure the "screen name" matches exactly (case-sensitive) for each configured screen -- the clients' barrier windows will tell you their screen names (just above the server IP).
-
-On the client(s), put in the server machine's IP address (or use Bonjour/auto configuration when prompted) and "start" them.
-You should see `Barrier is running` on both server and clients.
-You should now be able to move the mouse between all the screens as if they were the same machine.
-
-Note that if the keyboard's Scroll Lock is active then this will prevent the mouse from switching screens.
-
-### Contact & support
-
-Please be aware that the *only* way to draw our attention to a bug is to create a new issue in [the issue tracker](https://github.com/debauchee/barrier/issues). 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 LiberaChat 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.
-
-Most pull requests will need to include a release note.
-See docs/newsfragments/README.md for documentation of how to do that.
-
-## Distro specific packages
-
-While not a comprehensive list, repology provides a decent list of distro
-specific packages.
-
-[![Packaging status](https://repology.org/badge/vertical-allrepos/barrier.svg)](https://repology.org/project/barrier/versions)
-
-## FAQ - Frequently Asked Questions
-
-**Q: Does drag and drop work on linux?**
-
-> A: No *(see [#855](https://github.com/debauchee/barrier/issues/855) if you'd like to change that)*
-
-
-**Q: What OSes are supported?**
-
-> A: The [most recent release](https://github.com/debauchee/barrier/releases/latest) of Barrier is known to work on:
->  - Windows 7, 8, 8.1, 10, and 11
->  - macOS *(previously known as OS X or Mac OS X)*  
->    - _The current GUI does **not** work on OS versions prior to macOS 10.12 Sierra (but see the related answer below)_
->  - Linux
->  - FreeBSD
->  - OpenBSD
-
-
-**Q: Are 32-bit versions of Windows supported?**
-
-> A: No
-
-
-__Q: Is it possible to use Barrier on Mac OS X / OS X versions prior to 10.12?__
-
-> A: Not officially.
->   - For OS X 10.10 Yosemite and later:
->     - [Barrier v2.1.0](https://github.com/debauchee/barrier/releases/tag/v2.1.0) or earlier _may_ work.
->   - For Mac OS X 10.9 Mavericks _(and perhaps earlier)_:
->     1. the command-line portions of the [current release](https://github.com/debauchee/barrier/releases/latest) _should_ run fine.
->     2. The GUI will _not_ run, as that OS version does not include Apple's *Metal* framework.
->         - _(For a GUI workaround for Mac OS X 10.9, see the [discussion at issue #544](https://github.com/debauchee/barrier/issues/544))_
-
-> Note: Only versions [v2.3.4](https://github.com/debauchee/barrier/releases/tag/v2.3.4) and [later](https://github.com/debauchee/barrier/releases/latest) of Barrier can be supported by this project.
->  - Anyone using an earlier version is advised to upgrade due to recently-addressed security vulnerabilities *(and other bug fixes)*. 
->    - This is especially important for computers accessible from the public Internet *(or from other shared/untrusted networks, such as when using shared WiFi)*.
-
-
-**Q: How do I load my configuration on startup?**
-
-> A: Start the binary with the argument `--config <path_to_saved_configuration>`
-
-
-**Q: After loading my configuration on the client the field 'Server IP' is still empty!**
-
-> A: Edit your configuration to include the server's ip address manually with
-> 
->```
->(...)
->
->section: options
->    serverhostname=<AAA.BBB.CCC.DDD>
->```
-
-**Q: Are there any other significant limitations with the current version of Barrier?**
-
-> A: Currently:
->    - Barrier currently has limited UTF-8 support; issues have been reported with processing various languages.
->      - *(see [#860](https://github.com/debauchee/barrier/issues/860))*
->    - There is interest in future support for the Wayland compositor/display server protocol *([official site](https://wayland.freedesktop.org/) | [Wikipedia article](https://en.wikipedia.org/wiki/Wayland_(display_server_protocol)))* on Linux.
->      - As of late 2021, there is no expected completion date for *Wayland* support.
->      - *(see [#109](https://github.com/debauchee/barrier/issues/109) and [#1251](https://github.com/debauchee/barrier/issues/1251) for status or to volunteer your talents)*
->
-> The complete list of open issues can be found in the ['Issues' tab on GitHub](https://github.com/debauchee/barrier/issues?q=is%3Aissue+is%3Aopen). Help is always appreciated.
+* [Getting Started](https://github.com/symless/synergy-core/wiki/Getting-Started) - How to checkout the code from git and use the right branch.
+* [Compiling](https://github.com/symless/synergy-core/wiki/Compiling) - Instructions on how to compile Synergy Core from source.
+* [Text Config](https://github.com/symless/synergy-core/wiki/Text-Config) - Write a text config file when running Synergy Core manually.
+* [Command Line](https://github.com/symless/synergy-core/wiki/Command-Line) - Go full manual and run Synergy Core from the command line.

RELEASING.md

@@ -1,76 +0,0 @@
-Creating a release
-==================
-
-This document is documentation intednded for maintainers of Barrier.
-It documents the release process of Barrier.
-
-Step 1: Setup environment variables
------------------------------------
-
-Setup the following environment variable that will be used throughout the rest of the steps.
-
-    export VERSION=X.Y.Z
-
-Step 2: Release notes PR
-------------------------
-
-Open a new branch (e.g. `release`) and run the following:
-
-    towncrier --version ${VERSION} --date `date -u  +%F`
-
-This collects the release notes using the `towncrier` tool. Please commit the collected release
-notes afterwards.
-
-Certain file names are not properly supported by the `towncrier` tool and it ignores them.
-Check `newsfragments` directory for any forgotten release notes
-
-Step 3: Merge the release notes PR
-----------------------------------
-
-Step 4: Bump the version number
--------------------------------
-
-Pull the merge commit created on the `master` branch during the step 2.
-
-Edit the following files and update the version numbers:
-
- - `Build.properties`
- - `cmake/Version.cmake`
- - `doc/barrierc.1`
- - `doc/barriers.1`
- - `.github/ISSUE_TEMPLATE/bug_report.yml`
-
-Commit to the release branch with the following message `Barrier x.y.z`.
-
-Push the commit:
-
-    git push origin master
-
-Step 5: Push git tag
---------------------
-
-Create a tag:
-
-    git tag -s v${VERSION} -m v${VERSION}
-
-Push the tag:
-
-    git push origin master --tags
-
-
-Step 6: Draft a new release on Github
--------------------------------------
-
-Go to https://github.com/buildbot/buildbot/releases and draft a new release.
-
-Use git tag as the title of the release: `vX.Y.Z`.
-
-Use the release notes generated by the `towncrier` tool as the description of the releases.
-
-Upload the artifacts created by Azure pipelines as the binaries of the release. The following
-artifacts should be uploaded to Github:
-
- - the Barrier-X.Y.Z-release.dmg created by the newest Mac OS task (artifact name is
-   "Mac Release Disk Image and App XYZ").
-
- - the BarrierSetup-X.Y.Z-release.exe (artifact name is Windows Release Installer).

_config.yml

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

azure-pipelines.yml

@@ -1,117 +0,0 @@
-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
-  strategy:
-    matrix:
-      ubuntu-18.04:
-        imageName: 'ubuntu-18.04'
-      ubuntu-20.04:
-        imageName: 'ubuntu-20.04'
-  displayName: Linux Build
-  pool:
-    vmImage: $(imageName)
-  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
-  strategy:
-    matrix:
-      big-sur-Release:
-          imageName: "macOS-11"
-          B_BUILD_TYPE: Release
-          BARRIER_VERSION_STAGE: Release
-      catalina-Release:
-          imageName: "macOS-10.15"
-          B_BUILD_TYPE: Release
-          BARRIER_VERSION_STAGE: Release
-      mojave-Release:
-          imageName: "macOS-10.14"
-          B_BUILD_TYPE: Release
-          BARRIER_VERSION_STAGE: Release
-  pool:
-    vmImage: $(imageName)
-  variables:
-    VERBOSE: 1
-    TERM: xterm-256color
-  steps:
-    - script: rm -rf /usr/local/opt/openssl
-      displayName: Remove incompatible OpenSSL 1.0.2t from macOS-10.14 vmImage
-    - script: brew reinstall openssl
-      displayName: Installed newer OpenSSL 1.1.x
-    - script: brew install pkg-config qt5
-      displayName: Install Qt5 and pkg-config prereqs
-    - 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 $(imageName)

azure-pipelines/build_env_tmpl.bat

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

azure-pipelines/download_install_bonjour_sdk_like.ps1

@@ -1,11 +0,0 @@
-$ErrorActionPreference = "Stop"
-
-New-Item -Force -ItemType Directory -Path ".\deps\"
-Invoke-WebRequest 'https://github.com/nelsonjchen/mDNSResponder/releases/download/v2019.05.08.1/x64_RelWithDebInfo.zip' -OutFile '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

@@ -1,25 +0,0 @@
-$ErrorActionPreference = "Stop"
-
-$qli_install_version = '2019.05.26.1'
-$qt_version = '5.13.0'
-
-New-Item -Force -ItemType Directory -Path ".\deps\"
-
-Write-Output 'Downloading QLI Installer'
-Invoke-WebRequest "https://github.com/nelsonjchen/qli-installer/archive/v$qli_install_version.zip" -OutFile '.\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 = "https://download.qt.io/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,34 +0,0 @@
-@echo off
-set INNO_ROOT=C:\Program Files (x86)\Inno Setup 5
-
-set savedir=%cd%
-cd /d %~dp0
-
-if not exist build\bin\Release goto buildproject
-
-echo Building 64-bit Windows installer...
-
-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 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
-goto done
-
-:failed
-echo Build failed
-
-:done
-set INNO_ROOT=
-
-cd /d %savedir%
-set savedir=

clean_build.bat

@@ -1,91 +0,0 @@
-@echo off
-
-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.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
-set BONJOUR_SDK_HOME=%B_BONJOUR%
-
-REM full path to Qt stuff we need
-set B_QT_FULLPATH=%B_QT_ROOT%\%B_QT_VER%\%B_QT_MSVC%
-
-echo Bonjour: %BONJOUR_SDK_HOME%
-echo Qt: %B_QT_FULLPATH%
-
-git submodule update --init --recursive
-
-rmdir /q /s build
-mkdir build
-if ERRORLEVEL 1 goto failed
-cd build
-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
-cmake --build . --config %B_BUILD_TYPE%
-if ERRORLEVEL 1 goto failed
-if exist bin\Debug (
-    copy %B_QT_FULLPATH%\bin\Qt5Cored.dll bin\Debug\ > NUL
-    copy %B_QT_FULLPATH%\bin\Qt5Guid.dll bin\Debug\ > NUL
-    copy %B_QT_FULLPATH%\bin\Qt5Networkd.dll bin\Debug\ > NUL
-    copy %B_QT_FULLPATH%\bin\Qt5Widgetsd.dll bin\Debug\ > NUL
-    copy %B_QT_FULLPATH%\bin\Qt5Cored.dll bin\Debug\ > NUL
-    copy ..\ext\openssl\windows\x64\bin\* bin\Debug\ > NUL
-    copy ..\res\openssl\barrier.conf bin\Debug\ > NUL
-    mkdir bin\Debug\platforms
-    copy %B_QT_FULLPATH%\plugins\platforms\qwindowsd.dll bin\Debug\platforms\ > NUL
-) else if exist bin\Release (
-    copy %B_QT_FULLPATH%\bin\Qt5Core.dll bin\Release\ > NUL
-    copy %B_QT_FULLPATH%\bin\Qt5Gui.dll bin\Release\ > NUL
-    copy %B_QT_FULLPATH%\bin\Qt5Network.dll bin\Release\ > NUL
-    copy %B_QT_FULLPATH%\bin\Qt5Widgets.dll bin\Release\ > NUL
-    copy %B_QT_FULLPATH%\bin\Qt5Core.dll bin\Release\ > NUL
-    copy ..\ext\openssl\windows\x64\bin\* bin\Release\ > NUL
-    copy ..\res\openssl\barrier.conf bin\Release\ > NUL
-    mkdir bin\Release\platforms
-    copy %B_QT_FULLPATH%\plugins\platforms\qwindows.dll bin\Release\platforms\ > NUL
-) else (
-    echo Remember to copy supporting binaries and configuration files!
-)
-
-echo Build completed successfully
-set BUILD_FAILED=0
-goto done
-
-:failed
-set BUILD_FAILED=%ERRORLEVEL%
-echo Build failed
-
-:done
-cd /d %savedir%
-
-set B_BUILD_TYPE=
-set B_QT_ROOT=
-set B_QT_VER=
-set B_QT_MSVC=
-set B_BONJOUR=
-set BONJOUR_SDK_HOME=
-set B_QT_FULLPATH=
-set savedir=
-set cmake_gen=
-
-EXIT /B %BUILD_FAILED%

clean_build.sh

@@ -1,32 +0,0 @@
-#!/bin/sh
-cd "$(dirname "$0")" || exit 1
-# some environments have cmake v2 as 'cmake' and v3 as 'cmake3'
-# check for cmake3 first then fallback to just cmake
-B_CMAKE=`type cmake3 2>/dev/null`
-if [ $? -eq 0 ]; then
-    B_CMAKE=`echo "$B_CMAKE" | cut -d' ' -f3`
-else
-    B_CMAKE=cmake
-fi
-# default build configuration
-B_BUILD_TYPE=${B_BUILD_TYPE:-Debug}
-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=$(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
-
-# Initialise Git submodules
-git submodule update --init --recursive
-
-B_CMAKE_FLAGS="-DCMAKE_BUILD_TYPE=$B_BUILD_TYPE $B_CMAKE_FLAGS"
-rm -rf build
-mkdir build || exit 1
-cd build || exit 1
-echo "Starting Barrier $B_BUILD_TYPE build..."
-$B_CMAKE $B_CMAKE_FLAGS .. || exit 1
-make || exit 1
-echo "Build completed successfully"

cmake/Package.cmake

@@ -1,9 +0,0 @@
-if (UNIX)
-    set (CPACK_PACKAGE_VERSION_MAJOR ${BARRIER_VERSION_MAJOR})
-    set (CPACK_PACKAGE_VERSION_MINOR ${BARRIER_VERSION_MINOR})
-    set (CPACK_PACKAGE_VERSION_PATCH ${BARRIER_VERSION_PATCH})
-    set (CPACK_GENERATOR "TBZ2")
-    set (CPACK_SOURCE_GENERATOR "TXZ")
-    set (CPACK_SOURCE_IGNORE_FILES "/build/;\.gitignore$;/\.git/;/.github/;\.swp$;build_env\.*")
-    include (CPack)
-endif()

cmake/Version.cmake

@@ -1,98 +1,86 @@
 cmake_minimum_required (VERSION 3.4)
 
-set (BARRIER_VERSION_MAJOR 2)
-set (BARRIER_VERSION_MINOR 4)
-set (BARRIER_VERSION_PATCH 0)
-set (BARRIER_VERSION_STAGE "release")
+#
+# Synergy Version
+#
+
+set (SYNERGY_VERSION_MAJOR 1)
+set (SYNERGY_VERSION_MINOR 11)
+set (SYNERGY_VERSION_PATCH 0)
+set (SYNERGY_VERSION_STAGE "rc2")
 
 #
-# Barrier Version
+# Version from CI
 #
-if (NOT DEFINED BARRIER_VERSION_MAJOR)
-    if (DEFINED ENV{BARRIER_VERSION_MAJOR})
-        set (BARRIER_VERSION_MAJOR $ENV{BARRIER_VERSION_MAJOR})
-    else()
-        set (BARRIER_VERSION_MAJOR 2)
-    endif()
+
+if (DEFINED ENV{SYNERGY_VERSION_MAJOR})
+    set (SYNERGY_VERSION_MAJOR $ENV{SYNERGY_VERSION_MAJOR})
 endif()
 
-if (NOT DEFINED BARRIER_VERSION_MINOR)
-    if (DEFINED ENV{BARRIER_VERSION_MINOR})
-        set (BARRIER_VERSION_MINOR $ENV{BARRIER_VERSION_MINOR})
-    else()
-        set (BARRIER_VERSION_MINOR 3)
-    endif()
+if (DEFINED ENV{SYNERGY_VERSION_MINOR})
+    set (SYNERGY_VERSION_MINOR $ENV{SYNERGY_VERSION_MINOR})
 endif()
 
-if (NOT DEFINED BARRIER_VERSION_PATCH)
-    if (DEFINED ENV{BARRIER_VERSION_PATCH})
-        set (BARRIER_VERSION_PATCH $ENV{BARRIER_VERSION_PATCH})
-    else()
-        set (BARRIER_VERSION_PATCH 2)
-        message (WARNING "Barrier version wasn't set. Set to ${BARRIER_VERSION_MAJOR}.${BARRIER_VERSION_MINOR}.${BARRIER_VERSION_PATCH}")
-    endif()
+if (DEFINED ENV{SYNERGY_VERSION_PATCH})
+    set (SYNERGY_VERSION_PATCH $ENV{SYNERGY_VERSION_PATCH})
 endif()
 
-if (NOT DEFINED BARRIER_VERSION_STAGE)
-    if (DEFINED ENV{BARRIER_VERSION_STAGE})
-        set (BARRIER_VERSION_STAGE $ENV{BARRIER_VERSION_STAGE})
-    else()
-        set (BARRIER_VERSION_STAGE "snapshot")
-    endif()
+if (DEFINED ENV{SYNERGY_VERSION_STAGE})
+    set (SYNERGY_VERSION_STAGE $ENV{SYNERGY_VERSION_STAGE})
 endif()
 
-if (NOT DEFINED BARRIER_REVISION)
+if (NOT DEFINED SYNERGY_REVISION)
     if (DEFINED ENV{GIT_COMMIT})
-        string (SUBSTRING $ENV{GIT_COMMIT} 0 8 BARRIER_REVISION)
-    else()
-        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()
+        string (SUBSTRING $ENV{GIT_COMMIT} 0 8 SYNERGY_REVISION)
+    elseif (SYNERGY_VERSION_STAGE STREQUAL "snapshot")
+        execute_process (
+            COMMAND git rev-parse --short=8 HEAD
+            WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+            OUTPUT_VARIABLE SYNERGY_REVISION
+            OUTPUT_STRIP_TRAILING_WHITESPACE
+        )
     endif()
 endif()
 
-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}")
+if (DEFINED SYNERGY_REVISION)
+    string(LENGTH ${SYNERGY_REVISION} SYNERGY_REVISION_LENGTH)
+    if (NOT ((SYNERGY_REVISION MATCHES "^[a-f0-9]+") AND (SYNERGY_REVISION_LENGTH EQUAL "8")))
+        message (FATAL_ERROR "SYNERGY_REVISION ('${SYNERGY_REVISION}') should be a short commit hash")
+    endif()
+    unset (SYNERGY_REVISION_LENGTH)
+else()
+	set (SYNERGY_REVISION "0badc0de")
 endif()
-unset (BARRIER_REVISION_LENGTH)
 
 if (DEFINED ENV{BUILD_NUMBER})
-    set (BARRIER_BUILD_NUMBER $ENV{BUILD_NUMBER})
+    set (SYNERGY_BUILD_NUMBER $ENV{BUILD_NUMBER})
 else()
-    set (BARRIER_BUILD_NUMBER 1)
+    set (SYNERGY_BUILD_NUMBER 1)
 endif()
 
-string (TIMESTAMP BARRIER_BUILD_DATE "%Y%m%d" UTC)
-set (BARRIER_SNAPSHOT_INFO ".${BARRIER_VERSION_STAGE}.${BARRIER_REVISION}")
+string (TIMESTAMP SYNERGY_BUILD_DATE "%Y%m%d" UTC)
+set (SYNERGY_SNAPSHOT_INFO ".${SYNERGY_VERSION_STAGE}.${SYNERGY_REVISION}")
 
-if (BARRIER_VERSION_STAGE STREQUAL "snapshot")
-    set (BARRIER_VERSION_TAG "${BARRIER_VERSION_STAGE}.b${BARRIER_BUILD_NUMBER}-${BARRIER_REVISION}")
+if (SYNERGY_VERSION_STAGE STREQUAL "snapshot")
+    set (SYNERGY_VERSION_TAG "${SYNERGY_VERSION_STAGE}.b${SYNERGY_BUILD_NUMBER}-${SYNERGY_REVISION}")
 else()
-    set (BARRIER_VERSION_TAG "${BARRIER_VERSION_STAGE}")
+    set (SYNERGY_VERSION_TAG "${SYNERGY_VERSION_STAGE}")
 endif()
 
-set (BARRIER_VERSION "${BARRIER_VERSION_MAJOR}.${BARRIER_VERSION_MINOR}.${BARRIER_VERSION_PATCH}-${BARRIER_VERSION_STAGE}")
-set (BARRIER_VERSION_STRING "${BARRIER_VERSION}-${BARRIER_VERSION_TAG}")
-message (STATUS "Full Barrier version string is '" ${BARRIER_VERSION_STRING} "'")
+set (SYNERGY_VERSION "${SYNERGY_VERSION_MAJOR}.${SYNERGY_VERSION_MINOR}.${SYNERGY_VERSION_PATCH}")
+set (SYNERGY_VERSION_STRING "${SYNERGY_VERSION}-${SYNERGY_VERSION_TAG}")
+message (STATUS "Full Synergy version string is '" ${SYNERGY_VERSION_STRING} "'")
 
-add_definitions (-DBARRIER_VERSION="${BARRIER_VERSION}")
-add_definitions (-DBARRIER_VERSION_STRING="${BARRIER_VERSION_STRING}")
-add_definitions (-DBARRIER_VERSION_MAJOR=${BARRIER_VERSION_MAJOR})
-add_definitions (-DBARRIER_VERSION_MINOR=${BARRIER_VERSION_MINOR})
-add_definitions (-DBARRIER_VERSION_PATCH=${BARRIER_VERSION_PATCH})
-add_definitions (-DBARRIER_REVISION="${BARRIER_REVISION}")
-add_definitions (-DBARRIER_BUILD_DATE="${BARRIER_BUILD_DATE}")
-add_definitions (-DBARRIER_BUILD_NUMBER=${BARRIER_BUILD_NUMBER})
+add_definitions (-DSYNERGY_VERSION="${SYNERGY_VERSION}")
+add_definitions (-DSYNERGY_VERSION_STRING="${SYNERGY_VERSION_STRING}")
+add_definitions (-DSYNERGY_REVISION="${SYNERGY_REVISION}")
+add_definitions (-DSYNERGY_BUILD_DATE="${SYNERGY_BUILD_DATE}")
+add_definitions (-DSYNERGY_BUILD_NUMBER=${SYNERGY_BUILD_NUMBER})
 
-if (BARRIER_DEVELOPER_MODE)
-    add_definitions (-DBARRIER_DEVELOPER_MODE=1)
+if (SYNERGY_DEVELOPER_MODE)
+    add_definitions (-DSYNERGY_DEVELOPER_MODE=1)
 endif()
 
+if (SYNERGY_ENTERPRISE)
+    add_definitions (-DSYNERGY_ENTERPRISE=1)
+endif()

cmake/gtest.cmake

@@ -1,44 +0,0 @@
-# barrier -- mouse and keyboard sharing utility
-# Copyright (C) 2012-2016 Symless Ltd.
-# Copyright (C) 2011 Nick Bolton
-#
-# 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/>.
-
-if (BARRIER_USE_EXTERNAL_GTEST)
-    include (FindPkgConfig)
-    find_package(GTest REQUIRED)
-    pkg_check_modules(GMOCK REQUIRED gmock)
-    include_directories(
-        ${GTEST_INCLUDE_DIRS}
-        ${GMOCK_INCLUDE_DIRS}
-    )
-else()
-    include_directories(
-        ../ext/gtest
-        ../ext/gtest/include
-        ../ext/gmock
-        ../ext/gmock/include
-    )
-
-    add_library(gtest STATIC ../ext/gtest/src/gtest-all.cc)
-    add_library(gmock STATIC ../ext/gmock/src/gmock-all.cc)
-
-    set(GTEST_LIBRARIES gtest)
-    set(GMOCK_LIBRARIES gmock)
-
-    if (UNIX)
-        # ignore warnings in gtest and gmock
-        set_target_properties(gtest PROPERTIES COMPILE_FLAGS "-w")
-        set_target_properties(gmock PROPERTIES COMPILE_FLAGS "-w")
-    endif()
-endif()

debian/changelog

@@ -1,412 +0,0 @@
-barrier (2.3.3) UNRELEASED; urgency=medium
-
-  [ Aaron Bieber ]
-  * tell build system about openbsd
-
-  [ Tetja Rediske ]
-  * make non-gui variants build without avahi
-
-  [ Erik Nordstrøm ]
-  * Replace hard-coded names of build directory in build_installer.sh script for macOS with looking at the location of the script by the script itself when it is run. This makes it possible to have differently named build dirs for debug and release builds, and without restricting what each of those directories must be named.
-  * Remove shell script that changes directory and then executes barrier on macOS, and execute barrier directly instead.
-  * Add settings in the Info.plist file that enable high-DPI support on macOS.
-
-  [ Daniel Seither ]
-  * Remove unused variables
-  * IpcLogOutputter: Put member initializers in execution order
-  * OSXDragView: Get rid of uninitialized variable warning
-  * Add override specifiers
-  * Let tray image blend into macOS menu bar
-
-  [ Vasily Galkin ]
-  * Man page: fix incorrect name of user conf file in barriers.1
-
-  [ Keegan Quinn ]
-  * Cast values to fix build errors on OS X 10.11.
-
-  [ Maximiliano Bertacchini ]
-  * Update readme with mention of the snap package.
-
-  [ Javier Candeira ]
-  * Fix #503 - Clarify on README how to report issues
-
-  [ Micael Jarniac ]
-  * Build status badges added to a table
-
-  [ Maximiliano Bertacchini ]
-  * Add build-essential to the snap's build deps.
-  * Explicitly disable wayland support in the snap.
-  * Add comment on snap env var
-
-  [ Vasily Galkin ]
-  * Fix infinite loop on fast TCP disconnection
-
-  [ Dom Rodriguez ]
-  * README: Add OpenBSD to list of supported OSes
-
-  [ Åke Engelbrektson ]
-  * Update gui_sv.ts
-
-  [ the-wes ]
-  * Add more detailed description of what Barrier does
-
-  [ James Le Cuirot ]
-  * Use -pthread flag and simplify pthread build logic
-  * Only require Qt5 when building the GUI
-
-  [ Tomáš Chvátal ]
-  * Fix desktop file Categories to match standard
-
-  [ Chris Simons ]
-  * Add script that uses macdeployqt instead of `reref_dylibs.sh` shell script to create the `.app` bundle
-  * Use `build_dist.sh` in CMake instead of `build_installer.sh` Have CMake always build a bundle, the `build_dist.sh` script will only build a dmg if the build type is "Release"
-  * Add warnings for users manually running `build_installer.sh` and `reref_dylibs.sh` manually
-  * Homebrew (Ruby) throws an error when it gets `SIGPIPE` from the `--max-count` on `grep`.
-  * added barrierc and barriers to macdeployqt targets
-  * Change MacOS Build Steps
-  * Fix TIS/TSM in logs
-  * Elevate XSocketAddressInUse to ERROR
-  * Allow selecting Fingerprint Qlabel
-  * replace tabs with spaces
-  * Change log level on several status messages (Fixes #652, Fixes #516)
-
-  [ Ben Plessinger ]
-  * A few more log cleanups
-
-  [ Vasily Galkin ]
-  * Remove unused IEventQueue::isEmpty() method to simplify code understanding
-
-  [ Povilas Kanapickas ]
-  * XWindowsEventQueueBuffer: Fix delays when waiting for new events
-
-  [ Jonathan Martens ]
-  * Fix Auto config missing hostname prompt #704
-
-  [ Vasily Galkin ]
-  * Windows 8+: make waiting for messages correspond to emptiness check
-
-  [ Povilas Kanapickas ]
-  * gui: Use enum class to scope enum values
-  * lib/client: Use std::string directly instead of String typedef
-  * lib/arch: Use std::string directly instead of String typedef
-  * lib/net: Use std::string directly instead of String typedef
-  * lib/server: Use std::string directly instead of String typedef
-  * lib/base: Use std::string directly instead of String typedef
-  * lib/ipc: Use std::string directly instead of String typedef
-  * lib/net: Add missing include
-  * lib/platform: Use std::string directly instead of String typedef
-  * test: Enable building of tests
-  * test: Reduce the number of implicit include directories
-  * test: Remove unresolved merge conflict markers
-  * test: Fix referenced library name
-  * test: Update to new APIs
-  * tests: Fix crash in XWindowsKeyStateTests
-  * test: Fix undefined behavior of deleting incomplete type
-  * tests: Disable test that depends on external state
-  * Use noexcept instead of exception specifications
-  * lib/common: Remove no longer used stdexcept.h
-
-  [ Jonathan Martens ]
-  * Make connection message a NOTE for consistency
-
-  [ zhexiwang ]
-  * Added toggleScreen function, using hot key to loop through all screens. Comparing to switchToScreen, it is more handy since the user only need to hit one hotkey.
-
-  [ GeorgH93 ]
-  * Fix build on Windows
-  * Keep errorlevel
-
-  [ Povilas Kanapickas ]
-  * Revert "Make connection message a NOTE for consistency"
-
-  [ Chris Simons ]
-  * add comments explaining the use of CLOG_PRINT
-
-  [ Dom Rodriguez ]
-  * Remove ext/gtest, ext/gmock to replace with Git submodule
-  * Add gtest/gmock framework, locked at 1.6.0
-  * Fix CI infrastructure (.bat/.sh) to initialise Git submodules before build
-
-  [ Maximiliano Bertacchini ]
-  * Fix snap build failing to initialize submodules.
-
-  [ Niklas Hambüchen ]
-  * ui: Settings: Explain what "double tap" means
-
-  [ Dom Rodriguez ]
-  * Prepare for v2.3.3 release
-
-  [ Maximiliano Bertacchini ]
-  * Shorten snap version on tagged revisions
-
-  [ Tomoya Tanjo ]
-  * Add Eisu_toggle and Muhenkan keys
-
-  [ Michael Zimmermann ]
-  * add support for keyboard backlight media keys
-
-  [ Dom Rodriguez ]
-  * [Build]: Bump Build.properties
-
- -- root <root@873b8d543aab>  Fri, 07 Aug 2020 16:25:54 +0000
-
-barrier (2.3.2) disco; urgency=medium
-
-  [ walker0643 ]
-  * remove (wrong) version line from .desktop file
-
-  [ Povilas Kanapickas ]
-  * Improve precision of grabbed scroll events on OSX server
-  * Accumulate scrolls less than supported scroll on XWindows
-  * Add fake changelog so that debian package may be built
-
-  [ walker0643 ]
-  * non-GUI build should not require bonjour headers
-  * add patch from Gentoo packager to fix cmake issue (reported on Arch, too). ref #49
-  * fix email in debian changelog
-  * screen settings dialog handles internationalized default name better (ref #71)
-  * rephrase language in README.md
-
-  [ sidneys ]
-  * fix(macos-build): use standard methods for detecting default XCode installation and default macOS platform SDK
-
-  [ Povilas Kanapickas ]
-  * OSX: Add support for building on macports
-  * OSX: Prefer Macports over Homebrew if available
-  * travis: Rewrite the CI config to use platform matrix
-  * travis: Add macports-based OSX script
-  * travis: Add homebrew-based OSX script
-
-  [ Adrian Lucrèce Céleste ]
-  * [Travis] use container builds for linux (#85)
-  * Merge pkgconfig branch into master (#86)
-
-  [ walker0643 ]
-  * fix formatting in last merge
-
-  [ coypu ]
-  * Also add curl include directories.
-  * have all other OSes handled in the else case.
-  * Use ${CMAKE_DL_LIBS} rather than listing OSes.
-
-  [ walker0643 ]
-  * bump version to 2.2
-  * bump qt/vs versions on windows
-
-  [ Pawel Bogut ]
-  * Fix config file name in server help message
-
-  [ Josh Stone ]
-  * Fix data indexes in Unicode::fromUTF8
-
-  [ walker0643 ]
-  * bump ssl cert key size up to 2048 from 1024. fixes #126
-  * enable high-dps awareness for barriers/barrierc. fixes screen geometry calculations for screens with >100% scaling
-  * rename field Interface to Address in GUI settings dialog
-  * add firewall rule for default port on installation (windows)
-  * Update README.md
-
-  [ Epakai ]
-  * Update openssl key size in barrier.conf (#150)
-
-  [ Adrian Lucrèce Céleste ]
-  * add pre-build script for building barrier on windows from SSH (#152)
-
-  [ Christopher N. Hesse ]
-  * gui: Fix auto hide behavior (#140)
-
-  [ Povilas Kanapickas ]
-  * Build full installer via clean_build.sh (#157)
-  * OSX: Explain why the app needs to go into /Applications (#158)
-
-  [ Monika Kairaityte ]
-  * x11: Wrap platform functions in an interface that can be mocked later
-  * x11: Wrap platform functions in XWindowsScreenSaver class
-  * x11: Wrap platform functions in XWindowsClipboard class
-  * x11: Wrap platform functions in XWindowsKeyState class
-  * x11: Wrap platform functions in XWindowsEventQueueBuffer class
-  * Fix tests wrapper
-
-  [ Chris Simons ]
-  * Added preserveFocus fix (#178)
-
-  [ Dayne Broderson ]
-  * add debug notes to help identify where trusted fingerprints file is
-  * fix spelling of matches
-  * fixing style to be consistent per @p12tic
-
-  [ Robert Sandell ]
-  * Spelling correction (#209)
-
-  [ Moron ]
-  * Fix #204 modifier keys not working in remote desktop on MacOS
-
-  [ jwestfall ]
-  * Properly deal with a socket that is readable and writable at the same time
-
-  [ Miroslav Lences ]
-  * Fix macos build issues
-
-  [ Jim Westfall ]
-  * Fix OSX builds for macports
-
-  [ Girts Folkmanis ]
-  * add checks to osx_environment.sh
-
-  [ Thomas A. F. Thorne ]
-  * Reduce Sysmtem Tray Retry Attempts
-  * Do Not Warn About Missing System Tray
-
-  [ jwestfall ]
-  * OSX: let build_installer.sh create a working Barrier.app on debug builds
-
-  [ Szymon Szeląg ]
-  * Screen change script argument
-  * Use std::system
-  * Start script via execl
-  * Fire screen switch event on client disconnect
-
-  [ Povilas Kanapickas ]
-  * Fix memory leak during socket shutdown
-
-  [ PayouZon MagIT ]
-  * Update snapcraft.yaml
-  * Update snapcraft.yaml
-  * Barrier Snappy
-
-  [ Wendall Cada ]
-  * Working spec file for Fedora
-
-  [ noisyshape ]
-  * Update Windows build script for VS2019
-  * Add support for multiple VS versions
-  * Normalize cmake generator strings
-  * Correct path and instructions
-  * Create version number for wix
-  * Remove hardcoded paths
-  * Fix XML
-
-  [ Mike Salvatore ]
-  * Fix #278 "Enable Clipboard Sharing" always reset after restart
-  * Rename the "Apply" button to "Reload"
-
-  [ noisyshape ]
-  * Replace Wix with Inno Setup
-
-  [ Matthijs Wensveen ]
-  * Add dpiAwareness: PerMonitor to manifest to better handle multiple monitors with different DPI settings.
-
-  [ Nelson Chen ]
-  * Initial Azure Pipelines
-
-  [ Adrian Lucrèce Céleste ]
-  * :pencil: add release link and contact info
-
-  [ pack ]
-  * typo fix (#311)
-
-  [ Nelson Chen ]
-  * Update Apt on Linux before installing dependencies on Azure Pipelines (#321)
-  * Prefix Windows artifact names with 'Windows' on Azure Pipelines (#319)
-  * Install Pinned Qt and OpenSSL on Mac
-  * Build Release version of Barrier on Mac
-  * Publish Mac Artifacts
-  * Upgrade QLI Installer and use Cal's Qt Mirror
-
-  [ Adrian Lucrèce Céleste ]
-  * fix #163
-  * Add a quick Q/A about what OSes are supported
-  * Add Q/A about 32-bit windows
-
-  [ Chun Wang ]
-  * Fix #232 MACOS serious config file errors - hotkeys totally broken
-
-  [ Adrian Lucrèce Céleste ]
-  * [README] Add FaQ to the bottom
-  * [Release] Bump up to a new release version
-  * [Cmake] bump version to 2.3.0
-
-  [ Nelson Chen ]
-  * Ensure Inno Setup 5 is installed in Azure Pipelines
-
-  [ Patrizio Tufarolo ]
-  * Fixed quote key on US International keyboard
-
-  [ Maximiliano Bertacchini ]
-  * Use version from git tag.
-  * Fix interface plugs.
-  * Add commands: `barrier`, `barrierc`, `barriers`.
-  * Drop custom qt5, use distro provided one.
-  * Update build-packages and stage-packages.
-  * Add desktop entry with an app icon.
-  * Set snap icon and license.
-  * Use appstream metadata from flathub.
-  * Fix snap version-control script for local lxd builds.
-
-  [ Dom Rodriguez ]
-  * Feature: CMake now generates compile_commands.json
-
-  [ Thomas Thorne ]
-  * Reference Only Microsoft Azue Pipelines In Readme.md
-  * Delete .travis.yml As We Switch To Azure Pipelines
-
-  [ Evan Maddock ]
-  * Reimplement patch for horizontal scrolling and extra mouse buttons
-  * Used the wrong key button by accident
-  * Use Windows helper function to check for Windows version
-
-  [ walker0643 ]
-  * Drop Travis CI
-
-  [ Adrian Lucrèce Céleste ]
-  * [Version] bump to 2.3.1 for new release
-
-  [ Povilas Kanapickas ]
-  * Make ownership of SocketMultiplexer explicit
-  * Make ownership of SocketMultiplexerJob explicit
-  * Use std::mutex instead of ArchMutex in ArchMultithreadPosix
-  * Use std::mutex instead of ArchMutex in EventQueue
-  * Use std::mutex instead of ArchMutex in Log
-  * Use std::mutex instead of ArchMutex in IpcServer
-  * Use std::mutex instead of ArchMutex in IpcClientProxy
-  * Use std::mutex instead of ArchMutex in IpcLogOutputter
-  * Fix race condition in IArchString
-
-  [ Adrian Lucrèce Céleste ]
-  * [Build[ update pre-build script to call VS2019
-
-  [ Dom Rodriguez ]
-  * Snap: Change CMake builds to be of Release type
-  * Fix: CMake now checks for required Qt5 libraries
-  * Tidy up and fix lint errors in build scripts
-  * Interim fix for failed macOS builds
-
-  [ Povilas Kanapickas ]
-  * Fix retry timer not being unregistered properly
-
-  [ Maximiliano Bertacchini ]
-  * Rename the snap as `barrier`.
-
-  [ Adrian Lucrèce Céleste ]
-  * Revert "Tidy up and fix lint errors in build scripts"
-  * [CMake] properly declare FPIC
-  * [Azure Pipelines] use QT 5.13.0 (#418)
-  * Add snap build status
-  * [README] update README with info about packages
-
-  [ Casey Barton ]
-  * Merged mouse drift fix from synergy-core
-
-  [ mirh ]
-  * Fix debug build launch
-
-  [ Adrian Lucrèce Céleste ]
-  * [Version] bump to 2.3.2, stable
-
- -- Pablo Catalina <pablo.catalina@gmail.com>  Wed, 09 Oct 2019 12:52:10 +0200
-
-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

debian/control

@@ -1,17 +1,17 @@
-Source: barrier
+Source: synergy
 Section: utils
 Priority: optional
 Standards-Version: 3.9.7
-Homepage: https://github.com/debauchee/barrier/
-Maintainer: Debauchee Open Source Group <todo@mail.com>
+Homepage: https://www.symless.com/
+Maintainer: Symless <engineering@symless.com>
 
-Package: barrier
-Architecture: amd64
+Package: synergy
+Architecture: any
 Section: utils
 Priority: optional
 Depends: ${shlibs:Depends},
          ${misc:Depends}
 Description: Keyboard and mouse sharing solution
- Barrier allows you to share one mouse and keyboard between multiple computers.
+ Synergy allows you to share one mouse and keyboard between multiple computers.
  Work seamlessly across Windows, macOS and Linux.
-Homepage: https://github.com/debauchee/barrier/
+Homepage: https://symless.com/synergy

debian/copyright

@@ -1,5 +1,5 @@
 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: Barrier
-Source: https://github.com/debauchee/barrier/
+Upstream-Name: Synergy
+Source: https://www.symless.com/synergy
 Disclaimer: This package is not part of the Debian project as it contains closed source proprietary components
-Copyright: Copyright (C) 2018 Debauchee Open Source Group
+Copyright: Copyright (C) 2012-2017 Symless Ltd

dist/inno/barrier.iss.in

@@ -1,90 +0,0 @@
-#define MyAppName "Barrier"
-#define MyAppVersion "@BARRIER_VERSION_MAJOR@.@BARRIER_VERSION_MINOR@.@BARRIER_VERSION_PATCH@.@BARRIER_BUILD_NUMBER@"
-#define MyAppTextVersion "@BARRIER_VERSION@"
-#define MyAppPublisher "Debauchee Open Source Group"
-#define MyAppURL "https://github.com/debauchee/barrier/wiki"
-#define MyAppCopyright "Copyright (C) 2018 Debauchee Open Source Group"
-#define MyAppExeName "barrier.exe"
-#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}
-AppName={#MyAppName}
-AppVersion={#MyAppTextVersion}
-AppVerName={#MyAppName} {#MyAppTextVersion}
-AppPublisher={#MyAppPublisher}
-AppPublisherURL={#MyAppURL}
-AppSupportURL={#MyAppURL}
-AppUpdatesURL={#MyAppURL}
-DefaultDirName={pf}\{#MyAppName}
-DisableProgramGroupPage=yes
-LicenseFile=@CMAKE_CURRENT_SOURCE_DIR@/res/License.rtf
-OutputDir=@CMAKE_RUNTIME_OUTPUT_DIRECTORY@/../installer-inno/bin
-OutputBaseFilename=BarrierSetup-{#MyAppTextVersion}
-SetupIconFile=@CMAKE_CURRENT_SOURCE_DIR@/res/barrier.ico
-VersionInfoProductTextVersion={#MyAppTextVersion}
-VersionInfoProductVersion={#MyAppVersion}
-VersionInfoTextVersion={#MyAppTextVersion}
-VersionInfoVersion={#MyAppVersion}
-VersionInfoCopyright={#MyAppCopyright}
-
-Compression=lzma
-SolidCompression=yes
-ArchitecturesInstallIn64BitMode=x64 ia64
-UninstallDisplayIcon={app}\{#MyAppExeName}
-
-#include "scripts\lang\english.iss"
-
-[Tasks]
-Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
-
-[Files]
-Source: "@CMAKE_RUNTIME_OUTPUT_DIRECTORY@/Release/*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
-; NOTE: Don't use "Flags: ignoreversion" on any shared system files
-
-[Icons]
-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
-Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent
-
-[UninstallDelete]
-Type: filesandordirs; Name: "{commonappdata}\Barrier"
-
-[UninstallRun]
-Filename: {sys}\taskkill; Parameters: "/im {#MyAppExeName} /f /t"; Flags: runhidden
-Filename: {sys}\net.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"
-
-; shared code for installing the products
-#include "scripts\products.iss"
-#include "scripts\products\stringversion.iss"
-#include "scripts\products\winversion.iss"
-#include "scripts\products\msiproduct.iss"
-#include "scripts\products\vcredist2017.iss"
-
-[Code]
-function InitializeSetup(): boolean;
-begin
-	// initialize windows version
-	initwinversion();
-
-	vcredist2017('14'); // min allowed version is 14.0
-
-	Result := true;
-end;

dist/inno/scripts/isxdl/english.ini

@@ -1,49 +0,0 @@
-[strings]
-; General
-100=File download
-101=Do you want to cancel the download?
-102=%1 (%2 of %3)
-103=%1 KB
-104=%1 KB of %2 KB (%3%)
-
-; Status information
-110=Getting file information...
-111=Redirecting to %1
-112=Sending request...
-113=Resolving %1
-114=Connected to %1
-115=Receiving...
-116=Connecting to %1
-
-; Error messages
-120=Error connecting to the internet.\n\n%1
-121=Error opening %1.\n\nThe server returned status code %2.
-122=Error reading URL.\n\n%1
-123=Error writing file %1.\n\n%2
-124=Error opening file %1.\n\n%2
-125='%1' is an invalid URL.
-126=Error opening %1.\n\n%2
-127=Error sending request.\n\n%1
-128=Unsupported protocol. Only HTTP and FTP protocols are supported.
-129=Failed to connect to %1.\n\n%2
-130=Failed to query status code.\n\n%1
-131=Error requesting file.\n\n%1
-
-; Other
-144=About...
-146=Download
-147=Setup is now downloading additional files to your computer.
-
-; labels
-160=File:
-161=Speed:
-162=Status:
-163=Elapsed Time:
-164=Remaining Time:
-165=Current File:
-166=Overall Progress:
-167=Cancel
-168=OK
-169=User Name and Password
-170=User Name:
-171=Password:

dist/inno/scripts/isxdl/isxdl.iss

@@ -1,14 +0,0 @@
-[Files]
-Source: "scripts\isxdl\isxdl.dll"; Flags: dontcopy
-
-[Code]
-procedure isxdl_AddFile(URL, Filename: PAnsiChar);
-external 'isxdl_AddFile@files:isxdl.dll stdcall';
-
-function isxdl_DownloadFiles(hWnd: Integer): Integer;
-external 'isxdl_DownloadFiles@files:isxdl.dll stdcall';
-
-function isxdl_SetOption(Option, Value: PAnsiChar): Integer;
-external 'isxdl_SetOption@files:isxdl.dll stdcall';
-
-[Setup]

dist/inno/scripts/lang/english.iss

@@ -1,18 +0,0 @@
-[Languages]
-Name: "en"; MessagesFile: "compiler:Default.isl"
-
-[CustomMessages]
-;http://www.microsoft.com/globaldev/reference/lcid-all.mspx
-en.lcid=1033
-en.depdownload_msg=The following applications are required before setup can continue:%n%n%1%nDownload and install now?
-en.depdownload_memo_title=Download dependencies
-en.depinstall_memo_title=Install dependencies
-en.depinstall_title=Installing dependencies
-en.depinstall_description=Please wait while Setup installs dependencies on your computer.
-en.depinstall_status=Installing %1...
-en.depinstall_missing=%1 must be installed before setup can continue. Please install %1 and run Setup again.
-en.depinstall_error=An error occured while installing the dependencies. Please restart the computer and run the setup again or install the following dependencies manually:%n
-
-en.isxdl_langfile=
-
-[Files]

dist/inno/scripts/lang/italian.iss

@@ -1,18 +0,0 @@
-[Languages]
-Name: "it"; MessagesFile: "compiler:Default.isl"
-
-[CustomMessages]
-;http://www.microsoft.com/globaldev/reference/lcid-all.mspx
-en.lcid=1033
-en.depdownload_msg=Le seguenti applicazioni sono necessarie per poter continuare l'installazione:%n%n%1%nScaricare ed installa ora?
-en.depdownload_memo_title=Scarica dipendenze
-en.depinstall_memo_title=Installa dipendenze
-en.depinstall_title=Installazione dipendenze
-en.depinstall_description=Attendere che l'installazione installi le dipendenze sul computer.
-en.depinstall_status=Installazione %1...
-en.depinstall_missing=%1 deve essere installato prima che l'installazione possa continuare. Installa %1 ed esegui nuovamente il programma di installazione.
-en.depinstall_error=Si è verificato un errore durante l'installazione delle dipendenze. Riavviare il computer ed eseguire nuovamente l'installazione o installare manualmente le seguenti dipendenze: %n
-
-it.isxdl_langfile=
-
-[Files]

dist/inno/scripts/products.iss

@@ -1,6 +0,0 @@
-#include "isxdl\isxdl.iss"
-
-[Code]
-#include "products.pas"
-
-[Setup]

dist/inno/scripts/products.pas

@@ -1,329 +0,0 @@
-{
-	--- TYPES AND VARIABLES ---
-}
-type
-	TProduct = record
-		File: String;
-		Title: String;
-		Parameters: String;
-		ForceSuccess : boolean;
-		InstallClean : boolean;
-		MustRebootAfter : boolean;
-	end;
-
-	InstallResult = (InstallSuccessful, InstallRebootRequired, InstallError);
-
-var
-	installMemo, downloadMessage: string;
-	products: array of TProduct;
-	delayedReboot, isForcedX86: boolean;
-	DependencyPage: TOutputProgressWizardPage;
-
-procedure AddProduct(filename, parameters, title, size, url: string; forceSuccess, installClean, mustRebootAfter : boolean);
-{
-	Adds a product to the list of products to download.
-	Parameters:
-		filename: the file name under which to save the file
-		parameters: the parameters with which to run the file
-		title: the product title
-		size: the file size
-		url: the URL to download from
-		forceSuccess: whether to continue in case of setup failure
-		installClean: whether the product needs a reboot before installing
-		mustRebootAfter: whether the product needs a reboot after installing
-}
-var
-	path: string;
-	i: Integer;
-begin
-	installMemo := installMemo + '%1' + title + #13;
-
-	path := ExpandConstant('{src}{\}') + CustomMessage('DependenciesDir') + '\' + filename;
-	if not FileExists(path) then begin
-		path := ExpandConstant('{tmp}{\}') + filename;
-
-		if not FileExists(path) then begin
-			isxdl_AddFile(url, path);
-
-			downloadMessage := downloadMessage + '%1' + title + ' (' + size + ')' + #13;
-		end;
-	end;
-
-	i := GetArrayLength(products);
-	SetArrayLength(products, i + 1);
-	products[i].File := path;
-	products[i].Title := title;
-	products[i].Parameters := parameters;
-	products[i].ForceSuccess := forceSuccess;
-	products[i].InstallClean := installClean;
-	products[i].MustRebootAfter := mustRebootAfter;
-end;
-
-function SmartExec(product : TProduct; var resultcode : Integer): boolean;
-{
-	Executes a product and returns the exit code.
-	Parameters:
-		product: the product to install
-		resultcode: the exit code
-}
-begin
-	if (LowerCase(Copy(product.File, Length(product.File) - 2, 3)) = 'exe') then begin
-		Result := Exec(product.File, product.Parameters, '', SW_SHOWNORMAL, ewWaitUntilTerminated, resultcode);
-	end else begin
-		Result := ShellExec('', product.File, product.Parameters, '', SW_SHOWNORMAL, ewWaitUntilTerminated, resultcode);
-	end;
-end;
-
-function PendingReboot: boolean;
-{
-	Checks whether the machine has a pending reboot.
-}
-var	names: String;
-begin
-	if (RegQueryMultiStringValue(HKEY_LOCAL_MACHINE, 'SYSTEM\CurrentControlSet\Control\Session Manager', 'PendingFileRenameOperations', names)) then begin
-		Result := true;
-	end else if ((RegQueryMultiStringValue(HKEY_LOCAL_MACHINE, 'SYSTEM\CurrentControlSet\Control\Session Manager', 'SetupExecute', names)) and (names <> ''))  then begin
-		Result := true;
-	end else begin
-		Result := false;
-	end;
-end;
-
-function InstallProducts: InstallResult;
-{
-	Installs the downloaded products
-}
-var
-	resultCode, i, productCount, finishCount: Integer;
-begin
-	Result := InstallSuccessful;
-	productCount := GetArrayLength(products);
-
-	if productCount > 0 then begin
-		DependencyPage := CreateOutputProgressPage(CustomMessage('depinstall_title'), CustomMessage('depinstall_description'));
-		DependencyPage.Show;
-
-		for i := 0 to productCount - 1 do begin
-			if (products[i].InstallClean and (delayedReboot or PendingReboot())) then begin
-				Result := InstallRebootRequired;
-				break;
-			end;
-
-			DependencyPage.SetText(FmtMessage(CustomMessage('depinstall_status'), [products[i].Title]), '');
-			DependencyPage.SetProgress(i, productCount);
-
-			while true do begin
-				// set 0 as used code for shown error if SmartExec fails
-				resultCode := 0;
-				if SmartExec(products[i], resultCode) then begin
-					// setup executed; resultCode contains the exit code
-					if (products[i].MustRebootAfter) then begin
-						// delay reboot after install if we installed the last dependency anyways
-						if (i = productCount - 1) then begin
-							delayedReboot := true;
-						end else begin
-							Result := InstallRebootRequired;
-						end;
-						break;
-					end else if (resultCode = 0) or (products[i].ForceSuccess) then begin
-						finishCount := finishCount + 1;
-						break;
-					end else if (resultCode = 3010) then begin
-						// Windows Installer resultCode 3010: ERROR_SUCCESS_REBOOT_REQUIRED
-						delayedReboot := true;
-						finishCount := finishCount + 1;
-						break;
-					end;
-				end;
-
-				case MsgBox(FmtMessage(SetupMessage(msgErrorFunctionFailed), [products[i].Title, IntToStr(resultCode)]), mbError, MB_ABORTRETRYIGNORE) of
-					IDABORT: begin
-						Result := InstallError;
-						break;
-					end;
-					IDIGNORE: begin
-						break;
-					end;
-				end;
-			end;
-
-			if Result <> InstallSuccessful then begin
-				break;
-			end;
-		end;
-
-		// only leave not installed products for error message
-		for i := 0 to productCount - finishCount - 1 do begin
-			products[i] := products[i+finishCount];
-		end;
-		SetArrayLength(products, productCount - finishCount);
-
-		DependencyPage.Hide;
-	end;
-end;
-
-{
-	--------------------
-	INNO EVENT FUNCTIONS
-	--------------------
-}
-
-function PrepareToInstall(var NeedsRestart: boolean): String;
-{
-	Before the "preparing to install" page.
-	See: http://www.jrsoftware.org/ishelp/index.php?topic=scriptevents
-}
-var
-	i: Integer;
-	s: string;
-begin
-	delayedReboot := false;
-
-	case InstallProducts() of
-		InstallError: begin
-			s := CustomMessage('depinstall_error');
-
-			for i := 0 to GetArrayLength(products) - 1 do begin
-				s := s + #13 + '	' + products[i].Title;
-			end;
-
-			Result := s;
-			end;
-		InstallRebootRequired: begin
-			Result := products[0].Title;
-			NeedsRestart := true;
-
-			// write into the registry that the installer needs to be executed again after restart
-			RegWriteStringValue(HKEY_CURRENT_USER, 'SOFTWARE\Microsoft\Windows\CurrentVersion\RunOnce', 'InstallBootstrap', ExpandConstant('{srcexe}'));
-			end;
-	end;
-end;
-
-function NeedRestart : boolean;
-{
-	Checks whether a restart is needed at the end of install
-	See: http://www.jrsoftware.org/ishelp/index.php?topic=scriptevents
-}
-begin
-	Result := delayedReboot;
-end;
-
-function UpdateReadyMemo(Space, NewLine, MemoUserInfoInfo, MemoDirInfo, MemoTypeInfo, MemoComponentsInfo, MemoGroupInfo, MemoTasksInfo: String): String;
-{
-	Just before the "ready" page.
-	See: http://www.jrsoftware.org/ishelp/index.php?topic=scriptevents
-}
-var
-	s: string;
-begin
-	if downloadMessage <> '' then
-		s := s + CustomMessage('depdownload_memo_title') + ':' + NewLine + FmtMessage(downloadMessage, [Space]) + NewLine;
-	if installMemo <> '' then
-		s := s + CustomMessage('depinstall_memo_title') + ':' + NewLine + FmtMessage(installMemo, [Space]) + NewLine;
-
-	if MemoDirInfo <> '' then
-		s := s + MemoDirInfo + NewLine + NewLine;
-	if MemoGroupInfo <> '' then
-		s := s + MemoGroupInfo + NewLine + NewLine;
-	if MemoTasksInfo <> '' then
-		s := s + MemoTasksInfo;
-
-	Result := s
-end;
-
-function NextButtonClick(CurPageID: Integer): boolean;
-{
-	At each "next" button click
-	See: http://www.jrsoftware.org/ishelp/index.php?topic=scriptevents
-}
-begin
-	Result := true;
-
-	if CurPageID = wpReady then begin
-		if downloadMessage <> '' then begin
-			// change isxdl language only if it is not english because isxdl default language is already english
-			if (ActiveLanguage() <> 'en') then begin
-				ExtractTemporaryFile(CustomMessage('isxdl_langfile'));
-				isxdl_SetOption('language', ExpandConstant('{tmp}{\}') + CustomMessage('isxdl_langfile'));
-			end;
-			//isxdl_SetOption('title', FmtMessage(SetupMessage(msgSetupWindowTitle), [CustomMessage('appname')]));
-
-			//if SuppressibleMsgBox(FmtMessage(CustomMessage('depdownload_msg'), [FmtMessage(downloadMessage, [''])]), mbConfirmation, MB_YESNO, IDYES) = IDNO then
-			//	Result := false
-			//else if
-			if isxdl_DownloadFiles(StrToInt(ExpandConstant('{wizardhwnd}'))) = 0 then
-				Result := false;
-		end;
-	end;
-end;
-
-{
-	-----------------------------
-	ARCHITECTURE HELPER FUNCTIONS
-	-----------------------------
-}
-
-function IsX86: boolean;
-{
-	Gets whether the computer is x86 (32 bits).
-}
-begin
-	Result := isForcedX86 or (ProcessorArchitecture = paX86) or (ProcessorArchitecture = paUnknown);
-end;
-
-function IsX64: boolean;
-{
-	Gets whether the computer is x64 (64 bits).
-}
-begin
-	Result := (not isForcedX86) and Is64BitInstallMode and (ProcessorArchitecture = paX64);
-end;
-
-function IsIA64: boolean;
-{
-	Gets whether the computer is IA64 (Itanium 64 bits).
-}
-begin
-	Result := (not isForcedX86) and Is64BitInstallMode and (ProcessorArchitecture = paIA64);
-end;
-
-function GetString(x86, x64, ia64: String): String;
-{
-	Gets a string depending on the computer architecture.
-	Parameters:
-		x86: the string if the computer is x86
-		x64: the string if the computer is x64
-		ia64: the string if the computer is IA64
-}
-begin
-	if IsX64() and (x64 <> '') then begin
-		Result := x64;
-	end else if IsIA64() and (ia64 <> '') then begin
-		Result := ia64;
-	end else begin
-		Result := x86;
-	end;
-end;
-
-function GetArchitectureString(): String;
-{
-	Gets the "standard" architecture suffix string.
-	Returns either _x64, _ia64 or nothing.
-}
-begin
-	if IsX64() then begin
-		Result := '_x64';
-	end else if IsIA64() then begin
-		Result := '_ia64';
-	end else begin
-		Result := '';
-	end;
-end;
-
-procedure SetForceX86(value: boolean);
-{
-	Forces the setup to use X86 products
-}
-begin
-	isForcedX86 := value;
-end;

dist/inno/scripts/products/msiproduct.iss

@@ -1,49 +0,0 @@
-[Code]
-#ifdef UNICODE
-	#define AW "W"
-#else
-	#define AW "A"
-#endif
-
-type
-	INSTALLSTATE = Longint;
-const
-	INSTALLSTATE_INVALIDARG = -2;	// An invalid parameter was passed to the function.
-	INSTALLSTATE_UNKNOWN = -1;		// The product is neither advertised or installed.
-	INSTALLSTATE_ADVERTISED = 1;	// The product is advertised but not installed.
-	INSTALLSTATE_ABSENT = 2;		// The product is installed for a different user.
-	INSTALLSTATE_DEFAULT = 5;		// The product is installed for the current user.
-
-function MsiQueryProductState(szProduct: string): INSTALLSTATE;
-external 'MsiQueryProductState{#AW}@msi.dll stdcall';
-
-function MsiEnumRelatedProducts(szUpgradeCode: string; nReserved: dword; nIndex: dword; szProductCode: string): integer;
-external 'MsiEnumRelatedProducts{#AW}@msi.dll stdcall';
-
-function MsiGetProductInfo(szProductCode: string; szProperty: string; szValue: string; var nvalueSize: dword): integer;
-external 'MsiGetProductInfo{#AW}@msi.dll stdcall';
-
-function msiproduct(productID: string): boolean;
-begin
-	Result := MsiQueryProductState(productID) = INSTALLSTATE_DEFAULT;
-end;
-
-function msiproductupgrade(upgradeCode: string; minVersion: string): boolean;
-var
-	productCode, version: string;
-	valueSize: dword;
-begin
-	SetLength(productCode, 39);
-	Result := false;
-
-	if (MsiEnumRelatedProducts(upgradeCode, 0, 0, productCode) = 0) then begin
-		SetLength(version, 39);
-		valueSize := Length(version);
-
-		if (MsiGetProductInfo(productCode, 'VersionString', version, valueSize) = 0) then begin
-			Result := compareversion(version, minVersion) >= 0;
-		end;
-	end;
-end;
-
-[Setup]

dist/inno/scripts/products/stringversion.iss

@@ -1,62 +0,0 @@
-[Code]
-function stringtoversion(var temp: String): Integer;
-var
-	part: String;
-	pos1: Integer;
-
-begin
-	if (Length(temp) = 0) then begin
-		Result := -1;
-		Exit;
-	end;
-
-	pos1 := Pos('.', temp);
-	if (pos1 = 0) then begin
-		Result := StrToInt(temp);
-		temp := '';
-	end else begin
-		part := Copy(temp, 1, pos1 - 1);
-		temp := Copy(temp, pos1 + 1, Length(temp));
-		Result := StrToInt(part);
-	end;
-end;
-
-function compareinnerversion(var x, y: String): Integer;
-var
-	num1, num2: Integer;
-
-begin
-	num1 := stringtoversion(x);
-	num2 := stringtoversion(y);
-	if (num1 = -1) and (num2 = -1) then begin
-		Result := 0;
-		Exit;
-	end;
-
-	if (num1 < 0) then begin
-		num1 := 0;
-	end;
-	if (num2 < 0) then begin
-		num2 := 0;
-	end;
-
-	if (num1 < num2) then begin
-		Result := -1;
-	end else if (num1 > num2) then begin
-		Result := 1;
-	end else begin
-		Result := compareinnerversion(x, y);
-	end;
-end;
-
-function compareversion(versionA, versionB: String): Integer;
-var
-  temp1, temp2: String;
-
-begin
-	temp1 := versionA;
-	temp2 := versionB;
-	Result := compareinnerversion(temp1, temp2);
-end;
-
-[Setup]

dist/inno/scripts/products/vcredist2017.iss

@@ -1,32 +0,0 @@
-; requires Windows 10, Windows 7 Service Pack 1, Windows 8, Windows 8.1, Windows Server 2003 Service Pack 2, Windows Server 2008 R2 SP1, Windows Server 2008 Service Pack 2, Windows Server 2012, Windows Vista Service Pack 2, Windows XP Service Pack 3
-; http://www.visualstudio.com/en-us/downloads/
-
-[CustomMessages]
-vcredist2017_title=Visual C++ 2017 Redistributable
-vcredist2017_title_x64=Visual C++ 2017 64-Bit Redistributable
-
-vcredist2017_size=13.7 MB
-vcredist2017_size_x64=14.5 MB
-
-[Code]
-const
-	vcredist2017_url = 'http://download.microsoft.com/download/1/f/e/1febbdb2-aded-4e14-9063-39fb17e88444/vc_redist.x86.exe';
-	vcredist2017_url_x64 = 'http://download.microsoft.com/download/3/b/f/3bf6e759-c555-4595-8973-86b7b4312927/vc_redist.x64.exe';
-
-	vcredist2017_upgradecode = '{65E5BD06-6392-3027-8C26-853107D3CF1A}';
-	vcredist2017_upgradecode_x64 = '{36F68A90-239C-34DF-B58C-64B30153CE35}';
-
-procedure vcredist2017(minVersion: string);
-begin
-	if (not IsIA64()) then begin
-		if (not msiproductupgrade(GetString(vcredist2017_upgradecode, vcredist2017_upgradecode_x64, ''), minVersion)) then
-			AddProduct('vcredist2017' + GetArchitectureString() + '.exe',
-				'/passive /norestart',
-				CustomMessage('vcredist2017_title' + GetArchitectureString()),
-				CustomMessage('vcredist2017_size' + GetArchitectureString()),
-				GetString(vcredist2017_url, vcredist2017_url_x64, ''),
-				false, false, false);
-	end;
-end;
-
-[Setup]

dist/inno/scripts/products/winversion.iss

@@ -1,49 +0,0 @@
-[Code]
-var
-	WindowsVersion: TWindowsVersion;
-
-procedure initwinversion();
-begin
-	GetWindowsVersionEx(WindowsVersion);
-end;
-
-function exactwinversion(MajorVersion, MinorVersion: integer): boolean;
-begin
-	Result := (WindowsVersion.Major = MajorVersion) and (WindowsVersion.Minor = MinorVersion);
-end;
-
-function minwinversion(MajorVersion, MinorVersion: integer): boolean;
-begin
-	Result := (WindowsVersion.Major > MajorVersion) or ((WindowsVersion.Major = MajorVersion) and (WindowsVersion.Minor >= MinorVersion));
-end;
-
-function maxwinversion(MajorVersion, MinorVersion: integer): boolean;
-begin
-	Result := (WindowsVersion.Major < MajorVersion) or ((WindowsVersion.Major = MajorVersion) and (WindowsVersion.Minor <= MinorVersion));
-end;
-
-function exactwinspversion(MajorVersion, MinorVersion, SpVersion: integer): boolean;
-begin
-	if exactwinversion(MajorVersion, MinorVersion) then
-		Result := WindowsVersion.ServicePackMajor = SpVersion
-	else
-		Result := true;
-end;
-
-function minwinspversion(MajorVersion, MinorVersion, SpVersion: integer): boolean;
-begin
-	if exactwinversion(MajorVersion, MinorVersion) then
-		Result := WindowsVersion.ServicePackMajor >= SpVersion
-	else
-		Result := true;
-end;
-
-function maxwinspversion(MajorVersion, MinorVersion, SpVersion: integer): boolean;
-begin
-	if exactwinversion(MajorVersion, MinorVersion) then
-		Result := WindowsVersion.ServicePackMajor <= SpVersion
-	else
-		Result := true;
-end;
-
-[Setup]

dist/macos/bundle/Synergy.app/Contents/Info.plist.in

@@ -4,33 +4,29 @@
     <key>CFBundleDevelopmentRegion</key>
     <string>English</string>
     <key>CFBundleDisplayName</key>
-    <string>Barrier</string>
+    <string>Synergy</string>
     <key>CFBundleExecutable</key>
-    <string>barrier</string>
+    <string>synergy</string>
     <key>CFBundleIconFile</key>
-    <string>Barrier.icns</string>
+    <string>Synergy.icns</string>
     <key>CFBundleIdentifier</key>
-    <string>barrier</string>
+    <string>synergy</string>
     <!-- TODO: Fix this in v2.0 //-->
     <key>CFBundleInfoDictionaryVersion</key>
     <string>6.0</string>
     <key>CFBundleName</key>
-    <string>Barrier</string>
+    <string>Synergy</string>
     <key>CFBundlePackageType</key>
     <string>APPL</string>
     <key>CFBundleSignature</key>
     <string>SYN1</string>
     <key>CFBundleShortVersionString</key>
-    <string>@BARRIER_VERSION@</string>
+    <string>@SYNERGY_VERSION@</string>
     <key>CFBundleVersion</key>
-    <string>@BARRIER_VERSION@</string>
-    <key>NSPrincipalClass</key>
-    <string>NSApplication</string>
-    <key>NSHighResolutionCapable</key>
-    <string>True</string>
+    <string>@SYNERGY_VERSION@</string>
     <key>NSHumanReadableCopyright</key>
-    <string>© 2018 Debauchee Open Source Group</string>
+    <string>© 2012-2016, Symless Ltd</string>
     <key>LSMinimumSystemVersion</key>
-    <string>10.12.0</string>
+    <string>10.9.0</string>
   </dict>
 </plist>

dist/macos/bundle/build_dist.sh.in

@@ -1,73 +0,0 @@
-#!/bin/sh
-
-# Use the same verbose variable as CMake
-[ "$VERBOSE" = "1" ] && set -x
-
-# Exit on unset variables or pipe errors
-set -uo pipefail
-
-B_MACOS="Barrier.app/Contents/MacOS"
-B_VERSION="@BARRIER_VERSION@"
-B_BINDIR="@CMAKE_RUNTIME_OUTPUT_DIRECTORY@"
-B_BUILDTYPE="@CMAKE_BUILD_TYPE@"
-B_BARRIERC="Barrier.app/Contents/MacOS/barrierc"
-B_BARRIERS="Barrier.app/Contents/MacOS/barriers"
-
-# Colorized output
-info() { tput bold; echo "$@"; tput sgr0 ; }
-error() { tput bold; tput setaf 1; echo "$@"; tput sgr0 ; }
-success() { tput bold; tput setaf 2; echo "$@"; tput sgr0 ; }
-warn() { tput bold; tput setaf 3; echo "$@"; tput sgr0 ; }
-
-info "Checking for bundle contents"
-if [ ! -d "Barrier.app/Contents" ]; then
-    error "Please make sure that the build completed successfully"
-    error "before trying to create the installer."
-    exit 1
-fi
-
-if [ -d "$B_MACOS" ]; then
-    info "Removing old binaries from bundle"
-    rm -r "$B_MACOS"
-fi
-
-info "Copying binaries into bundle"
-# Copy the folder instead of globbing unquoted path
-cp -r "$B_BINDIR" "$B_MACOS" || exit 1
-
-# Check for macdeployqt on MacPorts
-if which -s port ; then
-    info "MacPorts found, searching for macdeployqt"
-    DEPLOYQT="$(port contents qt5-qttools | grep --only --max-count 1 '/.*macdeployqt')"
-    if [ ! -x "$DEPLOYQT" ]; then
-        error "Please install package qt5-qttools"
-        exit 1
-    fi
-fi
-
-# Check for macdeployqt on Homebrew
-if which -s brew ; then
-    info "Homebrew found, searching for macdeployqt"
-    DEPLOYQT="$(brew list qt@5 | grep --only '/.*macdeployqt' | head -1)"
-    if [ ! -x "$DEPLOYQT" ]; then
-        error "Please install package qt"
-        exit 1
-    fi
-fi
-
-# Use macdeployqt to include libraries and create dmg
-if [ "$B_BUILDTYPE" = "Release" ]; then
-    info "Building Release disk image (dmg)"
-    "$DEPLOYQT" Barrier.app -dmg \
-    -executable="$B_BARRIERC" \
-    -executable="$B_BARRIERS" || exit 1
-    mv "Barrier.dmg" "Barrier-$B_VERSION.dmg" || exit 1
-    success "Created Barrier-$B_VERSION.dmg"
-else
-    warn "Disk image (dmg) only created for Release builds"
-    info "Building debug bundle"
-    "$DEPLOYQT" Barrier.app -no-strip \
-    -executable="$B_BARRIERC" \
-    -executable="$B_BARRIERS" || exit 1
-    success "Bundle created successfully"
-fi

dist/macos/bundle/build_installer.sh.in

@@ -1,83 +0,0 @@
-#!/bin/sh
-
-# add warning for users running manually
-warn() { tput bold; tput setaf 3; echo "$@"; tput sgr0 ; }
-warn "The scripts build_installer.sh and reref_dylibs.sh have been deprecated."
-warn "Please use build_dist.sh instead to deploy using macdeployqt"
-
-# change this to rename the installer package
-B_DMG="Barrier-@BARRIER_VERSION@.dmg"
-
-cd "$( dirname "$0" )"
-OWNDIR="$( pwd )"
-
-B_REREF_SCRIPT="$OWNDIR/reref_dylibs.sh"
-if [ ! -x "$B_REREF_SCRIPT" ]; then
-    echo "Missing script: $B_REREF_SCRIPT"
-    exit 1
-fi
-
-# remove any old copies so there's no confusion about whether this
-# process completes successfully or not
-rm -rf temp.dmg "$B_DMG"
-
-cd Barrier.app/Contents 2>/dev/null
-if [ $? -ne 0 ]; then
-    echo "Please make sure that the build completed successfully"
-    echo "before trying to create the installer."
-    exit 1
-fi
-
-# MacOS folder holds the executables, non-system libraries,
-# and the startup script
-rm -rf MacOS
-mkdir MacOS || exit 1
-cd MacOS || exit 1
-
-# copy all executables
-cp @CMAKE_RUNTIME_OUTPUT_DIRECTORY@/* . || exit 1
-
-# copy the qt platform plugin
-# 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 [ "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
-mkdir platforms
-cp $B_COCOA platforms/ || exit 1
-
-# make sure we can r/w all these binaries
-chmod -R u+rw * || exit 1
-
-# only one executable (barrier) needs non-system libraries although it's
-# libraries can call each other. use a recursive script to handle the
-# re-referencing
-$B_REREF_SCRIPT barrier || exit 1
-# the cocoa platform plugin also needs to know where to find the qt libraries.
-# because it exists in a subdirectory we append ../ to the relative path of the
-# libraries in its metadata
-$B_REREF_SCRIPT platforms/libqcocoa.dylib ../ || exit 1
-
-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
-hdiutil attach temp.dmg -mountpoint mnt || exit 1
-cp -r Barrier.app mnt/ || exit 1
-hdiutil detach mnt || exit 1
-hdiutil convert temp.dmg -format UDZO -o "$B_DMG" || exit 1
-rm temp.dmg
-
-echo "dmg $B_DMG created successfully"

dist/macos/bundle/reref_dylibs.sh

@@ -1,49 +0,0 @@
-#!/bin/sh
-
-# $1 = binary (program or dylib)
-B_TARGET=$1
-if [ "x$B_TARGET" = "x" ]; then
-
-    # add warning for users running manually
-    warn() { tput bold; tput setaf 3; echo "$@"; tput sgr0 ; }
-    warn "The scripts build_installer.sh and reref_dylibs.sh have been deprecated."
-    warn "Please use build_dist.sh instead to deploy using macdeployqt"
-
-    echo "Which binary needs to be re-referenced?"
-    exit 1
-fi
-
-cd "$(dirname "$B_TARGET")" || exit 1
-
-# where to find non-system libraries relative to target's directory.
-# the vast majority of the time this should be empty
-B_REL_PATH=$2
-
-# we're in target's directory now. trim off the path
-B_TARGET=$(basename "$B_TARGET")
-
-# get a list of non-system libraries and make local copies
-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
-
-    B_DST=${B_REL_PATH}${B_LIB_NAME}
-    if [ ! -e "$B_DST" ]; then
-        cp "$B_LIB" "$B_DST" || exit 1
-        chmod u+rw "$B_DST" || exit 1
-        # recursively call this script on libraries purposefully not passing
-        # $B_REL_PATH so that it is only used explicitly
-        $0 "$B_DST"
-    fi
-
-    # adjust the target's metadata to point to the local copy
-    # rather than the system-wide copy which would only exist on
-    # a development machine
-    install_name_tool -change "$B_LIB" "@loader_path/$B_DST" "$B_TARGET" || exit 1
-done

dist/rpm/barrier.spec.in

@@ -1,105 +0,0 @@
-%global barrier_revision @BARRIER_REVISION@
-Summary: Keyboard and mouse sharing solution
-Name: barrier
-Version: @BARRIER_VERSION@
-Release: @BARRIER_BUILD_NUMBER@%{?dist}
-License: GPLv2
-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
-# 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
-%{_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/rpm/synergy.spec.in

@@ -0,0 +1,27 @@
+Name: synergy
+Version: @SYNERGY_VERSION@
+Summary: Keyboard and mouse sharing solution
+Group: Applications/Productivity
+URL: https://symless.com/synergy
+Source: https://symless.com/synergy/downloads
+Vendor: Symless
+Packager: Symless <engineering@symless.com>
+License: GPLv2
+Release: @SYNERGY_BUILD_NUMBER@@SYNERGY_SNAPSHOT_INFO@%{?dist}
+
+%description
+Synergy allows you to share one mouse and keyboard between multiple computers.
+Work seamlessly across Windows, macOS and Linux.
+
+%files
+%defattr(755,root,root,-)
+%{_bindir}/synergy
+%{_bindir}/synergyc
+%{_bindir}/synergys
+%{_bindir}/syntool
+%attr(644,-,-) %{_datarootdir}/applications/synergy.desktop
+%attr(644,-,-) %{_datarootdir}/icons/hicolor/scalable/apps/synergy.svg
+
+%changelog
+* Wed Apr 26 2017 Symless <engineering@symless.com>
+- Initial version of the package

dist/wix/Barrier.wixproj

@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-    <PropertyGroup>
-        <ProductVersion>3.10</ProductVersion>
-        <ProjectGuid>{d4ba9f39-6a35-4c8f-9cb2-67fcbe5cab17}</ProjectGuid>
-        <SchemaVersion>2.0</SchemaVersion>
-        <OutputName>Barrier</OutputName>
-        <OutputType>Package</OutputType>
-        <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' AND '$(MSBuildExtensionsPath32)' != '' ">$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
-        <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
-        <OutputPath>bin\$(Configuration)\</OutputPath>
-        <IntermediateOutputPath>wix\obj\$(Configuration)\</IntermediateOutputPath>
-    </PropertyGroup>
-    <ItemGroup>
-        <WixExtension Include="WixFirewallExtension">
-            <HintPath>$(WixExtDir)\WixFirewallExtension.dll</HintPath>
-            <Name>WixFirewallExtension</Name>
-        </WixExtension>
-        <WixExtension Include="WixUtilExtension">
-            <HintPath>$(WixExtDir)\WixUtilExtension.dll</HintPath>
-            <Name>WixUtilExtension</Name>
-        </WixExtension>
-        <WixExtension Include="WixUIExtension">
-            <HintPath>$(WixExtDir)\WixUIExtension.dll</HintPath>
-            <Name>WixUIExtension</Name>
-        </WixExtension>
-        <Compile Include="Product.wxs"/>
-        <Content Include="Include.wxi"/>
-    </ItemGroup>
-    <Import Project="$(WixTargetsPath)"/>
-</Project>

dist/wix/Include.wxi.in

@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Include>
-    <?define Name="Barrier" ?>
-    <?define Version="@BARRIER_WIX_VERSION@" ?>
-    <?define QtVersion="@QT_VERSION@" ?>
-    <?define Author="Debauchee Open Source Group" ?>
+    <?define Name="Synergy" ?>
+    <?define Version="@SYNERGY_VERSION@" ?>
+    <?define Author="Symless Ltd" ?>
     <?define BinPath="@CMAKE_RUNTIME_OUTPUT_DIRECTORY@/$(var.Configuration)" ?>
     <?define ResPath="@CMAKE_CURRENT_SOURCE_DIR@/res" ?>
     <?define ExtPath="@CMAKE_CURRENT_SOURCE_DIR@/ext" ?>
@@ -11,15 +10,14 @@
         <?define ProgramFilesFolder="ProgramFiles64Folder" ?>
         <?define PlatformSimpleName="64-bit" ?>
         <?define UpgradeGuid="E8A4FA54-14B9-4FD1-8E00-7BC46555FDA0" ?>
-        <?define QtPath="@CMAKE_PREFIX_PATH@" ?>
     <?else ?>
         <?define ProgramFilesFolder="ProgramFilesFolder" ?>
         <?define PlatformSimpleName="32-bit" ?>
         <?define UpgradeGuid="BE0B9FD8-45E2-4A8E-A0D8-1F774D074A78" ?>
-        <?define QtPath="@CMAKE_PREFIX_PATH@" ?>
     <?endif ?>
+	<?define QtPath="@QT_PATH@" ?>
     <?define QtBinPath="$(var.QtPath)\bin" ?>
-    <?define QtPlatformPath="$(var.QtPath)\plugins\platforms" ?>
+    <?define QtPluginsPath="$(var.QtPath)\plugins" ?>
     <?define OpenSSLPath="$(var.ExtPath)\openssl\windows\$(var.Platform)" ?>
     <?define OpenSSLBinPath="$(var.OpenSSLPath)\bin" ?>
 </Include>

dist/wix/Product.wxs

@@ -12,27 +12,63 @@
 		</Upgrade>
 		<Feature Id="ProductFeature" Title="$(var.Name)">
 			<ComponentGroupRef Id="ProductComponents"/>
+			<ComponentGroupRef Id="OpenSSLComponents"/>
+			<ComponentGroupRef Id="ProductQtStylesComponents"/>
 			<ComponentGroupRef Id="ProductQtPluginComponents"/>
 			<ComponentRef Id="RegistryEntries"/>
+      <MergeRef Id="VC_Redist"/>
 		</Feature>
 		<DirectoryRef Id="TARGETDIR">
 			<Component Guid="7CF3564D-1F8E-4D3D-9781-E1EE22D5BD67" Id="RegistryEntries">
-				<RegistryKey ForceCreateOnInstall="yes" ForceDeleteOnUninstall="yes" Key="Software\Microsoft\Windows NT\CurrentVersion\AppCompatFlags\Layers" Root="HKLM">
-					<RegistryValue Name="[INSTALLFOLDER]barriers.exe" Type="string" Value="~ HIGHDPIAWARE WIN7RTM"/>
+				<RegistryKey Id="synergys" ForceCreateOnInstall="yes" ForceDeleteOnUninstall="yes" Key="Software\Microsoft\Windows NT\CurrentVersion\AppCompatFlags\Layers" Root="HKLM">
+					<RegistryValue Name="[INSTALLFOLDER]synergys.exe" Type="string" Value="~ HIGHDPIAWARE WIN7RTM"/>
+				</RegistryKey>
+
+				<RegistryKey Id="synergyc" Root="HKLM"
+					Key="Software\Microsoft\Windows NT\CurrentVersion\AppCompatFlags\Layers"
+					Action="createAndRemoveOnUninstall">
+					<RegistryValue Type="string" Name="[INSTALLFOLDER]synergyc.exe" Value="~ HIGHDPIAWARE WIN7RTM"/>
+				</RegistryKey>
+
+				<RegistryKey Id="synergy" Root="HKLM"
+					Key="Software\Microsoft\Windows NT\CurrentVersion\AppCompatFlags\Layers"
+					Action="createAndRemoveOnUninstall">
+					<RegistryValue Type="string" Name="[INSTALLFOLDER]synergy.exe" Value="~ HIGHDPIAWARE WIN7RTM"/>
 				</RegistryKey>
 				<!-- Windows 8 and later only -->
 				<Condition><![CDATA[Installed OR (VersionNT >= 602)]]></Condition>
 			</Component>
+      <?if $(var.Platform) = x64 ?>
+        <Merge Id="VC_Redist" SourceFile="$(env.ProgramFiles)\Microsoft Visual Studio\2019\BuildTools\VC\Redist\MSVC\14.23.27820\MergeModules\Microsoft_VC142_CRT_x64.msm" DiskId="1" Language="0"/>
+      <?else ?>
+        <Merge Id="VC_Redist" SourceFile="$(env.ProgramFiles)\Microsoft Visual Studio\2019\BuildTools\VC\Redist\MSVC\14.23.27820\MergeModules\Microsoft_VC142_CRT_x86.msm" DiskId="1" Language="0"/>
+      <?endif ?>
 		</DirectoryRef>
-		<Icon Id="barrier.ico" SourceFile="$(var.ResPath)/barrier.ico"/>
-		<WixVariable Id="WixUILicenseRtf" Value="$(var.ResPath)\License.rtf"/>
+		<Icon Id="synergy.ico" SourceFile="$(var.ResPath)/synergy.ico"/>
 		<WixVariable Id="WixUIBannerBmp" Value="$(var.ResPath)\banner.bmp"/>
 		<WixVariable Id="WixUIDialogBmp" Value="$(var.ResPath)\dialog.bmp"/>
-		<Property Id="ARPPRODUCTICON" Value="barrier.ico"/>
+		<Property Id="ARPPRODUCTICON" Value="synergy.ico"/>
 		<Property Id="WIXUI_INSTALLDIR" Value="INSTALLFOLDER"/>
-		<Property Id="MSIRESTARTMANAGERCONTROL" Value="Disable"/>
+		<Property Id="LEGACY_UNINSTALL_EXISTS">
+			<RegistrySearch Id="LegacyRegistrySearch" Key="SOFTWARE\Wow6432Node\Microsoft\Windows\CurrentVersion\Uninstall\Synergy" Name="UninstallString" Root="HKLM" Type="file" Win64="no">
+				<FileSearch Id="LegacyFileSearch" Name="uninstall.exe"/>
+			</RegistrySearch>
+		</Property>
+		<Condition Message="An existing installation of $(var.Name) was detected, please uninstall it before continuing.">NOT LEGACY_UNINSTALL_EXISTS
+    </Condition>
 		<CustomAction ExeCommand="" FileKey="GuiProgram" Id="StartGui" Return="asyncNoWait"/>
 		<UI>
+		    <UIRef Id="WixUI_InstallDir" />
+		    <Publish Dialog="WelcomeDlg"
+		          Control="Next"
+			  Event="NewDialog"
+			  Value="InstallDirDlg"
+			  Order="2">1</Publish>
+			<Publish Dialog="InstallDirDlg"
+			  Control="Back"
+			  Event="NewDialog"
+			  Value="WelcomeDlg"
+			  Order="2">1</Publish>
 			<Publish Control="Finish" Dialog="ExitDialog" Event="DoAction" Value="StartGui">NOT Installed</Publish>
 		</UI>
 	</Product>
@@ -42,6 +78,7 @@
 				<Directory Id="INSTALLFOLDER" Name="$(var.Name)">
 					<Directory Id="OpenSSLDir" Name="OpenSSL"/>
 					<Directory Id="PlatformsDir" Name="Platforms"/>
+					<Directory Id="QTStylesDir" Name="styles"/>
 				</Directory>
 			</Directory>
 			<Directory Id="ProgramMenuFolder"/>
@@ -50,23 +87,27 @@
 	<Fragment>
 		<ComponentGroup Directory="INSTALLFOLDER" Id="ProductComponents">
 			<Component Guid="EC9AD3B0-277C-4157-B5C8-5FD5B6A5F4AD" Id="Core">
-				<File KeyPath="yes" Source="$(var.BinPath)/barrierd.exe"/>
-				<ServiceInstall Description="Controls the $(var.Name) foreground processes." DisplayName="$(var.Name)" ErrorControl="normal" Id="ServiceInstall" Name="Barrier" Start="auto" Type="ownProcess">
+				<File KeyPath="yes" Source="$(var.BinPath)/synergyd.exe"/>
+				<ServiceInstall Description="Controls the $(var.Name) foreground processes." DisplayName="$(var.Name)" ErrorControl="normal" Id="ServiceInstall" Name="Synergy" Start="auto" Type="ownProcess">
 					<util:ServiceConfig FirstFailureActionType="restart" ResetPeriodInDays="1" RestartServiceDelayInSeconds="1" SecondFailureActionType="restart" ThirdFailureActionType="restart"/>
 				</ServiceInstall>
-				<ServiceControl Id="ServiceControl" Name="Barrier" Remove="uninstall" Start="install" Stop="both"/>
-				<File Source="$(var.BinPath)/barriers.exe">
+				<ServiceControl Id="ServiceControl" Name="Synergy" Remove="uninstall" Start="install" Stop="both"/>
+				<File Source="$(var.BinPath)/synergys.exe">
 					<fire:FirewallException Id="ServerFirewallException" IgnoreFailure="yes" Name="$(var.Name)" Scope="any"/>
 				</File>
-				<File Source="$(var.BinPath)/barrierc.exe"/>
-				<File Source="$(var.OpenSSLBinPath)/libeay32.dll"/>
-				<File Source="$(var.OpenSSLBinPath)/ssleay32.dll"/>
-				<File Source="$(var.OpenSSLBinPath)/openssl.exe"/>
-				<File Source="$(var.ResPath)/openssl/barrier.conf"/>
+				<File Source="$(var.BinPath)/synergyc.exe"/>
+				<File Source="$(var.BinPath)/syntool.exe"/>
+        <?if $(var.Platform) = x64 ?>
+				  <File Source="$(var.OpenSSLBinPath)/libssl-1_1-x64.dll"/>
+				  <File Source="$(var.OpenSSLBinPath)/libcrypto-1_1-x64.dll"/>
+        <?else ?>
+          <File Source="$(var.OpenSSLBinPath)/libssl-1_1.dll"/>
+          <File Source="$(var.OpenSSLBinPath)/libcrypto-1_1.dll"/>
+        <?endif ?>
 			</Component>
 			<Component Guid="BAC8149B-6287-45BF-9C27-43D71ED40214" Id="Gui">
-				<File Id="GuiProgram" KeyPath="yes" Source="$(var.BinPath)/barrier.exe">
-					<Shortcut Advertise="yes" Directory="ProgramMenuFolder" Icon="barrier.ico" Id="GuiShortcut" Name="$(var.Name)"/>
+				<File Id="GuiProgram" KeyPath="yes" Source="$(var.BinPath)/synergy.exe">
+					<Shortcut Advertise="yes" Directory="ProgramMenuFolder" Icon="synergy.ico" Id="GuiShortcut" Name="$(var.Name)"/>
 					<fire:FirewallException Id="GuiFirewallException" IgnoreFailure="yes" Name="$(var.Name)" Scope="any"/>
 				</File>
 				<?if $(var.Configuration) = "Debug" ?>
@@ -90,14 +131,32 @@
 				<?endif ?>
 			</Component>
 		</ComponentGroup>
+		<ComponentGroup Directory="QTStylesDir" Id="ProductQtStylesComponents">
+      <Component Guid="96E0F8D8-64FD-4CE8-94D1-F6EDCBBB4995" Id="Styles">
+        <File Id="qwindowsvistastyle" Source="$(var.QtPluginsPath)\styles\qwindowsvistastyle.dll"/>
+      </Component>
+		</ComponentGroup>
 		<ComponentGroup Directory="PlatformsDir" Id="ProductQtPluginComponents">
 			<Component Guid="684EFA14-856B-440E-A5E6-E90E04E36B41" Id="QtPlatformPlugin">
 				<?if $(var.Configuration) = "Debug" ?>
-				<File Source="$(var.QtPlatformPath)\qwindowsd.dll"/>
+				<File Source="$(var.QtPluginsPath)\platforms\qwindowsd.dll"/>
 				<?else ?>
-				<File Source="$(var.QtPlatformPath)\qwindows.dll"/>
+				<File Source="$(var.QtPluginsPath)\platforms\qwindows.dll"/>
 				<?endif ?>
 			</Component>
 		</ComponentGroup>
+		<ComponentGroup Directory="OpenSSLDir" Id="OpenSSLComponents">
+			<Component Guid="92648F77-65A6-4B16-AC59-A1F37BD341B1" Id="OpenSSL">
+        <?if $(var.Platform) = x64 ?>
+          <File Id="OpenSSLDll1" Source="$(var.OpenSSLBinPath)/libcrypto-1_1-x64.dll"/>
+          <File Id="OpenSSLDll2" Source="$(var.OpenSSLBinPath)/libssl-1_1-x64.dll"/>
+        <?else ?>
+          <File Id="OpenSSLDll1" Source="$(var.OpenSSLBinPath)/libcrypto-1_1.dll"/>
+          <File Id="OpenSSLDll2" Source="$(var.OpenSSLBinPath)/libssl-1_1.dll"/>
+        <?endif ?>
+        <File Source="$(var.OpenSSLBinPath)/openssl.exe"/>
+				<File Source="$(var.ResPath)/openssl/synergy.conf"/>
+			</Component>
+		</ComponentGroup>
 	</Fragment>
-</Wix>
+</Wix>

dist/wix/Synergy.sln

@@ -1,8 +1,9 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.23107.0
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.29411.108
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Barrier", "Barrier.wixproj", "{D4BA9F39-6A35-4C8F-9CB2-67FCBE5CAB17}"
+Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Synergy", "Synergy.wixproj", "{D4BA9F39-6A35-4C8F-9CB2-67FCBE5CAB17}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -24,4 +25,7 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {2E0AA1C9-0F14-4FE4-8F18-430484EFBACE}
+	EndGlobalSection
 EndGlobal

dist/wix/Synergy.wixproj

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ProductVersion>3.11</ProductVersion>
+    <ProjectGuid>{d4ba9f39-6a35-4c8f-9cb2-67fcbe5cab17}</ProjectGuid>
+    <SchemaVersion>2.0</SchemaVersion>
+    <OutputName>Synergy</OutputName>
+    <OutputType>Package</OutputType>
+    <OutputPath>bin\$(Configuration)\</OutputPath>
+    <IntermediateOutputPath>wix\obj\$(Configuration)\</IntermediateOutputPath>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="$(SolutionDir)/Product.wxs" />
+    <Content Include="$(SolutionDir)/Include.wxi" />
+
+  </ItemGroup>
+  <ItemGroup>
+    <WixExtension Include="WixUtilExtension">
+      <HintPath>C:\Program Files (x86)\WiX Toolset v3.11\bin\WixUtilExtension.dll</HintPath>
+      <Name>WixUtilExtension</Name>
+    </WixExtension>
+    <WixExtension Include="WixUIExtension">
+      <HintPath>C:\Program Files (x86)\WiX Toolset v3.11\bin\WixUIExtension.dll</HintPath>
+      <Name>WixUIExtension</Name>
+    </WixExtension>
+    <WixExtension Include="WixFirewallExtension">
+      <HintPath>C:\Program Files (x86)\WiX Toolset v3.11\bin\WixFirewallExtension.dll</HintPath>
+      <Name>WixFirewallExtension</Name>
+    </WixExtension>
+  </ItemGroup>
+  <Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' " />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets" Condition=" '$(WixTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets') " />
+</Project>

doc/MacReadme.txt

@@ -5,11 +5,14 @@ To install on Mac OS X with the .zip distribution (first seen in 1.3.6) you must
 
   1. Extract the zip file to any location (usually double click will do this)
   2. Open Terminal, and cd to the extracted directory (e.g. /Users/my-name/Downloads/extracted-dir/)
-  3. Copy the binaries to /usr/bin using: sudo cp barrier* /usr/bin
-  4. Correct the permissions and ownership: sudo chown root:wheel /usr/bin/barrier*; sudo chmod 555 /usr/bin/barrier*
+  3. Copy the binaries to /usr/bin using: sudo cp synergy* /usr/bin
+  4. Correct the permissions and ownership: sudo chown root:wheel /usr/bin/synergy*; sudo chmod 555 /usr/bin/synergy*
 
 Alternatively, you can copy the binaries as root. How to enable the root user in Mac OS X:
   http://support.apple.com/en-us/ht1528
 
 Once the binaries have been copied to /usr/bin, you should follow the configuration guide:
   http://synergy2.sourceforge.net/configuration.html
+
+If you have any problems, see the [[Support]] page:
+  http://symless.com/help/

doc/QtCodeStyle.xml

@@ -0,0 +1,234 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE QtCreatorCodeStyle>
+<!-- Written by QtCreator 3.0.1, 2014-02-14T09:50:24. -->
+<qtcreator>
+ <data>
+  <variable>CodeStyleData</variable>
+  <valuemap type="QVariantMap">
+   <value type="bool" key="AlignAssignments">false</value>
+   <value type="bool" key="AutoSpacesForTabs">false</value>
+   <value type="bool" key="BindStarToIdentifier">true</value>
+   <value type="bool" key="BindStarToLeftSpecifier">false</value>
+   <value type="bool" key="BindStarToRightSpecifier">false</value>
+   <value type="bool" key="BindStarToTypeName">false</value>
+   <value type="bool" key="ExtraPaddingForConditionsIfConfusingAlign">true</value>
+   <value type="bool" key="IndentAccessSpecifiers">false</value>
+   <value type="bool" key="IndentBlockBody">true</value>
+   <value type="bool" key="IndentBlockBraces">false</value>
+   <value type="bool" key="IndentBlocksRelativeToSwitchLabels">false</value>
+   <value type="bool" key="IndentClassBraces">false</value>
+   <value type="bool" key="IndentControlFlowRelativeToSwitchLabels">true</value>
+   <value type="bool" key="IndentDeclarationsRelativeToAccessSpecifiers">true</value>
+   <value type="bool" key="IndentEnumBraces">false</value>
+   <value type="bool" key="IndentFunctionBody">true</value>
+   <value type="bool" key="IndentFunctionBraces">false</value>
+   <value type="bool" key="IndentNamespaceBody">false</value>
+   <value type="bool" key="IndentNamespaceBraces">false</value>
+   <value type="int" key="IndentSize">4</value>
+   <value type="bool" key="IndentStatementsRelativeToSwitchLabels">true</value>
+   <value type="bool" key="IndentSwitchLabels">false</value>
+   <value type="int" key="PaddingMode">2</value>
+   <value type="bool" key="SpacesForTabs">false</value>
+   <value type="int" key="TabSize">4</value>
+  </valuemap>
+ </data>
+ <data>
+  <variable>DisplayName</variable>
+  <value type="QString">Synergy</value>
+ </data>
+</qtcreator>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE QtCreatorCodeStyle>
+<!-- Written by QtCreator 3.0.1, 2014-02-14T09:50:24. -->
+<qtcreator>
+ <data>
+  <variable>CodeStyleData</variable>
+  <valuemap type="QVariantMap">
+   <value type="bool" key="AlignAssignments">false</value>
+   <value type="bool" key="AutoSpacesForTabs">false</value>
+   <value type="bool" key="BindStarToIdentifier">true</value>
+   <value type="bool" key="BindStarToLeftSpecifier">false</value>
+   <value type="bool" key="BindStarToRightSpecifier">false</value>
+   <value type="bool" key="BindStarToTypeName">false</value>
+   <value type="bool" key="ExtraPaddingForConditionsIfConfusingAlign">true</value>
+   <value type="bool" key="IndentAccessSpecifiers">false</value>
+   <value type="bool" key="IndentBlockBody">true</value>
+   <value type="bool" key="IndentBlockBraces">false</value>
+   <value type="bool" key="IndentBlocksRelativeToSwitchLabels">false</value>
+   <value type="bool" key="IndentClassBraces">false</value>
+   <value type="bool" key="IndentControlFlowRelativeToSwitchLabels">true</value>
+   <value type="bool" key="IndentDeclarationsRelativeToAccessSpecifiers">true</value>
+   <value type="bool" key="IndentEnumBraces">false</value>
+   <value type="bool" key="IndentFunctionBody">true</value>
+   <value type="bool" key="IndentFunctionBraces">false</value>
+   <value type="bool" key="IndentNamespaceBody">false</value>
+   <value type="bool" key="IndentNamespaceBraces">false</value>
+   <value type="int" key="IndentSize">4</value>
+   <value type="bool" key="IndentStatementsRelativeToSwitchLabels">true</value>
+   <value type="bool" key="IndentSwitchLabels">false</value>
+   <value type="int" key="PaddingMode">2</value>
+   <value type="bool" key="SpacesForTabs">false</value>
+   <value type="int" key="TabSize">4</value>
+  </valuemap>
+ </data>
+ <data>
+  <variable>DisplayName</variable>
+  <value type="QString">Synergy</value>
+ </data>
+</qtcreator>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE QtCreatorCodeStyle>
+<!-- Written by QtCreator 3.0.1, 2014-02-14T09:50:24. -->
+<qtcreator>
+ <data>
+  <variable>CodeStyleData</variable>
+  <valuemap type="QVariantMap">
+   <value type="bool" key="AlignAssignments">false</value>
+   <value type="bool" key="AutoSpacesForTabs">false</value>
+   <value type="bool" key="BindStarToIdentifier">true</value>
+   <value type="bool" key="BindStarToLeftSpecifier">false</value>
+   <value type="bool" key="BindStarToRightSpecifier">false</value>
+   <value type="bool" key="BindStarToTypeName">false</value>
+   <value type="bool" key="ExtraPaddingForConditionsIfConfusingAlign">true</value>
+   <value type="bool" key="IndentAccessSpecifiers">false</value>
+   <value type="bool" key="IndentBlockBody">true</value>
+   <value type="bool" key="IndentBlockBraces">false</value>
+   <value type="bool" key="IndentBlocksRelativeToSwitchLabels">false</value>
+   <value type="bool" key="IndentClassBraces">false</value>
+   <value type="bool" key="IndentControlFlowRelativeToSwitchLabels">true</value>
+   <value type="bool" key="IndentDeclarationsRelativeToAccessSpecifiers">true</value>
+   <value type="bool" key="IndentEnumBraces">false</value>
+   <value type="bool" key="IndentFunctionBody">true</value>
+   <value type="bool" key="IndentFunctionBraces">false</value>
+   <value type="bool" key="IndentNamespaceBody">false</value>
+   <value type="bool" key="IndentNamespaceBraces">false</value>
+   <value type="int" key="IndentSize">4</value>
+   <value type="bool" key="IndentStatementsRelativeToSwitchLabels">true</value>
+   <value type="bool" key="IndentSwitchLabels">false</value>
+   <value type="int" key="PaddingMode">2</value>
+   <value type="bool" key="SpacesForTabs">false</value>
+   <value type="int" key="TabSize">4</value>
+  </valuemap>
+ </data>
+ <data>
+  <variable>DisplayName</variable>
+  <value type="QString">Synergy</value>
+ </data>
+</qtcreator>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE QtCreatorCodeStyle>
+<!-- Written by QtCreator 3.0.1, 2014-02-14T09:50:24. -->
+<qtcreator>
+ <data>
+  <variable>CodeStyleData</variable>
+  <valuemap type="QVariantMap">
+   <value type="bool" key="AlignAssignments">false</value>
+   <value type="bool" key="AutoSpacesForTabs">false</value>
+   <value type="bool" key="BindStarToIdentifier">true</value>
+   <value type="bool" key="BindStarToLeftSpecifier">false</value>
+   <value type="bool" key="BindStarToRightSpecifier">false</value>
+   <value type="bool" key="BindStarToTypeName">false</value>
+   <value type="bool" key="ExtraPaddingForConditionsIfConfusingAlign">true</value>
+   <value type="bool" key="IndentAccessSpecifiers">false</value>
+   <value type="bool" key="IndentBlockBody">true</value>
+   <value type="bool" key="IndentBlockBraces">false</value>
+   <value type="bool" key="IndentBlocksRelativeToSwitchLabels">false</value>
+   <value type="bool" key="IndentClassBraces">false</value>
+   <value type="bool" key="IndentControlFlowRelativeToSwitchLabels">true</value>
+   <value type="bool" key="IndentDeclarationsRelativeToAccessSpecifiers">true</value>
+   <value type="bool" key="IndentEnumBraces">false</value>
+   <value type="bool" key="IndentFunctionBody">true</value>
+   <value type="bool" key="IndentFunctionBraces">false</value>
+   <value type="bool" key="IndentNamespaceBody">false</value>
+   <value type="bool" key="IndentNamespaceBraces">false</value>
+   <value type="int" key="IndentSize">4</value>
+   <value type="bool" key="IndentStatementsRelativeToSwitchLabels">true</value>
+   <value type="bool" key="IndentSwitchLabels">false</value>
+   <value type="int" key="PaddingMode">2</value>
+   <value type="bool" key="SpacesForTabs">false</value>
+   <value type="int" key="TabSize">4</value>
+  </valuemap>
+ </data>
+ <data>
+  <variable>DisplayName</variable>
+  <value type="QString">Synergy</value>
+ </data>
+</qtcreator>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE QtCreatorCodeStyle>
+<!-- Written by QtCreator 3.0.1, 2014-02-14T09:50:24. -->
+<qtcreator>
+ <data>
+  <variable>CodeStyleData</variable>
+  <valuemap type="QVariantMap">
+   <value type="bool" key="AlignAssignments">false</value>
+   <value type="bool" key="AutoSpacesForTabs">false</value>
+   <value type="bool" key="BindStarToIdentifier">true</value>
+   <value type="bool" key="BindStarToLeftSpecifier">false</value>
+   <value type="bool" key="BindStarToRightSpecifier">false</value>
+   <value type="bool" key="BindStarToTypeName">false</value>
+   <value type="bool" key="ExtraPaddingForConditionsIfConfusingAlign">true</value>
+   <value type="bool" key="IndentAccessSpecifiers">false</value>
+   <value type="bool" key="IndentBlockBody">true</value>
+   <value type="bool" key="IndentBlockBraces">false</value>
+   <value type="bool" key="IndentBlocksRelativeToSwitchLabels">false</value>
+   <value type="bool" key="IndentClassBraces">false</value>
+   <value type="bool" key="IndentControlFlowRelativeToSwitchLabels">true</value>
+   <value type="bool" key="IndentDeclarationsRelativeToAccessSpecifiers">true</value>
+   <value type="bool" key="IndentEnumBraces">false</value>
+   <value type="bool" key="IndentFunctionBody">true</value>
+   <value type="bool" key="IndentFunctionBraces">false</value>
+   <value type="bool" key="IndentNamespaceBody">false</value>
+   <value type="bool" key="IndentNamespaceBraces">false</value>
+   <value type="int" key="IndentSize">4</value>
+   <value type="bool" key="IndentStatementsRelativeToSwitchLabels">true</value>
+   <value type="bool" key="IndentSwitchLabels">false</value>
+   <value type="int" key="PaddingMode">2</value>
+   <value type="bool" key="SpacesForTabs">false</value>
+   <value type="int" key="TabSize">4</value>
+  </valuemap>
+ </data>
+ <data>
+  <variable>DisplayName</variable>
+  <value type="QString">Synergy</value>
+ </data>
+</qtcreator>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE QtCreatorCodeStyle>
+<!-- Written by QtCreator 3.0.1, 2014-02-14T09:50:24. -->
+<qtcreator>
+ <data>
+  <variable>CodeStyleData</variable>
+  <valuemap type="QVariantMap">
+   <value type="bool" key="AlignAssignments">false</value>
+   <value type="bool" key="AutoSpacesForTabs">false</value>
+   <value type="bool" key="BindStarToIdentifier">true</value>
+   <value type="bool" key="BindStarToLeftSpecifier">false</value>
+   <value type="bool" key="BindStarToRightSpecifier">false</value>
+   <value type="bool" key="BindStarToTypeName">false</value>
+   <value type="bool" key="ExtraPaddingForConditionsIfConfusingAlign">true</value>
+   <value type="bool" key="IndentAccessSpecifiers">false</value>
+   <value type="bool" key="IndentBlockBody">true</value>
+   <value type="bool" key="IndentBlockBraces">false</value>
+   <value type="bool" key="IndentBlocksRelativeToSwitchLabels">false</value>
+   <value type="bool" key="IndentClassBraces">false</value>
+   <value type="bool" key="IndentControlFlowRelativeToSwitchLabels">true</value>
+   <value type="bool" key="IndentDeclarationsRelativeToAccessSpecifiers">true</value>
+   <value type="bool" key="IndentEnumBraces">false</value>
+   <value type="bool" key="IndentFunctionBody">true</value>
+   <value type="bool" key="IndentFunctionBraces">false</value>
+   <value type="bool" key="IndentNamespaceBody">false</value>
+   <value type="bool" key="IndentNamespaceBraces">false</value>
+   <value type="int" key="IndentSize">4</value>
+   <value type="bool" key="IndentStatementsRelativeToSwitchLabels">true</value>
+   <value type="bool" key="IndentSwitchLabels">false</value>
+   <value type="int" key="PaddingMode">2</value>
+   <value type="bool" key="SpacesForTabs">false</value>
+   <value type="int" key="TabSize">4</value>
+  </valuemap>
+ </data>
+ <data>
+  <variable>DisplayName</variable>
+  <value type="QString">Synergy</value>
+ </data>
+</qtcreator>

doc/UpdateManpages.txt

@@ -1,10 +0,0 @@
-To recreate the generated part of barrierc manpage use a command like:
-  help2man -N --output=barrierc.1 --name='Barrier Keyboard/Mouse Client' /path/to/barrierc
-
-And for barriers:
-  help2man -N --output=barriers.1 --name='Barrier Keyboard/Mouse Server' /path/to/barriers
-
-After that manually fixup:
- * replace your home directory with $HOME in barriers.1
- * revert formatting of FILES and COPYRIGHT sections to match formatting of existing version.
- * add note referencing this file for instructions to the first line.

doc/barrier.conf.example-barebones

@@ -1,17 +0,0 @@
-# barebones barrier.conf example
-# for two computers side by side
-# replace screen.name.server and screen.name.client with your screen names from gui
-# there's a 50/50 chance you'll want to swap left and right
-# save this as barrier.conf in your home folder and "Use existing configuration" on server
-
-section: screens
-  screen.name.server:
-  screen.name.client:
-end
-
-section: links
-  screen.name.server:
-    left = screen.name.client
-  screen.name.client:
-    right = screen.name.server
-end

doc/barrierc.1

@@ -1,73 +0,0 @@
-.\" See UpdateManpages.txt about modification of this file. Most of it was generated by help2man 1.47.8.
-.TH BARRIERC "1" "November 2019" "barrierc 2.4.0-release" "User Commands"
-.SH NAME
-barrierc \- Barrier Keyboard/Mouse Client
-.SH SYNOPSIS
-.B barrierc
-[\fI\,--yscroll <delta>\/\fR] [\fI\,--display <display>\/\fR] [\fI\,--no-xinitthreads\/\fR] [\fI\,--daemon|--no-daemon\/\fR] [\fI\,--name <screen-name>\/\fR] [\fI\,--restart|--no-restart\/\fR] [\fI\,--debug <level>\/\fR] \fI\,<server-address>\/\fR
-.SH DESCRIPTION
-Start the barrier client and connect to a remote server component.
-.SH OPTIONS
-.TP
-\fB\-d\fR, \fB\-\-debug\fR <level>
-filter out log messages with priority below level.
-level may be: FATAL, ERROR, WARNING, NOTE, INFO,
-DEBUG, DEBUG1, DEBUG2.
-.TP
-\fB\-n\fR, \fB\-\-name\fR <screen\-name> use screen\-name instead the hostname to identify
-this screen in the configuration.
-.TP
-\fB\-1\fR, \fB\-\-no\-restart\fR
-do not try to restart on failure.
-.TP
-\fB\-\-restart\fR
-restart the server automatically if it fails. (*)
-.TP
-\fB\-l\fR  \fB\-\-log\fR <file>
-write log messages to file.
-.TP
-\fB\-\-no\-tray\fR
-disable the system tray icon.
-.TP
-\fB\-\-enable\-drag\-drop\fR
-enable file drag & drop.
-.TP
-\fB\-\-enable\-crypto\fR
-enable the crypto (ssl) plugin.
-.TP
-\fB\-\-display\fR <display>
-connect to the X server at <display>
-.TP
-\fB\-\-no\-xinitthreads\fR
-do not call XInitThreads()
-.TP
-\fB\-f\fR, \fB\-\-no\-daemon\fR
-run in the foreground.
-.TP
-\fB\-\-daemon\fR
-run as a daemon. (*)
-.TP
-\fB\-\-yscroll\fR <delta>
-defines the vertical scrolling delta, which is
-120 by default.
-.TP
-\fB\-h\fR, \fB\-\-help\fR
-display this help and exit.
-.TP
-\fB\-\-version\fR
-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. 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
-Copyright \(co 2012\-2016 Symless Ltd.
-.br
-Copyright \(co 2008\-2014 Nick Bolton
-.br
-Copyright \(co 2002\-2014 Chris Schoeneman

doc/barriers.1

@@ -1,87 +0,0 @@
-.\" See UpdateManpages.txt about modification of this file. Most of it was generated by help2man 1.47.8.
-.TH BARRIERS "1" "November 2019" "barriers 2.4.0-release" "User Commands"
-.SH NAME
-barriers \- Barrier Keyboard/Mouse Server
-.SH SYNOPSIS
-.B barriers
-[\fI\,--address <address>\/\fR] [\fI\,--config <pathname>\/\fR] [\fI\,--display <display>\/\fR] [\fI\,--no-xinitthreads\/\fR] [\fI\,--daemon|--no-daemon\/\fR] [\fI\,--name <screen-name>\/\fR] [\fI\,--restart|--no-restart\/\fR] [\fI\,--debug <level>\/\fR]
-.SH DESCRIPTION
-Start the barrier server component.
-.SH OPTIONS
-.TP
-\fB\-a\fR, \fB\-\-address\fR <address>
-listen for clients on the given address.
-.TP
-\fB\-c\fR, \fB\-\-config\fR <pathname>
-use the named configuration file instead.
-.TP
-\fB\-d\fR, \fB\-\-debug\fR <level>
-filter out log messages with priority below level.
-level may be: FATAL, ERROR, WARNING, NOTE, INFO,
-DEBUG, DEBUG1, DEBUG2.
-.TP
-\fB\-n\fR, \fB\-\-name\fR <screen\-name> use screen\-name instead the hostname to identify
-this screen in the configuration.
-.TP
-\fB\-1\fR, \fB\-\-no\-restart\fR
-do not try to restart on failure.
-.TP
-\fB\-\-restart\fR
-restart the server automatically if it fails. (*)
-.TP
-\fB\-l\fR  \fB\-\-log\fR <file>
-write log messages to file.
-.TP
-\fB\-\-no\-tray\fR
-disable the system tray icon.
-.TP
-\fB\-\-enable\-drag\-drop\fR
-enable file drag & drop.
-.TP
-\fB\-\-enable\-crypto\fR
-enable the crypto (ssl) plugin.
-.TP
-\fB\-\-display\fR <display>
-connect to the X server at <display>
-.TP
-\fB\-\-no\-xinitthreads\fR
-do not call XInitThreads()
-.TP
-\fB\-\-screen\-change\-script\fR <path>
-full path to script to run on screen change
-first argument is the new screen name
-.TP
-\fB\-f\fR, \fB\-\-no\-daemon\fR
-run in the foreground.
-.TP
-\fB\-\-daemon\fR
-run as a daemon. (*)
-.TP
-\fB\-h\fR, \fB\-\-help\fR
-display this help and exit.
-.TP
-\fB\-\-version\fR
-display version information and exit.
-.PP
-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.
-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.
-.SH FILES
-If no configuration file pathname is provided then the first of the
-following to load successfully sets the configuration:
-.IP
-.I $HOME/.local/share/barrier/.barrier.conf
-.br
-.I /etc/barrier.conf
-.SH COPYRIGHT
-Copyright \(co 2018 Debauchee Open Source Group
-.br
-Copyright \(co 2012\-2016 Symless Ltd.
-.br
-Copyright \(co 2008\-2014 Nick Bolton
-.br
-Copyright \(co 2002\-2014 Chris Schoeneman

doc/newsfragments/1260_macos-launchinfo.bugfix

@@ -1 +0,0 @@
-Corrected macOS packaging to provide a better error message when a user attempts to launch Barrier on an incompatible macOS version. (https://github.com/debauchee/barrier/issues/1260).

doc/newsfragments/1260_update-faqs.doc

@@ -1 +0,0 @@
-Updated FAQs in project README.md with more detail on OS support and links to issues for infrequent users. (https://github.com/debauchee/barrier/issues/1260).

doc/newsfragments/README.md

@@ -1,13 +0,0 @@
-This is the directory for release note fragments processed by
-[towncrier](https://github.com/hawkowl/towncrier).
-
-When making a user-visible change create a file in this directory and it will be automatically be
-included into the release note document when the next release is published.
-
-The file extension specifies the type of a change. The following are currently supported:
-
- - .feature: a new feature.
- - .bugfix: a bug fix.
- - .security: a fix for security issue.
- - .doc: a documentation improvement.
- - .removal: a deprecation or removal of functionality.

doc/newsfragments/fix-wrong-encoding-for-text-copied-between-linux-and-windows.bugfix

@@ -1,2 +0,0 @@
-Fix wrong encoding for text copied between Linux and Windows
-(https://github.com/debauchee/barrier/issues/1037, https://github.com/debauchee/barrier/issues/1137).

doc/newsfragments/gcc-11-build.bugfix

@@ -1 +0,0 @@
-Fixed build on GCC 11.2 (https://github.com/debauchee/barrier/issues/1366).

doc/newsfragments/japanese-translation.bugfix

@@ -1,2 +0,0 @@
-Updated Japanese translation.
-Add and translate strings that are not in gui.ts. Minor string adjustment, Fix wrong or duplicate shortcut keys.

doc/newsfragments/linux-drag-drop-faq.doc

@@ -1 +0,0 @@
-Fixed FAQ link to Linux drag and drop issue.

doc/newsfragments/restore-dpiawareness.bugfix

@@ -1 +0,0 @@
-Fixed a regression in 2.4.0 that caused Barrier to not support scaling other than 100% (https://github.com/debauchee/barrier/issues/1462).

doc/org.barrier-foss.org.barrierc.plist

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN"
-    "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<!-- Mac OSX only: Copy this plist file into [~]/Library/LaunchAgents to start barrier client automatically. Make sure you change the IP below. -->
-<dict>
-    <key>Label</key>
-    <string>org.debauchee.com.barrierc.plist</string>
-    <key>OnDemand</key>
-    <false/>
-    <key>ProgramArguments</key>
-    <array>
-        <string>/usr/bin/barrierc</string>
-        <!-- Replace this IP with the IP of your barriers server -->
-        <string>192.168.0.2</string>
-    </array>
-    <key>RunAtLoad</key>
-    <true/>
-</dict>
-</plist>

doc/org.synergy-foss.org.synergyc.plist

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN"
+    "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<!-- Mac OSX only: Copy this plist file into [~]/Library/LaunchAgents to start synergy client automatically. Make sure you change the IP below. -->
+<dict>
+     <key>Label</key>
+     <string>org.symless.com.synergyc.plist</string>
+     <key>OnDemand</key>
+     <false/>
+     <key>ProgramArguments</key>
+     <array>
+        <string>/usr/bin/synergyc</string>
+        <!-- Replace this IP with the IP of your synergys server -->
+        <string>192.168.0.2</string>
+     </array>
+     <key>RunAtLoad</key>
+     <true/>
+</dict>
+</plist>

doc/org.synergy-foss.org.synergys.plist

@@ -2,19 +2,19 @@
 <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN"
     "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
-<!-- Mac OSX only: Copy this plist file into [~]/Library/LaunchAgents to start barrier server automatically. Make sure you change configuration file below -->
+<!-- Mac OSX only: Copy this plist file into [~]/Library/LaunchAgents to start synergy server automatically. Make sure you change configuration file below -->
 <dict>
-    <key>Label</key>
-    <string>org.debauchee.com.barriers.plist</string>
-    <key>OnDemand</key>
-    <false/>
-    <key>ProgramArguments</key>
-    <array>
-        <string>/usr/bin/barriers</string>
+     <key>Label</key>
+     <string>org.symless.com.synergys.plist</string>
+     <key>OnDemand</key>
+     <false/>
+     <key>ProgramArguments</key>
+     <array>
+        <string>/usr/bin/synergys</string>
             <string>--no-daemon</string>
             <string>--config</string>
-            <!-- Replace this path with the path to your barrier configuration -->
-            <string>/Users/snorp/.barrier.conf</string>
+            <!-- Replace this path with the path to your synergy configuration -->
+            <string>/Users/snorp/.synergy.conf</string>
     </array>
     <key>RunAtLoad</key>
     <true/>

doc/release_notes/index.md

@@ -1,98 +0,0 @@
-Release notes
-=============
-
-[comment]: <> (towncrier release notes start)
-
-Barrier `2.4.0` ( `2021-11-01` )
-================================
-
-Security fixes
---------------
-
-- Barrier now supports client identity verification (fixes CVE-2021-42072, CVE-2021-42073).
-
-  Previously a malicious client could connect to Barrier server without any authentication and
-  send application-level messages. This made the attack surface of Barrier significantly larger.
-  Additionally, in case the malicious client got possession of a valid screen name by brute forcing
-  or other means it could modify the clipboard contents of the server.
-
-  To support seamless upgrades from older versions of Barrier this is currently disabled by default.
-  The feature can be enabled in the settings dialog. If enabled, older clients of Barrier will be
-  rejected.
-
-- Barrier now uses SHA256 fingerprints for establishing security of encrypted SSL connections.
-  After upgrading client to new version the existing server fingerprint will need to be approved
-  again. Client and server will show both SHA1 and SHA256 server fingerprints to allow
-  interoperability with older versions of Barrier.
-
-All of the above security issues have been reported by Matthias Gerstner who was really helpful
-resolving them.
-
-Bug fixes
----------
-
-- Fixed build failure on mips*el and riscv64 architecture.
-- Fixed reading of configuration on Windows when the paths contain non-ASCII characters
-(https://github.com/debauchee/barrier/issues/976, https://github.com/debauchee/barrier/issues/974,
- https://github.com/debauchee/barrier/issues/444).
-- Barrier no longer uses openssl CLI tool for any operations and hooks into the openssl library directly.
-- More X11 clipboard MIME types have been mapped to corresponding converters (https://github.com/debauchee/barrier/issues/344).
-- Fixed setup of multiple actions associated with a hotkey.
-- Fixed setup of hotkeys with special characters such as comma and semicolon
-  (https://github.com/debauchee/barrier/issues/778).
-- Fixed transfer of non-ASCII characters coming from a Windows server in certain cases
- (https://github.com/debauchee/barrier/issues/527).
-- Barrier will now regenerate server certificate if it's invalid instead of failing to launch
- (https://github.com/debauchee/barrier/issues/802)
-- Added support for additional keys on Sun Microsystems USB keyboards
- (https://github.com/debauchee/barrier/issues/784).
-- Updated Chinese translation.
-- Updated Slovak translation.
-- Theme icons are now preferred to icons distributed together with Barrier
- (https://github.com/debauchee/barrier/issues/471).
-- Fixed incorrect setup of Barrier service path on Windows.
-
-Features
---------
-
-- Added `--drop-target` option that improves drag and drop support on Windows when Barrier is
-  being run as a portable app.
-- The `--enable-crypto` command line option has been made the default to reduce chances of
-  accidental security mishaps when configuring Barrier from command line.
-  A new `--disable-crypto` command line option has been added to explicitly disable encryption.
-- Added support for randomart images for easier comparison of SSL certificate fingerprints.
-  The algorithm is identical to what OpenSSH uses.
-- Implemented a configuration option for Server GUI auto-start.
-- Made it possible to use keyboard instead of mouse to modify screen layout.
-- Added support for keyboard backlight media keys
-- Added support for Eisu_toggle and Muhenkan keys
-- Added `--profile-dir` option that allows to select custom profile directory.
-
-Barrier `2.3.4` ( `2021-11-01` )
-================================
-
-Security fixes
---------------
-
-- Barrier will now correctly close connections when the app-level handshake fails (fixes CVE-2021-42075).
-
-  Previously repeated failing connections would leak file descriptors leading to Barrier being unable
-  to receive new connections from clients.
-
-- Barrier will now enforce a maximum length of input messages (fixes CVE-2021-42076).
-
-  Previously it was possible for a malicious client or server to send excessive length messages
-  leading to denial of service by resource exhaustion.
-
-- Fixed a bug which caused Barrier to crash when disconnecting a TCP session just after sending
-  Hello message (fixes CVE-2021-42074).
-  This bug allowed an unauthenticated attacker to crash Barrier with only network access.
-
-All of the above security issues have been reported by Matthias Gerstner who was really helpful
-resolving them.
-
-Bug fixes
----------
-
-- Fixed a bug in SSL implementation that caused invalid data occasionally being sent to clients
-  under heavy load.

doc/release_notes/index.template.jinja

@@ -1,37 +0,0 @@
-{% for section, _ in sections|dictsort(by='key') %}
-{% set underline = "-" %}
-{% if section %}
-{{section}}
-{{ underline * section|length }}{% set underline = "-" %}
-
-{% endif %}
-{% if sections[section] %}
-{% for category, val in definitions|dictsort if category in sections[section]%}
-
-{{ definitions[category]['name'] }}
-{{ underline * definitions[category]['name']|length }}
-
-{% if definitions[category]['showcontent'] %}
-{% for text, values in sections[section][category]|dictsort(by='value') %}
-- {{ text }}
-{% endfor %}
-{% else %}
-- {{ sections[section][category]['']|sort|join(', ') }}
-
-
-{% endif %}
-{% if sections[section][category]|length == 0 %}
-
-No significant changes.
-
-
-{% else %}
-{% endif %}
-{% endfor %}
-{% else %}
-
-No significant changes.
-
-
-{% endif %}
-{% endfor %}

doc/synergy.conf.example

@@ -1,4 +1,4 @@
-# sample barrier configuration file
+# sample synergy configuration file
 #
 # comments begin with the # character and continue to the end of
 # line.  comments may appear anywhere the syntax permits.

doc/synergy.conf.example-advanced

@@ -1,4 +1,4 @@
-# sample barrier configuration file
+# sample synergy configuration file
 #
 # comments begin with the # character and continue to the end of
 # line.  comments may appear anywhere the syntax permits.
@@ -47,9 +47,9 @@ section: links
 end
 
 # The aliases section is to map the full names of the computers to their logical names used in the screens section
-# One way to find the actual name of a computer is to run hostname from a command window
+# One way to find the actual name of a comptuer is to run hostname from a command window
 section: aliases
 	# Laptop is actually known as John-Smiths-MacBook-3.local
-	John-Smiths-MacBook-3.local:
-		desktop2
+	desktop2:
+		John-Smiths-MacBook-3.local
 end

doc/synergy.conf.example-basic

@@ -1,4 +1,4 @@
-# sample barrier configuration file
+# sample synergy configuration file
 #
 # comments begin with the # character and continue to the end of
 # line.  comments may appear anywhere the syntax permits.
@@ -34,6 +34,6 @@ end
 
 section: aliases
 	# The "real" name of iMac is John-Smiths-iMac-3.local. If we wanted we could remove this alias and instead use John-Smiths-iMac-3.local everywhere iMac is above. Hopefully it should be easy to see why using an alias is nicer
-	John-Smiths-iMac-3.local:
-		iMac
+	iMac:
+		John-Smiths-iMac-3.local
 end

doc/synergyc.man

@@ -0,0 +1,47 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.38.2.
+.TH SYNERGYC "1" "June 2010" "synergyc 1.5.0, protocol version 1.3" "User Commands"
+.SH NAME
+synergyc \- manual page for synergyc 1.5.0, protocol version 1.3
+.SH SYNOPSIS
+.B synergyc
+[\fI--yscroll <delta>\fR] [\fI--daemon|--no-daemon\fR] [\fI--name <screen-name>\fR] [\fI--restart|--no-restart\fR] [\fI--debug <level>\fR] \fI<server-address>\fR
+.SH DESCRIPTION
+Connect to a synergy mouse/keyboard sharing server.
+.TP
+\fB\-d\fR, \fB\-\-debug\fR <level>
+filter out log messages with priority below level.
+level may be: FATAL, ERROR, WARNING, NOTE, INFO,
+DEBUG, DEBUGn (1\-5).
+.TP
+\fB\-n\fR, \fB\-\-name\fR <screen\-name> use screen\-name instead the hostname to identify
+this screen in the configuration.
+.TP
+\fB\-1\fR, \fB\-\-no\-restart\fR
+do not try to restart on failure.
+.PP
+*     \fB\-\-restart\fR            restart the server automatically if it fails.
+.TP
+\fB\-l\fR  \fB\-\-log\fR <file>
+write log messages to file.
+.TP
+\fB\-f\fR, \fB\-\-no\-daemon\fR
+run in the foreground.
+.PP
+*     \fB\-\-daemon\fR             run as a daemon.
+.TP
+\fB\-\-yscroll\fR <delta>
+defines the vertical scrolling delta, which is
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+display this help and exit.
+.TP
+\fB\-\-version\fR
+display version information and exit.
+.PP
+* marks defaults.
+.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.
+.SH COPYRIGHT
+Copyright \(co 2010 Chris Schoeneman, Nick Bolton, Sorin Sbarnea

doc/synergys.man

@@ -0,0 +1,57 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.38.2.
+.TH SYNERGYS "1" "June 2010" "synergys 1.5.0, protocol version 1.3" "User Commands"
+.SH NAME
+synergys \- manual page for synergys 1.5.0, protocol version 1.3
+.SH SYNOPSIS
+.B synergys
+[\fI--address <address>\fR] [\fI--config <pathname>\fR] [\fI--daemon|--no-daemon\fR] [\fI--name <screen-name>\fR] [\fI--restart|--no-restart\fR] [\fI--debug <level>\fR]
+.SH DESCRIPTION
+Start the synergy mouse/keyboard sharing server.
+.TP
+\fB\-a\fR, \fB\-\-address\fR <address>
+listen for clients on the given address.
+.TP
+\fB\-c\fR, \fB\-\-config\fR <pathname>
+use the named configuration file instead.
+.TP
+\fB\-d\fR, \fB\-\-debug\fR <level>
+filter out log messages with priority below level.
+level may be: FATAL, ERROR, WARNING, NOTE, INFO,
+DEBUG, DEBUGn (1\-5).
+.TP
+\fB\-n\fR, \fB\-\-name\fR <screen\-name> use screen\-name instead the hostname to identify
+this screen in the configuration.
+.TP
+\fB\-1\fR, \fB\-\-no\-restart\fR
+do not try to restart on failure.
+.PP
+*     \fB\-\-restart\fR            restart the server automatically if it fails.
+.TP
+\fB\-l\fR  \fB\-\-log\fR <file>
+write log messages to file.
+.TP
+\fB\-f\fR, \fB\-\-no\-daemon\fR
+run in the foreground.
+.PP
+*     \fB\-\-daemon\fR             run as a daemon.
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+display this help and exit.
+.TP
+\fB\-\-version\fR
+display version information and exit.
+.PP
+* marks defaults.
+.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.
+.PP
+If no configuration file pathname is provided then the first of the
+following to load successfully sets the configuration:
+.IP
+$HOME/.synergy.conf
+/etc/synergy.conf
+.SH COPYRIGHT
+Copyright \(co 2010 Chris Schoeneman, Nick Bolton, Sorin Sbarnea

ext/gmock

@@ -1 +0,0 @@
-Subproject commit 7d33fee11ec480beae4c28ad09ca56d974140a72

ext/gmock/CHANGES

@@ -0,0 +1,92 @@
+Changes for 1.6.0:
+
+* Compilation is much faster and uses much less memory, especially
+  when the constructor and destructor of a mock class are moved out of
+  the class body.
+* New matchers: Pointwise(), Each().
+* New actions: ReturnPointee() and ReturnRefOfCopy().
+* CMake support.
+* Project files for Visual Studio 2010.
+* AllOf() and AnyOf() can handle up-to 10 arguments now.
+* Google Mock doctor understands Clang error messages now.
+* SetArgPointee<> now accepts string literals.
+* gmock_gen.py handles storage specifier macros and template return
+  types now.
+* Compatibility fixes.
+* Bug fixes and implementation clean-ups.
+* Potentially incompatible changes: disables the harmful 'make install'
+  command in autotools.
+
+Potentially breaking changes:
+
+* The description string for MATCHER*() changes from Python-style
+  interpolation to an ordinary C++ string expression.
+* SetArgumentPointee is deprecated in favor of SetArgPointee.
+* Some non-essential project files for Visual Studio 2005 are removed.
+
+Changes for 1.5.0:
+
+ * New feature: Google Mock can be safely used in multi-threaded tests
+   on platforms having pthreads.
+ * New feature: function for printing a value of arbitrary type.
+ * New feature: function ExplainMatchResult() for easy definition of
+   composite matchers.
+ * The new matcher API lets user-defined matchers generate custom
+   explanations more directly and efficiently.
+ * Better failure messages all around.
+ * NotNull() and IsNull() now work with smart pointers.
+ * Field() and Property() now work when the matcher argument is a pointer
+   passed by reference.
+ * Regular expression matchers on all platforms.
+ * Added GCC 4.0 support for Google Mock Doctor.
+ * Added gmock_all_test.cc for compiling most Google Mock tests
+   in a single file.
+ * Significantly cleaned up compiler warnings.
+ * Bug fixes, better test coverage, and implementation clean-ups.
+
+ Potentially breaking changes:
+
+ * Custom matchers defined using MatcherInterface or MakePolymorphicMatcher()
+   need to be updated after upgrading to Google Mock 1.5.0; matchers defined
+   using MATCHER or MATCHER_P* aren't affected.
+ * Dropped support for 'make install'.
+
+Changes for 1.4.0 (we skipped 1.2.* and 1.3.* to match the version of
+Google Test):
+
+ * Works in more environments: Symbian and minGW, Visual C++ 7.1.
+ * Lighter weight: comes with our own implementation of TR1 tuple (no
+   more dependency on Boost!).
+ * New feature: --gmock_catch_leaked_mocks for detecting leaked mocks.
+ * New feature: ACTION_TEMPLATE for defining templatized actions.
+ * New feature: the .After() clause for specifying expectation order.
+ * New feature: the .With() clause for for specifying inter-argument
+   constraints.
+ * New feature: actions ReturnArg<k>(), ReturnNew<T>(...), and
+   DeleteArg<k>().
+ * New feature: matchers Key(), Pair(), Args<...>(), AllArgs(), IsNull(),
+   and Contains().
+ * New feature: utility class MockFunction<F>, useful for checkpoints, etc.
+ * New feature: functions Value(x, m) and SafeMatcherCast<T>(m).
+ * New feature: copying a mock object is rejected at compile time.
+ * New feature: a script for fusing all Google Mock and Google Test
+   source files for easy deployment.
+ * Improved the Google Mock doctor to diagnose more diseases.
+ * Improved the Google Mock generator script.
+ * Compatibility fixes for Mac OS X and gcc.
+ * Bug fixes and implementation clean-ups.
+
+Changes for 1.1.0:
+
+ * New feature: ability to use Google Mock with any testing framework.
+ * New feature: macros for easily defining new matchers
+ * New feature: macros for easily defining new actions.
+ * New feature: more container matchers.
+ * New feature: actions for accessing function arguments and throwing
+   exceptions.
+ * Improved the Google Mock doctor script for diagnosing compiler errors.
+ * Bug fixes and implementation clean-ups.
+
+Changes for 1.0.0:
+
+ * Initial Open Source release of Google Mock

ext/gmock/CMakeLists.txt

@@ -0,0 +1,151 @@
+########################################################################
+# CMake build script for Google Mock.
+#
+# To run the tests for Google Mock itself on Linux, use 'make test' or
+# ctest.  You can select which tests to run using 'ctest -R regex'.
+# For more options, run 'ctest --help'.
+
+# BUILD_SHARED_LIBS is a standard CMake variable, but we declare it here to
+# make it prominent in the GUI.
+option(BUILD_SHARED_LIBS "Build shared libraries (DLLs)." OFF)
+
+# Forces BUILD_SHARED_LIBS to OFF as Google Mock currently does not support
+# working in a DLL.
+# TODO(vladl@google.com): Implement building gMock as a DLL.
+set(BUILD_SHARED_LIBS OFF)
+
+option(gmock_build_tests "Build all of Google Mock's own tests." OFF)
+
+# A directory to find Google Test sources.
+if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/gtest/CMakeLists.txt")
+  set(gtest_dir gtest)
+else()
+  set(gtest_dir ../gtest)
+endif()
+
+# Defines pre_project_set_up_hermetic_build() and set_up_hermetic_build().
+include("${gtest_dir}/cmake/hermetic_build.cmake" OPTIONAL)
+
+if (COMMAND pre_project_set_up_hermetic_build)
+  # Google Test also calls hermetic setup functions from add_subdirectory,
+  # although its changes will not affect things at the current scope.
+  pre_project_set_up_hermetic_build()
+endif()
+
+########################################################################
+#
+# Project-wide settings
+
+# Name of the project.
+#
+# CMake files in this project can refer to the root source directory
+# as ${gmock_SOURCE_DIR} and to the root binary directory as
+# ${gmock_BINARY_DIR}.
+# Language "C" is required for find_package(Threads).
+project(gmock CXX C)
+cmake_minimum_required(VERSION 2.6.2)
+
+if (COMMAND set_up_hermetic_build)
+  set_up_hermetic_build()
+endif()
+
+# Instructs CMake to process Google Test's CMakeLists.txt and add its
+# targets to the current scope.  We are placing Google Test's binary
+# directory in a subdirectory of our own as VC compilation may break
+# if they are the same (the default).
+add_subdirectory("${gtest_dir}" "${gmock_BINARY_DIR}/gtest")
+
+# Although Google Test's CMakeLists.txt calls this function, the
+# changes there don't affect the current scope.  Therefore we have to
+# call it again here.
+config_compiler_and_linker()  # from ${gtest_dir}/cmake/internal_utils.cmake
+
+# Adds Google Mock's and Google Test's header directories to the search path.
+include_directories("${gmock_SOURCE_DIR}/include"
+                    "${gmock_SOURCE_DIR}"
+                    "${gtest_SOURCE_DIR}/include"
+                    # This directory is needed to build directly from Google
+                    # Test sources.
+                    "${gtest_SOURCE_DIR}")
+
+########################################################################
+#
+# Defines the gmock & gmock_main libraries.  User tests should link
+# with one of them.
+
+# Google Mock libraries.  We build them using more strict warnings than what
+# are used for other targets, to ensure that Google Mock can be compiled by
+# a user aggressive about warnings.
+cxx_library(gmock "${cxx_strict}" src/gmock-all.cc)
+target_link_libraries(gmock gtest)
+
+cxx_library(gmock_main "${cxx_strict}" src/gmock_main.cc)
+target_link_libraries(gmock_main gmock)
+
+########################################################################
+#
+# Google Mock's own tests.
+#
+# You can skip this section if you aren't interested in testing
+# Google Mock itself.
+#
+# The tests are not built by default.  To build them, set the
+# gmock_build_tests option to ON.  You can do it by running ccmake
+# or specifying the -Dgmock_build_tests=ON flag when running cmake.
+
+if (gmock_build_tests)
+  # This must be set in the root directory for the tests to be run by
+  # 'make test' or ctest.
+  enable_testing()
+
+  ############################################################
+  # C++ tests built with standard compiler flags.
+
+  cxx_test(gmock-actions_test gmock_main)
+  cxx_test(gmock-cardinalities_test gmock_main)
+  cxx_test(gmock-generated-actions_test gmock_main)
+  cxx_test(gmock-generated-function-mockers_test gmock_main)
+  cxx_test(gmock-generated-internal-utils_test gmock_main)
+  cxx_test(gmock-generated-matchers_test gmock_main)
+  cxx_test(gmock-internal-utils_test gmock_main)
+  cxx_test(gmock-matchers_test gmock_main)
+  cxx_test(gmock-more-actions_test gmock_main)
+  cxx_test(gmock-nice-strict_test gmock_main)
+  cxx_test(gmock-port_test gmock_main)
+  cxx_test(gmock-spec-builders_test gmock_main)
+  cxx_test(gmock_link_test gmock_main test/gmock_link2_test.cc)
+  # cxx_test(gmock_stress_test gmock)
+  cxx_test(gmock_test gmock_main)
+
+  # gmock_all_test is commented to save time building and running tests.
+  # Uncomment if necessary.
+  # cxx_test(gmock_all_test gmock_main)
+
+  ############################################################
+  # C++ tests built with non-standard compiler flags.
+
+  cxx_library(gmock_main_no_exception "${cxx_no_exception}"
+    "${gtest_dir}/src/gtest-all.cc" src/gmock-all.cc src/gmock_main.cc)
+  cxx_library(gmock_main_no_rtti "${cxx_no_rtti}"
+    "${gtest_dir}/src/gtest-all.cc" src/gmock-all.cc src/gmock_main.cc)
+  cxx_library(gmock_main_use_own_tuple "${cxx_use_own_tuple}"
+    "${gtest_dir}/src/gtest-all.cc" src/gmock-all.cc src/gmock_main.cc)
+
+  cxx_test_with_flags(gmock-more-actions_no_exception_test "${cxx_no_exception}"
+    gmock_main_no_exception test/gmock-more-actions_test.cc)
+
+  cxx_test_with_flags(gmock_no_rtti_test "${cxx_no_rtti}"
+    gmock_main_no_rtti test/gmock-spec-builders_test.cc)
+
+  cxx_test_with_flags(gmock_use_own_tuple_test "${cxx_use_own_tuple}"
+    gmock_main_use_own_tuple test/gmock-spec-builders_test.cc)
+
+  ############################################################
+  # Python tests.
+
+  cxx_executable(gmock_leak_test_ test gmock_main)
+  py_test(gmock_leak_test)
+
+  cxx_executable(gmock_output_test_ test gmock)
+  py_test(gmock_output_test)
+endif()

ext/gmock/CONTRIBUTORS

@@ -0,0 +1,40 @@
+# This file contains a list of people who've made non-trivial
+# contribution to the Google C++ Mocking Framework project.  People
+# who commit code to the project are encouraged to add their names
+# here.  Please keep the list sorted by first names.
+
+Benoit Sigoure <tsuna@google.com>
+Bogdan Piloca <boo@google.com>
+Chandler Carruth <chandlerc@google.com>
+Dave MacLachlan <dmaclach@gmail.com>
+David Anderson <danderson@google.com>
+Dean Sturtevant
+Gene Volovich <gv@cite.com>
+Hal Burch <gmock@hburch.com>
+Jeffrey Yasskin <jyasskin@google.com>
+Jim Keller <jimkeller@google.com>
+Joe Walnes <joe@truemesh.com>
+Jon Wray <jwray@google.com>
+Keir Mierle <mierle@gmail.com>
+Keith Ray <keith.ray@gmail.com>
+Kostya Serebryany <kcc@google.com>
+Lev Makhlis
+Manuel Klimek <klimek@google.com>
+Mario Tanev <radix@google.com>
+Mark Paskin
+Markus Heule <markus.heule@gmail.com>
+Matthew Simmons <simmonmt@acm.org>
+Mike Bland <mbland@google.com>
+Neal Norwitz <nnorwitz@gmail.com>
+Nermin Ozkiranartli <nermin@google.com>
+Owen Carlsen <ocarlsen@google.com>
+Paneendra Ba <paneendra@google.com>
+Paul Menage <menage@google.com>
+Piotr Kaminski <piotrk@google.com>
+Russ Rufer <russ@pentad.com>
+Sverre Sundsdal <sundsdal@gmail.com>
+Takeshi Yoshino <tyoshino@google.com>
+Vadim Berman <vadimb@google.com>
+Vlad Losev <vladl@google.com>
+Wolfgang Klier <wklier@google.com>
+Zhanyong Wan <wan@google.com>

ext/gmock/COPYING

@@ -0,0 +1,28 @@
+Copyright 2008, Google Inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+    * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+    * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

ext/gmock/Makefile.am

@@ -0,0 +1,209 @@
+# Automake file
+
+# Nonstandard package files for distribution.
+EXTRA_DIST =
+
+# We may need to build our internally packaged gtest. If so, it will be
+# included in the 'subdirs' variable.
+SUBDIRS = $(subdirs)
+
+# This is generated by the configure script, so clean it for distribution.
+DISTCLEANFILES = scripts/gmock-config
+
+# We define the global AM_CPPFLAGS as everything we compile includes from these
+# directories.
+AM_CPPFLAGS = $(GTEST_CPPFLAGS) -I$(srcdir)/include
+
+# Modifies compiler and linker flags for pthreads compatibility.
+if HAVE_PTHREADS
+  AM_CXXFLAGS = @PTHREAD_CFLAGS@ -DGTEST_HAS_PTHREAD=1
+  AM_LIBS = @PTHREAD_LIBS@
+endif
+
+# Build rules for libraries.
+lib_LTLIBRARIES = lib/libgmock.la lib/libgmock_main.la
+
+lib_libgmock_la_SOURCES = src/gmock-all.cc
+
+pkginclude_HEADERS = \
+  include/gmock/gmock-actions.h \
+  include/gmock/gmock-cardinalities.h \
+  include/gmock/gmock-generated-actions.h \
+  include/gmock/gmock-generated-function-mockers.h \
+  include/gmock/gmock-generated-matchers.h \
+  include/gmock/gmock-generated-nice-strict.h \
+  include/gmock/gmock-matchers.h \
+  include/gmock/gmock-more-actions.h \
+  include/gmock/gmock-spec-builders.h \
+  include/gmock/gmock.h
+
+pkginclude_internaldir = $(pkgincludedir)/internal
+pkginclude_internal_HEADERS = \
+  include/gmock/internal/gmock-generated-internal-utils.h \
+  include/gmock/internal/gmock-internal-utils.h \
+  include/gmock/internal/gmock-port.h
+
+lib_libgmock_main_la_SOURCES = src/gmock_main.cc
+lib_libgmock_main_la_LIBADD = lib/libgmock.la
+
+# Build rules for tests. Automake's naming for some of these variables isn't
+# terribly obvious, so this is a brief reference:
+#
+# TESTS -- Programs run automatically by "make check"
+# check_PROGRAMS -- Programs built by "make check" but not necessarily run
+
+TESTS=
+check_PROGRAMS=
+AM_LDFLAGS = $(GTEST_LDFLAGS)
+
+# This exercises all major components of Google Mock.  It also
+# verifies that libgmock works.
+TESTS += test/gmock-spec-builders_test
+check_PROGRAMS += test/gmock-spec-builders_test
+test_gmock_spec_builders_test_SOURCES = test/gmock-spec-builders_test.cc
+test_gmock_spec_builders_test_LDADD = $(GTEST_LIBS) lib/libgmock.la
+
+# This tests using Google Mock in multiple translation units.  It also
+# verifies that libgmock_main and libgmock work.
+TESTS += test/gmock_link_test
+check_PROGRAMS += test/gmock_link_test
+test_gmock_link_test_SOURCES = \
+  test/gmock_link2_test.cc \
+  test/gmock_link_test.cc \
+  test/gmock_link_test.h
+test_gmock_link_test_LDADD = $(GTEST_LIBS) lib/libgmock_main.la  lib/libgmock.la
+
+# Tests that fused gmock files compile and work.
+TESTS += test/gmock_fused_test
+check_PROGRAMS += test/gmock_fused_test
+test_gmock_fused_test_SOURCES = \
+  fused-src/gmock-gtest-all.cc \
+  fused-src/gmock/gmock.h \
+  fused-src/gmock_main.cc \
+  fused-src/gtest/gtest.h \
+  test/gmock_test.cc
+test_gmock_fused_test_CPPFLAGS = -I"$(srcdir)/fused-src"
+
+# Google Mock source files that we don't compile directly.
+GMOCK_SOURCE_INGLUDES = \
+  src/gmock-cardinalities.cc \
+  src/gmock-internal-utils.cc \
+  src/gmock-matchers.cc \
+  src/gmock-spec-builders.cc \
+  src/gmock.cc
+
+EXTRA_DIST += $(GMOCK_SOURCE_INGLUDES)
+
+# C++ tests that we don't compile using autotools.
+EXTRA_DIST += \
+  test/gmock-actions_test.cc \
+  test/gmock-cardinalities_test.cc \
+  test/gmock-generated-actions_test.cc \
+  test/gmock-generated-function-mockers_test.cc \
+  test/gmock-generated-internal-utils_test.cc \
+  test/gmock-generated-matchers_test.cc \
+  test/gmock-internal-utils_test.cc \
+  test/gmock-matchers_test.cc \
+  test/gmock-more-actions_test.cc \
+  test/gmock-nice-strict_test.cc \
+  test/gmock-port_test.cc \
+  test/gmock_all_test.cc
+
+# Python tests, which we don't run using autotools.
+EXTRA_DIST += \
+  test/gmock_leak_test.py \
+  test/gmock_leak_test_.cc \
+  test/gmock_output_test.py \
+  test/gmock_output_test_.cc \
+  test/gmock_output_test_golden.txt \
+  test/gmock_test_utils.py
+
+# Nonstandard package files for distribution.
+EXTRA_DIST += \
+  CHANGES \
+  CONTRIBUTORS \
+  make/Makefile
+
+# Pump scripts for generating Google Mock headers.
+# TODO(chandlerc@google.com): automate the generation of *.h from *.h.pump.
+EXTRA_DIST += \
+  include/gmock/gmock-generated-actions.h.pump \
+  include/gmock/gmock-generated-function-mockers.h.pump \
+  include/gmock/gmock-generated-matchers.h.pump \
+  include/gmock/gmock-generated-nice-strict.h.pump \
+  include/gmock/internal/gmock-generated-internal-utils.h.pump
+
+# Script for fusing Google Mock and Google Test source files.
+EXTRA_DIST += scripts/fuse_gmock_files.py
+
+# The Google Mock Generator tool from the cppclean project.
+EXTRA_DIST += \
+  scripts/generator/COPYING \
+  scripts/generator/README \
+  scripts/generator/README.cppclean \
+  scripts/generator/cpp/__init__.py \
+  scripts/generator/cpp/ast.py \
+  scripts/generator/cpp/gmock_class.py \
+  scripts/generator/cpp/keywords.py \
+  scripts/generator/cpp/tokenize.py \
+  scripts/generator/cpp/utils.py \
+  scripts/generator/gmock_gen.py
+
+# CMake scripts.
+EXTRA_DIST += \
+  CMakeLists.txt
+
+# Microsoft Visual Studio 2005 projects.
+EXTRA_DIST += \
+  msvc/2005/gmock.sln \
+  msvc/2005/gmock.vcproj \
+  msvc/2005/gmock_config.vsprops \
+  msvc/2005/gmock_main.vcproj \
+  msvc/2005/gmock_test.vcproj
+
+# Microsoft Visual Studio 2010 projects.
+EXTRA_DIST += \
+  msvc/2010/gmock.sln \
+  msvc/2010/gmock.vcxproj \
+  msvc/2010/gmock_config.props \
+  msvc/2010/gmock_main.vcxproj \
+  msvc/2010/gmock_test.vcxproj
+
+# gmock_test.cc does not really depend on files generated by the
+# fused-gmock-internal rule.  However, gmock_test.o does, and it is
+# important to include test/gmock_test.cc as part of this rule in order to
+# prevent compiling gmock_test.o until all dependent files have been
+# generated.
+$(test_gmock_fused_test_SOURCES): fused-gmock-internal
+
+# TODO(vladl@google.com): Find a way to add Google Tests's sources here.
+fused-gmock-internal: $(pkginclude_HEADERS) $(pkginclude_internal_HEADERS) \
+                      $(lib_libgmock_la_SOURCES) $(GMOCK_SOURCE_INGLUDES) \
+                      $(lib_libgmock_main_la_SOURCES) \
+                      scripts/fuse_gmock_files.py
+	mkdir -p "$(srcdir)/fused-src"
+	chmod -R u+w "$(srcdir)/fused-src"
+	rm -f "$(srcdir)/fused-src/gtest/gtest.h"
+	rm -f "$(srcdir)/fused-src/gmock/gmock.h"
+	rm -f "$(srcdir)/fused-src/gmock-gtest-all.cc"
+	"$(srcdir)/scripts/fuse_gmock_files.py" "$(srcdir)/fused-src"
+	cp -f "$(srcdir)/src/gmock_main.cc" "$(srcdir)/fused-src"
+
+maintainer-clean-local:
+	rm -rf "$(srcdir)/fused-src"
+
+# Death tests may produce core dumps in the build directory. In case
+# this happens, clean them to keep distcleancheck happy.
+CLEANFILES = core
+
+# Disables 'make install' as installing a compiled version of Google
+# Mock can lead to undefined behavior due to violation of the
+# One-Definition Rule.
+
+install-exec-local:
+	echo "'make install' is dangerous and not supported. Instead, see README for how to integrate Google Mock into your build system."
+	false
+
+install-data-local:
+	echo "'make install' is dangerous and not supported. Instead, see README for how to integrate Google Mock into your build system."
+	false

ext/gmock/README

@@ -0,0 +1,354 @@
+Google C++ Mocking Framework
+============================
+
+http://code.google.com/p/googlemock/
+
+Overview
+--------
+
+Google's framework for writing and using C++ mock classes on a variety
+of platforms (Linux, Mac OS X, Windows, Windows CE, Symbian, etc).
+Inspired by jMock, EasyMock, and Hamcrest, and designed with C++'s
+specifics in mind, it can help you derive better designs of your
+system and write better tests.
+
+Google Mock:
+
+- provides a declarative syntax for defining mocks,
+- can easily define partial (hybrid) mocks, which are a cross of real
+  and mock objects,
+- handles functions of arbitrary types and overloaded functions,
+- comes with a rich set of matchers for validating function arguments,
+- uses an intuitive syntax for controlling the behavior of a mock,
+- does automatic verification of expectations (no record-and-replay
+  needed),
+- allows arbitrary (partial) ordering constraints on
+  function calls to be expressed,
+- lets a user extend it by defining new matchers and actions.
+- does not use exceptions, and
+- is easy to learn and use.
+
+Please see the project page above for more information as well as the
+mailing list for questions, discussions, and development.  There is
+also an IRC channel on OFTC (irc.oftc.net) #gtest available.  Please
+join us!
+
+Please note that code under scripts/generator/ is from the cppclean
+project (http://code.google.com/p/cppclean/) and under the Apache
+License, which is different from Google Mock's license.
+
+Requirements for End Users
+--------------------------
+
+Google Mock is implemented on top of the Google Test C++ testing
+framework (http://code.google.com/p/googletest/), and includes the
+latter as part of the SVN repositary and distribution package.  You
+must use the bundled version of Google Test when using Google Mock, or
+you may get compiler/linker errors.
+
+You can also easily configure Google Mock to work with another testing
+framework of your choice; although it will still need Google Test as
+an internal dependency.  Please read
+http://code.google.com/p/googlemock/wiki/ForDummies#Using_Google_Mock_with_Any_Testing_Framework
+for how to do it.
+
+Google Mock depends on advanced C++ features and thus requires a more
+modern compiler.  The following are needed to use Google Mock:
+
+### Linux Requirements ###
+
+These are the base requirements to build and use Google Mock from a source
+package (as described below):
+
+  * GNU-compatible Make or "gmake"
+  * POSIX-standard shell
+  * POSIX(-2) Regular Expressions (regex.h)
+  * C++98-standard-compliant compiler (e.g. GCC 3.4 or newer)
+
+### Windows Requirements ###
+
+  * Microsoft Visual C++ 8.0 SP1 or newer
+
+### Mac OS X Requirements ###
+
+  * Mac OS X 10.4 Tiger or newer
+  * Developer Tools Installed
+
+Requirements for Contributors
+-----------------------------
+
+We welcome patches.  If you plan to contribute a patch, you need to
+build Google Mock and its own tests from an SVN checkout (described
+below), which has further requirements:
+
+  * Automake version 1.9 or newer
+  * Autoconf version 2.59 or newer
+  * Libtool / Libtoolize
+  * Python version 2.3 or newer (for running some of the tests and
+    re-generating certain source files from templates)
+
+Getting the Source
+------------------
+
+There are two primary ways of getting Google Mock's source code: you
+can download a stable source release in your preferred archive format,
+or directly check out the source from our Subversion (SVN) repositary.
+The SVN checkout requires a few extra steps and some extra software
+packages on your system, but lets you track development and make
+patches much more easily, so we highly encourage it.
+
+### Source Package ###
+
+Google Mock is released in versioned source packages which can be
+downloaded from the download page [1].  Several different archive
+formats are provided, but the only difference is the tools needed to
+extract their contents, and the size of the resulting file.  Download
+whichever you are most comfortable with.
+
+  [1] http://code.google.com/p/googlemock/downloads/list
+
+Once downloaded expand the archive using whichever tools you prefer
+for that type.  This will always result in a new directory with the
+name "gmock-X.Y.Z" which contains all of the source code.  Here are
+some examples on Linux:
+
+  tar -xvzf gmock-X.Y.Z.tar.gz
+  tar -xvjf gmock-X.Y.Z.tar.bz2
+  unzip gmock-X.Y.Z.zip
+
+### SVN Checkout ###
+
+To check out the main branch (also known as the "trunk") of Google
+Mock, run the following Subversion command:
+
+  svn checkout http://googlemock.googlecode.com/svn/trunk/ gmock-svn
+
+If you are using a *nix system and plan to use the GNU Autotools build
+system to build Google Mock (described below), you'll need to
+configure it now.  Otherwise you are done with getting the source
+files.
+
+To prepare the Autotools build system, enter the target directory of
+the checkout command you used ('gmock-svn') and proceed with the
+following command:
+
+  autoreconf -fvi
+
+Once you have completed this step, you are ready to build the library.
+Note that you should only need to complete this step once.  The
+subsequent 'make' invocations will automatically re-generate the bits
+of the build system that need to be changed.
+
+If your system uses older versions of the autotools, the above command
+will fail.  You may need to explicitly specify a version to use.  For
+instance, if you have both GNU Automake 1.4 and 1.9 installed and
+'automake' would invoke the 1.4, use instead:
+
+  AUTOMAKE=automake-1.9 ACLOCAL=aclocal-1.9 autoreconf -fvi
+
+Make sure you're using the same version of automake and aclocal.
+
+Setting up the Build
+--------------------
+
+To build Google Mock and your tests that use it, you need to tell your
+build system where to find its headers and source files.  The exact
+way to do it depends on which build system you use, and is usually
+straightforward.
+
+### Generic Build Instructions ###
+
+This section shows how you can integrate Google Mock into your
+existing build system.
+
+Suppose you put Google Mock in directory ${GMOCK_DIR} and Google Test
+in ${GTEST_DIR} (the latter is ${GMOCK_DIR}/gtest by default).  To
+build Google Mock, create a library build target (or a project as
+called by Visual Studio and Xcode) to compile
+
+  ${GTEST_DIR}/src/gtest-all.cc and ${GMOCK_DIR}/src/gmock-all.cc
+
+with
+
+  ${GTEST_DIR}/include, ${GTEST_DIR}, ${GMOCK_DIR}/include, and ${GMOCK_DIR}
+
+in the header search path.  Assuming a Linux-like system and gcc,
+something like the following will do:
+
+  g++ -I${GTEST_DIR}/include -I${GTEST_DIR} -I${GMOCK_DIR}/include \
+      -I${GMOCK_DIR} -c ${GTEST_DIR}/src/gtest-all.cc
+  g++ -I${GTEST_DIR}/include -I${GTEST_DIR} -I${GMOCK_DIR}/include \
+      -I${GMOCK_DIR} -c ${GMOCK_DIR}/src/gmock-all.cc
+  ar -rv libgmock.a gtest-all.o gmock-all.o
+
+Next, you should compile your test source file with
+${GTEST_DIR}/include and ${GMOCK_DIR}/include in the header search
+path, and link it with gmock and any other necessary libraries:
+
+  g++ -I${GTEST_DIR}/include -I${GMOCK_DIR}/include \
+      path/to/your_test.cc libgmock.a -o your_test
+
+As an example, the make/ directory contains a Makefile that you can
+use to build Google Mock on systems where GNU make is available
+(e.g. Linux, Mac OS X, and Cygwin).  It doesn't try to build Google
+Mock's own tests.  Instead, it just builds the Google Mock library and
+a sample test.  You can use it as a starting point for your own build
+script.
+
+If the default settings are correct for your environment, the
+following commands should succeed:
+
+  cd ${GMOCK_DIR}/make
+  make
+  ./gmock_test
+
+If you see errors, try to tweak the contents of make/Makefile to make
+them go away.  There are instructions in make/Makefile on how to do
+it.
+
+### Windows ###
+
+The msvc/2005 directory contains VC++ 2005 projects and the msvc/2010
+directory contains VC++ 2010 projects for building Google Mock and
+selected tests.
+
+Change to the appropriate directory and run "msbuild gmock.sln" to
+build the library and tests (or open the gmock.sln in the MSVC IDE).
+If you want to create your own project to use with Google Mock, you'll
+have to configure it to use the gmock_config propety sheet.  For that:
+
+ * Open the Property Manager window (View | Other Windows | Property Manager)
+ * Right-click on your project and select "Add Existing Property Sheet..."
+ * Navigate to gmock_config.vsprops or gmock_config.props and select it.
+ * In Project Properties | Configuration Properties | General | Additional
+   Include Directories, type <path to Google Mock>/include.
+
+Tweaking Google Mock
+--------------------
+
+Google Mock can be used in diverse environments.  The default
+configuration may not work (or may not work well) out of the box in
+some environments.  However, you can easily tweak Google Mock by
+defining control macros on the compiler command line.  Generally,
+these macros are named like GTEST_XYZ and you define them to either 1
+or 0 to enable or disable a certain feature.
+
+We list the most frequently used macros below.  For a complete list,
+see file ${GTEST_DIR}/include/gtest/internal/gtest-port.h.
+
+### Choosing a TR1 Tuple Library ###
+
+Google Mock uses the C++ Technical Report 1 (TR1) tuple library
+heavily.  Unfortunately TR1 tuple is not yet widely available with all
+compilers.  The good news is that Google Test 1.4.0+ implements a
+subset of TR1 tuple that's enough for Google Mock's need.  Google Mock
+will automatically use that implementation when the compiler doesn't
+provide TR1 tuple.
+
+Usually you don't need to care about which tuple library Google Test
+and Google Mock use.  However, if your project already uses TR1 tuple,
+you need to tell Google Test and Google Mock to use the same TR1 tuple
+library the rest of your project uses, or the two tuple
+implementations will clash.  To do that, add
+
+  -DGTEST_USE_OWN_TR1_TUPLE=0
+
+to the compiler flags while compiling Google Test, Google Mock, and
+your tests.  If you want to force Google Test and Google Mock to use
+their own tuple library, just add
+
+  -DGTEST_USE_OWN_TR1_TUPLE=1
+
+to the compiler flags instead.
+
+If you want to use Boost's TR1 tuple library with Google Mock, please
+refer to the Boost website (http://www.boost.org/) for how to obtain
+it and set it up.
+
+### Tweaking Google Test ###
+
+Most of Google Test's control macros apply to Google Mock as well.
+Please see file ${GTEST_DIR}/README for how to tweak them.
+
+Upgrading from an Earlier Version
+---------------------------------
+
+We strive to keep Google Mock releases backward compatible.
+Sometimes, though, we have to make some breaking changes for the
+users' long-term benefits.  This section describes what you'll need to
+do if you are upgrading from an earlier version of Google Mock.
+
+### Upgrading from 1.1.0 or Earlier ###
+
+You may need to explicitly enable or disable Google Test's own TR1
+tuple library.  See the instructions in section "Choosing a TR1 Tuple
+Library".
+
+### Upgrading from 1.4.0 or Earlier ###
+
+On platforms where the pthread library is available, Google Test and
+Google Mock use it in order to be thread-safe.  For this to work, you
+may need to tweak your compiler and/or linker flags.  Please see the
+"Multi-threaded Tests" section in file ${GTEST_DIR}/README for what
+you may need to do.
+
+If you have custom matchers defined using MatcherInterface or
+MakePolymorphicMatcher(), you'll need to update their definitions to
+use the new matcher API [2].  Matchers defined using MATCHER() or
+MATCHER_P*() aren't affected.
+
+  [2] http://code.google.com/p/googlemock/wiki/CookBook#Writing_New_Monomorphic_Matchers,
+      http://code.google.com/p/googlemock/wiki/CookBook#Writing_New_Polymorphic_Matchers
+
+Developing Google Mock
+----------------------
+
+This section discusses how to make your own changes to Google Mock.
+
+### Testing Google Mock Itself ###
+
+To make sure your changes work as intended and don't break existing
+functionality, you'll want to compile and run Google Test's own tests.
+For that you'll need Autotools.  First, make sure you have followed
+the instructions in section "SVN Checkout" to configure Google Mock.
+Then, create a build output directory and enter it.  Next,
+
+  ${GMOCK_DIR}/configure  # Standard GNU configure script, --help for more info
+
+Once you have successfully configured Google Mock, the build steps are
+standard for GNU-style OSS packages.
+
+  make        # Standard makefile following GNU conventions
+  make check  # Builds and runs all tests - all should pass.
+
+Note that when building your project against Google Mock, you are building
+against Google Test as well.  There is no need to configure Google Test
+separately.
+
+### Regenerating Source Files ###
+
+Some of Google Mock's source files are generated from templates (not
+in the C++ sense) using a script.  A template file is named FOO.pump,
+where FOO is the name of the file it will generate.  For example, the
+file include/gmock/gmock-generated-actions.h.pump is used to generate
+gmock-generated-actions.h in the same directory.
+
+Normally you don't need to worry about regenerating the source files,
+unless you need to modify them.  In that case, you should modify the
+corresponding .pump files instead and run the 'pump' script (for Pump
+is Useful for Meta Programming) to regenerate them.  You can find
+pump.py in the ${GTEST_DIR}/scripts/ directory.  Read the Pump manual
+[3] for how to use it.
+
+  [3] http://code.google.com/p/googletest/wiki/PumpManual.
+
+### Contributing a Patch ###
+
+We welcome patches.  Please read the Google Mock developer's guide [4]
+for how you can contribute.  In particular, make sure you have signed
+the Contributor License Agreement, or we won't be able to accept the
+patch.
+
+  [4] http://code.google.com/p/googlemock/wiki/DevGuide
+
+Happy testing!

ext/gmock/build-aux/config.h.in

@@ -0,0 +1,69 @@
+/* build-aux/config.h.in.  Generated from configure.ac by autoheader.  */
+
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#undef HAVE_DLFCN_H
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#undef HAVE_INTTYPES_H
+
+/* Define to 1 if you have the <memory.h> header file. */
+#undef HAVE_MEMORY_H
+
+/* Define if you have POSIX threads libraries and header files. */
+#undef HAVE_PTHREAD
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#undef HAVE_STDINT_H
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#undef HAVE_STDLIB_H
+
+/* Define to 1 if you have the <strings.h> header file. */
+#undef HAVE_STRINGS_H
+
+/* Define to 1 if you have the <string.h> header file. */
+#undef HAVE_STRING_H
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#undef HAVE_SYS_STAT_H
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#undef HAVE_SYS_TYPES_H
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#undef HAVE_UNISTD_H
+
+/* Define to the sub-directory in which libtool stores uninstalled libraries.
+   */
+#undef LT_OBJDIR
+
+/* Name of package */
+#undef PACKAGE
+
+/* Define to the address where bug reports for this package should be sent. */
+#undef PACKAGE_BUGREPORT
+
+/* Define to the full name of this package. */
+#undef PACKAGE_NAME
+
+/* Define to the full name and version of this package. */
+#undef PACKAGE_STRING
+
+/* Define to the one symbol short name of this package. */
+#undef PACKAGE_TARNAME
+
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
+/* Define to the version of this package. */
+#undef PACKAGE_VERSION
+
+/* Define to necessary symbol if this constant uses a non-standard name on
+   your system. */
+#undef PTHREAD_CREATE_JOINABLE
+
+/* Define to 1 if you have the ANSI C header files. */
+#undef STDC_HEADERS
+
+/* Version number of package */
+#undef VERSION

ext/gmock/build-aux/depcomp

@@ -0,0 +1,630 @@
+#! /bin/sh
+# depcomp - compile a program generating dependencies as side-effects
+
+scriptversion=2009-04-28.21; # UTC
+
+# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 Free
+# Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program 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/>.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# Originally written by Alexandre Oliva <oliva@dcc.unicamp.br>.
+
+case $1 in
+  '')
+     echo "$0: No command.  Try \`$0 --help' for more information." 1>&2
+     exit 1;
+     ;;
+  -h | --h*)
+    cat <<\EOF
+Usage: depcomp [--help] [--version] PROGRAM [ARGS]
+
+Run PROGRAMS ARGS to compile a file, generating dependencies
+as side-effects.
+
+Environment variables:
+  depmode     Dependency tracking mode.
+  source      Source file read by `PROGRAMS ARGS'.
+  object      Object file output by `PROGRAMS ARGS'.
+  DEPDIR      directory where to store dependencies.
+  depfile     Dependency file to output.
+  tmpdepfile  Temporary file to use when outputing dependencies.
+  libtool     Whether libtool is used (yes/no).
+
+Report bugs to <bug-automake@gnu.org>.
+EOF
+    exit $?
+    ;;
+  -v | --v*)
+    echo "depcomp $scriptversion"
+    exit $?
+    ;;
+esac
+
+if test -z "$depmode" || test -z "$source" || test -z "$object"; then
+  echo "depcomp: Variables source, object and depmode must be set" 1>&2
+  exit 1
+fi
+
+# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po.
+depfile=${depfile-`echo "$object" |
+  sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`}
+tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
+
+rm -f "$tmpdepfile"
+
+# Some modes work just like other modes, but use different flags.  We
+# parameterize here, but still list the modes in the big case below,
+# to make depend.m4 easier to write.  Note that we *cannot* use a case
+# here, because this file can only contain one case statement.
+if test "$depmode" = hp; then
+  # HP compiler uses -M and no extra arg.
+  gccflag=-M
+  depmode=gcc
+fi
+
+if test "$depmode" = dashXmstdout; then
+   # This is just like dashmstdout with a different argument.
+   dashmflag=-xM
+   depmode=dashmstdout
+fi
+
+cygpath_u="cygpath -u -f -"
+if test "$depmode" = msvcmsys; then
+   # This is just like msvisualcpp but w/o cygpath translation.
+   # Just convert the backslash-escaped backslashes to single forward
+   # slashes to satisfy depend.m4
+   cygpath_u="sed s,\\\\\\\\,/,g"
+   depmode=msvisualcpp
+fi
+
+case "$depmode" in
+gcc3)
+## gcc 3 implements dependency tracking that does exactly what
+## we want.  Yay!  Note: for some reason libtool 1.4 doesn't like
+## it if -MD -MP comes after the -MF stuff.  Hmm.
+## Unfortunately, FreeBSD c89 acceptance of flags depends upon
+## the command line argument order; so add the flags where they
+## appear in depend2.am.  Note that the slowdown incurred here
+## affects only configure: in makefiles, %FASTDEP% shortcuts this.
+  for arg
+  do
+    case $arg in
+    -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;;
+    *)  set fnord "$@" "$arg" ;;
+    esac
+    shift # fnord
+    shift # $arg
+  done
+  "$@"
+  stat=$?
+  if test $stat -eq 0; then :
+  else
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  mv "$tmpdepfile" "$depfile"
+  ;;
+
+gcc)
+## There are various ways to get dependency output from gcc.  Here's
+## why we pick this rather obscure method:
+## - Don't want to use -MD because we'd like the dependencies to end
+##   up in a subdir.  Having to rename by hand is ugly.
+##   (We might end up doing this anyway to support other compilers.)
+## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
+##   -MM, not -M (despite what the docs say).
+## - Using -M directly means running the compiler twice (even worse
+##   than renaming).
+  if test -z "$gccflag"; then
+    gccflag=-MD,
+  fi
+  "$@" -Wp,"$gccflag$tmpdepfile"
+  stat=$?
+  if test $stat -eq 0; then :
+  else
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+  echo "$object : \\" > "$depfile"
+  alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
+## The second -e expression handles DOS-style file names with drive letters.
+  sed -e 's/^[^:]*: / /' \
+      -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
+## This next piece of magic avoids the `deleted header file' problem.
+## The problem is that when a header file which appears in a .P file
+## is deleted, the dependency causes make to die (because there is
+## typically no way to rebuild the header).  We avoid this by adding
+## dummy dependencies for each header file.  Too bad gcc doesn't do
+## this for us directly.
+  tr ' ' '
+' < "$tmpdepfile" |
+## Some versions of gcc put a space before the `:'.  On the theory
+## that the space means something, we add a space to the output as
+## well.
+## Some versions of the HPUX 10.20 sed can't process this invocation
+## correctly.  Breaking it into two sed invocations is a workaround.
+    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+hp)
+  # This case exists only to let depend.m4 do its work.  It works by
+  # looking at the text of this script.  This case will never be run,
+  # since it is checked for above.
+  exit 1
+  ;;
+
+sgi)
+  if test "$libtool" = yes; then
+    "$@" "-Wp,-MDupdate,$tmpdepfile"
+  else
+    "$@" -MDupdate "$tmpdepfile"
+  fi
+  stat=$?
+  if test $stat -eq 0; then :
+  else
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+
+  if test -f "$tmpdepfile"; then  # yes, the sourcefile depend on other files
+    echo "$object : \\" > "$depfile"
+
+    # Clip off the initial element (the dependent).  Don't try to be
+    # clever and replace this with sed code, as IRIX sed won't handle
+    # lines with more than a fixed number of characters (4096 in
+    # IRIX 6.2 sed, 8192 in IRIX 6.5).  We also remove comment lines;
+    # the IRIX cc adds comments like `#:fec' to the end of the
+    # dependency line.
+    tr ' ' '
+' < "$tmpdepfile" \
+    | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
+    tr '
+' ' ' >> "$depfile"
+    echo >> "$depfile"
+
+    # The second pass generates a dummy entry for each header file.
+    tr ' ' '
+' < "$tmpdepfile" \
+   | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
+   >> "$depfile"
+  else
+    # The sourcefile does not contain any dependencies, so just
+    # store a dummy comment line, to avoid errors with the Makefile
+    # "include basename.Plo" scheme.
+    echo "#dummy" > "$depfile"
+  fi
+  rm -f "$tmpdepfile"
+  ;;
+
+aix)
+  # The C for AIX Compiler uses -M and outputs the dependencies
+  # in a .u file.  In older versions, this file always lives in the
+  # current directory.  Also, the AIX compiler puts `$object:' at the
+  # start of each line; $object doesn't have directory information.
+  # Version 6 uses the directory in both cases.
+  dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
+  test "x$dir" = "x$object" && dir=
+  base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
+  if test "$libtool" = yes; then
+    tmpdepfile1=$dir$base.u
+    tmpdepfile2=$base.u
+    tmpdepfile3=$dir.libs/$base.u
+    "$@" -Wc,-M
+  else
+    tmpdepfile1=$dir$base.u
+    tmpdepfile2=$dir$base.u
+    tmpdepfile3=$dir$base.u
+    "$@" -M
+  fi
+  stat=$?
+
+  if test $stat -eq 0; then :
+  else
+    rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+    exit $stat
+  fi
+
+  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+  do
+    test -f "$tmpdepfile" && break
+  done
+  if test -f "$tmpdepfile"; then
+    # Each line is of the form `foo.o: dependent.h'.
+    # Do two passes, one to just change these to
+    # `$object: dependent.h' and one to simply `dependent.h:'.
+    sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
+    # That's a tab and a space in the [].
+    sed -e 's,^.*\.[a-z]*:[	 ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
+  else
+    # The sourcefile does not contain any dependencies, so just
+    # store a dummy comment line, to avoid errors with the Makefile
+    # "include basename.Plo" scheme.
+    echo "#dummy" > "$depfile"
+  fi
+  rm -f "$tmpdepfile"
+  ;;
+
+icc)
+  # Intel's C compiler understands `-MD -MF file'.  However on
+  #    icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c
+  # ICC 7.0 will fill foo.d with something like
+  #    foo.o: sub/foo.c
+  #    foo.o: sub/foo.h
+  # which is wrong.  We want:
+  #    sub/foo.o: sub/foo.c
+  #    sub/foo.o: sub/foo.h
+  #    sub/foo.c:
+  #    sub/foo.h:
+  # ICC 7.1 will output
+  #    foo.o: sub/foo.c sub/foo.h
+  # and will wrap long lines using \ :
+  #    foo.o: sub/foo.c ... \
+  #     sub/foo.h ... \
+  #     ...
+
+  "$@" -MD -MF "$tmpdepfile"
+  stat=$?
+  if test $stat -eq 0; then :
+  else
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+  # Each line is of the form `foo.o: dependent.h',
+  # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
+  # Do two passes, one to just change these to
+  # `$object: dependent.h' and one to simply `dependent.h:'.
+  sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
+  # Some versions of the HPUX 10.20 sed can't process this invocation
+  # correctly.  Breaking it into two sed invocations is a workaround.
+  sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" |
+    sed -e 's/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+hp2)
+  # The "hp" stanza above does not work with aCC (C++) and HP's ia64
+  # compilers, which have integrated preprocessors.  The correct option
+  # to use with these is +Maked; it writes dependencies to a file named
+  # 'foo.d', which lands next to the object file, wherever that
+  # happens to be.
+  # Much of this is similar to the tru64 case; see comments there.
+  dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
+  test "x$dir" = "x$object" && dir=
+  base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
+  if test "$libtool" = yes; then
+    tmpdepfile1=$dir$base.d
+    tmpdepfile2=$dir.libs/$base.d
+    "$@" -Wc,+Maked
+  else
+    tmpdepfile1=$dir$base.d
+    tmpdepfile2=$dir$base.d
+    "$@" +Maked
+  fi
+  stat=$?
+  if test $stat -eq 0; then :
+  else
+     rm -f "$tmpdepfile1" "$tmpdepfile2"
+     exit $stat
+  fi
+
+  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2"
+  do
+    test -f "$tmpdepfile" && break
+  done
+  if test -f "$tmpdepfile"; then
+    sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
+    # Add `dependent.h:' lines.
+    sed -ne '2,${
+	       s/^ *//
+	       s/ \\*$//
+	       s/$/:/
+	       p
+	     }' "$tmpdepfile" >> "$depfile"
+  else
+    echo "#dummy" > "$depfile"
+  fi
+  rm -f "$tmpdepfile" "$tmpdepfile2"
+  ;;
+
+tru64)
+   # The Tru64 compiler uses -MD to generate dependencies as a side
+   # effect.  `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
+   # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
+   # dependencies in `foo.d' instead, so we check for that too.
+   # Subdirectories are respected.
+   dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
+   test "x$dir" = "x$object" && dir=
+   base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
+
+   if test "$libtool" = yes; then
+      # With Tru64 cc, shared objects can also be used to make a
+      # static library.  This mechanism is used in libtool 1.4 series to
+      # handle both shared and static libraries in a single compilation.
+      # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
+      #
+      # With libtool 1.5 this exception was removed, and libtool now
+      # generates 2 separate objects for the 2 libraries.  These two
+      # compilations output dependencies in $dir.libs/$base.o.d and
+      # in $dir$base.o.d.  We have to check for both files, because
+      # one of the two compilations can be disabled.  We should prefer
+      # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
+      # automatically cleaned when .libs/ is deleted, while ignoring
+      # the former would cause a distcleancheck panic.
+      tmpdepfile1=$dir.libs/$base.lo.d   # libtool 1.4
+      tmpdepfile2=$dir$base.o.d          # libtool 1.5
+      tmpdepfile3=$dir.libs/$base.o.d    # libtool 1.5
+      tmpdepfile4=$dir.libs/$base.d      # Compaq CCC V6.2-504
+      "$@" -Wc,-MD
+   else
+      tmpdepfile1=$dir$base.o.d
+      tmpdepfile2=$dir$base.d
+      tmpdepfile3=$dir$base.d
+      tmpdepfile4=$dir$base.d
+      "$@" -MD
+   fi
+
+   stat=$?
+   if test $stat -eq 0; then :
+   else
+      rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
+      exit $stat
+   fi
+
+   for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
+   do
+     test -f "$tmpdepfile" && break
+   done
+   if test -f "$tmpdepfile"; then
+      sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
+      # That's a tab and a space in the [].
+      sed -e 's,^.*\.[a-z]*:[	 ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
+   else
+      echo "#dummy" > "$depfile"
+   fi
+   rm -f "$tmpdepfile"
+   ;;
+
+#nosideeffect)
+  # This comment above is used by automake to tell side-effect
+  # dependency tracking mechanisms from slower ones.
+
+dashmstdout)
+  # Important note: in order to support this mode, a compiler *must*
+  # always write the preprocessed file to stdout, regardless of -o.
+  "$@" || exit $?
+
+  # Remove the call to Libtool.
+  if test "$libtool" = yes; then
+    while test "X$1" != 'X--mode=compile'; do
+      shift
+    done
+    shift
+  fi
+
+  # Remove `-o $object'.
+  IFS=" "
+  for arg
+  do
+    case $arg in
+    -o)
+      shift
+      ;;
+    $object)
+      shift
+      ;;
+    *)
+      set fnord "$@" "$arg"
+      shift # fnord
+      shift # $arg
+      ;;
+    esac
+  done
+
+  test -z "$dashmflag" && dashmflag=-M
+  # Require at least two characters before searching for `:'
+  # in the target name.  This is to cope with DOS-style filenames:
+  # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise.
+  "$@" $dashmflag |
+    sed 's:^[  ]*[^: ][^:][^:]*\:[    ]*:'"$object"'\: :' > "$tmpdepfile"
+  rm -f "$depfile"
+  cat < "$tmpdepfile" > "$depfile"
+  tr ' ' '
+' < "$tmpdepfile" | \
+## Some versions of the HPUX 10.20 sed can't process this invocation
+## correctly.  Breaking it into two sed invocations is a workaround.
+    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+dashXmstdout)
+  # This case only exists to satisfy depend.m4.  It is never actually
+  # run, as this mode is specially recognized in the preamble.
+  exit 1
+  ;;
+
+makedepend)
+  "$@" || exit $?
+  # Remove any Libtool call
+  if test "$libtool" = yes; then
+    while test "X$1" != 'X--mode=compile'; do
+      shift
+    done
+    shift
+  fi
+  # X makedepend
+  shift
+  cleared=no eat=no
+  for arg
+  do
+    case $cleared in
+    no)
+      set ""; shift
+      cleared=yes ;;
+    esac
+    if test $eat = yes; then
+      eat=no
+      continue
+    fi
+    case "$arg" in
+    -D*|-I*)
+      set fnord "$@" "$arg"; shift ;;
+    # Strip any option that makedepend may not understand.  Remove
+    # the object too, otherwise makedepend will parse it as a source file.
+    -arch)
+      eat=yes ;;
+    -*|$object)
+      ;;
+    *)
+      set fnord "$@" "$arg"; shift ;;
+    esac
+  done
+  obj_suffix=`echo "$object" | sed 's/^.*\././'`
+  touch "$tmpdepfile"
+  ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
+  rm -f "$depfile"
+  cat < "$tmpdepfile" > "$depfile"
+  sed '1,2d' "$tmpdepfile" | tr ' ' '
+' | \
+## Some versions of the HPUX 10.20 sed can't process this invocation
+## correctly.  Breaking it into two sed invocations is a workaround.
+    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile" "$tmpdepfile".bak
+  ;;
+
+cpp)
+  # Important note: in order to support this mode, a compiler *must*
+  # always write the preprocessed file to stdout.
+  "$@" || exit $?
+
+  # Remove the call to Libtool.
+  if test "$libtool" = yes; then
+    while test "X$1" != 'X--mode=compile'; do
+      shift
+    done
+    shift
+  fi
+
+  # Remove `-o $object'.
+  IFS=" "
+  for arg
+  do
+    case $arg in
+    -o)
+      shift
+      ;;
+    $object)
+      shift
+      ;;
+    *)
+      set fnord "$@" "$arg"
+      shift # fnord
+      shift # $arg
+      ;;
+    esac
+  done
+
+  "$@" -E |
+    sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
+       -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
+    sed '$ s: \\$::' > "$tmpdepfile"
+  rm -f "$depfile"
+  echo "$object : \\" > "$depfile"
+  cat < "$tmpdepfile" >> "$depfile"
+  sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+msvisualcpp)
+  # Important note: in order to support this mode, a compiler *must*
+  # always write the preprocessed file to stdout.
+  "$@" || exit $?
+
+  # Remove the call to Libtool.
+  if test "$libtool" = yes; then
+    while test "X$1" != 'X--mode=compile'; do
+      shift
+    done
+    shift
+  fi
+
+  IFS=" "
+  for arg
+  do
+    case "$arg" in
+    -o)
+      shift
+      ;;
+    $object)
+      shift
+      ;;
+    "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
+	set fnord "$@"
+	shift
+	shift
+	;;
+    *)
+	set fnord "$@" "$arg"
+	shift
+	shift
+	;;
+    esac
+  done
+  "$@" -E 2>/dev/null |
+  sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile"
+  rm -f "$depfile"
+  echo "$object : \\" > "$depfile"
+  sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::	\1 \\:p' >> "$depfile"
+  echo "	" >> "$depfile"
+  sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+msvcmsys)
+  # This case exists only to let depend.m4 do its work.  It works by
+  # looking at the text of this script.  This case will never be run,
+  # since it is checked for above.
+  exit 1
+  ;;
+
+none)
+  exec "$@"
+  ;;
+
+*)
+  echo "Unknown depmode $depmode" 1>&2
+  exit 1
+  ;;
+esac
+
+exit 0
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End: