From b9a59c014fdefdec25fc18802d891905e6cb89fd Mon Sep 17 00:00:00 2001
From: walker0643 <>
Date: Sun, 11 Mar 2018 12:48:59 -0400
Subject: [PATCH] don't build barrierd for non-windows platforms; removed some
 synergy-related legacy checks

---
 CMakeLists.txt                           |  9 ++++-----
 dist/wix/Product.wxs                     |  6 ------
 src/CMakeLists.txt                       |  7 ++++---
 src/cmd/CMakeLists.txt                   |  4 ++--
 src/gui/CMakeLists.txt                   | 12 ++++++------
 src/lib/arch/win32/ArchDaemonWindows.cpp | 10 +---------
 src/lib/arch/win32/ArchDaemonWindows.h   |  3 ---
 7 files changed, 17 insertions(+), 34 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 27dccc96..c81584d2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,9 +18,8 @@
 cmake_minimum_required (VERSION 3.4)
 project (barrier C CXX)
 
-option (BARRIER_BUILD_LEGACY_GUI "Build the legacy GUI" ON)
-option (BARRIER_BUILD_LEGACY_SERVICE "Build the legacy service (barrierd)" ON)
-option (BARRIER_BUILD_LEGACY_INSTALLER "Build the legacy installer" ON)
+option (BARRIER_BUILD_GUI "Build the GUI" ON)
+option (BARRIER_BUILD_INSTALLER "Build the installer" ON)
 
 set (CMAKE_CXX_STANDARD 14)
 set (CMAKE_CXX_EXTENSIONS OFF)
@@ -355,7 +354,7 @@ macro (configure_files srcDir destDir)
     endforeach (templateFile)
 endmacro (configure_files)
 
-if (${BARRIER_BUILD_LEGACY_INSTALLER})
+if (${BARRIER_BUILD_INSTALLER})
 #
 # macOS app Bundle
 #
@@ -393,6 +392,6 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
 endif()
 
 else()
-    message (STATUS "NOT configuring the v1 installer")
+    message (STATUS "NOT configuring the installer")
 endif()
 add_subdirectory (src)
diff --git a/dist/wix/Product.wxs b/dist/wix/Product.wxs
index e2af4b08..5cb924ec 100644
--- a/dist/wix/Product.wxs
+++ b/dist/wix/Product.wxs
@@ -31,12 +31,6 @@
 		<Property Id="ARPPRODUCTICON" Value="barrier.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\Barrier" 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>
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 911fef3c..3a8e83eb 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -19,6 +19,7 @@ include_directories (${CMAKE_CURRENT_BINARY_DIR}/lib)
 
 add_subdirectory(lib)
 add_subdirectory(cmd)
-if (BARRIER_BUILD_LEGACY_GUI)
-add_subdirectory(gui)
-endif (BARRIER_BUILD_LEGACY_GUI)
+
+if (BARRIER_BUILD_GUI)
+    add_subdirectory(gui)
+endif()
diff --git a/src/cmd/CMakeLists.txt b/src/cmd/CMakeLists.txt
index 0c6d1a92..0fdfe339 100644
--- a/src/cmd/CMakeLists.txt
+++ b/src/cmd/CMakeLists.txt
@@ -18,7 +18,7 @@ add_subdirectory(barrierc)
 add_subdirectory(barriers)
 add_subdirectory(syntool)
 
-if (BARRIER_BUILD_LEGACY_SERVICE)
+if (WIN32)
 	add_subdirectory(barrierd)
-endif (BARRIER_BUILD_LEGACY_SERVICE)
+endif()
 
diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
index a5dc9874..5d248912 100644
--- a/src/gui/CMakeLists.txt
+++ b/src/gui/CMakeLists.txt
@@ -6,17 +6,17 @@ set (CMAKE_AUTORCC ON)
 set (CMAKE_AUTOUIC ON)
 set (CMAKE_INCLUDE_CURRENT_DIR ON)
 
-file (GLOB LEGACY_GUI_SOURCE_FILES src/*.cpp src/*.h)
-file (GLOB LEGACY_GUI_UI_FILES src/*.ui)
+file (GLOB GUI_SOURCE_FILES src/*.cpp src/*.h)
+file (GLOB GUI_UI_FILES src/*.ui)
 
 if (WIN32)
-    set (LEGACY_GUI_RC_FILES res/win/Barrier.rc)
+    set (GUI_RC_FILES res/win/Barrier.rc)
 endif()
 
 add_executable (barrier WIN32
-    ${LEGACY_GUI_SOURCE_FILES}
-    ${LEGACY_GUI_UI_FILES}
-    ${LEGACY_GUI_RC_FILES}
+    ${GUI_SOURCE_FILES}
+    ${GUI_UI_FILES}
+    ${GUI_RC_FILES}
     res/Barrier.qrc
 )
 
diff --git a/src/lib/arch/win32/ArchDaemonWindows.cpp b/src/lib/arch/win32/ArchDaemonWindows.cpp
index fdd50c43..efcf235d 100644
--- a/src/lib/arch/win32/ArchDaemonWindows.cpp
+++ b/src/lib/arch/win32/ArchDaemonWindows.cpp
@@ -697,15 +697,7 @@ ArchDaemonWindows::installDaemon()
 void
 ArchDaemonWindows::uninstallDaemon()
 {
-    // remove legacy services if installed.
-    if (isDaemonInstalled(LEGACY_SERVER_DAEMON_NAME)) {
-        uninstallDaemon(LEGACY_SERVER_DAEMON_NAME);
-    }
-    if (isDaemonInstalled(LEGACY_CLIENT_DAEMON_NAME)) {
-        uninstallDaemon(LEGACY_CLIENT_DAEMON_NAME);
-    }
-
-    // remove new service if installed.
+    // remove service if installed.
     if (isDaemonInstalled(DEFAULT_DAEMON_NAME)) {
         uninstallDaemon(DEFAULT_DAEMON_NAME);
     }
diff --git a/src/lib/arch/win32/ArchDaemonWindows.h b/src/lib/arch/win32/ArchDaemonWindows.h
index ad69779e..2db97923 100644
--- a/src/lib/arch/win32/ArchDaemonWindows.h
+++ b/src/lib/arch/win32/ArchDaemonWindows.h
@@ -142,9 +142,6 @@ private:
 #define DEFAULT_DAEMON_NAME _T("Barrier")
 #define DEFAULT_DAEMON_INFO _T("Manages the Barrier foreground processes.")
 
-#define LEGACY_SERVER_DAEMON_NAME _T("Barrier Server")
-#define LEGACY_CLIENT_DAEMON_NAME _T("Barrier Client")
-
 static const TCHAR* const g_daemonKeyPath[] = {
     _T("SOFTWARE"),
     _T("The Barrier Project"),