…sion

CMakeLists.txt

@@ -16,9 +16,9 @@
 
 # Version number for Synergy
 set(VERSION_MAJOR 1)
-set(VERSION_MINOR 8)
-set(VERSION_REV 5)
-set(VERSION_STAGE stable)
+set(VERSION_MINOR 9)
+set(VERSION_REV 0)
+set(VERSION_STAGE beta)
 set(VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_REV}")
 
 cmake_minimum_required(VERSION 2.6)
@@ -296,7 +296,7 @@ if (UNIX)
 	set(HAVE_SOCKLEN_T 1)
 
 	# For config.h, save the results based on a template (config.h.in).
-	configure_file(res/config.h.in ${root_dir}/config.h)
+	configure_file(res/config.h.in ${root_dir}/synergy/config.h)
 
 	add_definitions(-DSYSAPI_UNIX=1 -DHAVE_CONFIG_H)
 
@@ -315,6 +315,7 @@ else() # not-unix
 		/D_WINDOWS
 		/D_CRT_SECURE_NO_WARNINGS
 		/DVERSION=\"${VERSION}\"
+		/D_XKEYCHECK_H
 	)
 	
 	if (MSVC_VERSION EQUAL 1600)
@@ -326,6 +327,38 @@ else() # not-unix
 
 endif()
 
+if (WIN32)
+	if(CMAKE_SIZEOF_VOID_P EQUAL 8)
+		set(OPENSSL_PLAT_DIR openssl-win64)
+	else()
+		set(OPENSSL_PLAT_DIR openssl-win32)
+	endif()
+	set(OPENSSL_INCLUDE ${CMAKE_CURRENT_SOURCE_DIR}/ext/${OPENSSL_PLAT_DIR}/inc32)
+endif()
+
+if (APPLE)
+	set(OPENSSL_PLAT_DIR openssl-osx)
+	set(OPENSSL_INCLUDE ${CMAKE_CURRENT_SOURCE_DIR}/ext/${OPENSSL_PLAT_DIR}/include)
+endif()
+
+if (WIN32)
+	set(OPENSSL_LIBS
+		${CMAKE_CURRENT_SOURCE_DIR}/ext/${OPENSSL_PLAT_DIR}/out32dll/libeay32.lib
+		${CMAKE_CURRENT_SOURCE_DIR}/ext/${OPENSSL_PLAT_DIR}/out32dll/ssleay32.lib
+	)
+endif()
+
+if (UNIX)
+	if (APPLE)
+		set(OPENSSL_LIBS
+		${CMAKE_CURRENT_SOURCE_DIR}/ext/${OPENSSL_PLAT_DIR}/libssl.a
+		${CMAKE_CURRENT_SOURCE_DIR}/ext/${OPENSSL_PLAT_DIR}/libcrypto.a
+		)
+	else()
+		set(OPENSSL_LIBS ssl crypto)
+	endif()
+endif()
+
 add_subdirectory(src)
 
 if (WIN32)
@@ -363,3 +396,5 @@ if (CONF_DOXYGEN)
 	configure_file(${cmake_dir}/doxygen.cfg.in ${doc_dir}/doxygen.cfg)
 
 endif()
+
+option(BUILD_SERVICE "Build synergyd" ON)

ext/toolchain/commands1.py

@@ -34,7 +34,7 @@ class Toolchain:
 
 	# options used by all commands
 	globalOptions = 'v'
-	globalOptionsLong = ['no-prompts', 'verbose', 'skip-gui', 'skip-core']
+	globalOptionsLong = ['no-prompts', 'verbose', 'skip-gui', 'skip-core', 'skip-tests']
 
 	# list of valid commands as keys. the values are optarg strings, but most 
 	# are None for now (this is mainly for extensibility)
@@ -208,8 +208,8 @@ class InternalCommands:
 	qmake_cmd = 'qmake'
 	make_cmd = 'make'
 	xcodebuild_cmd = 'xcodebuild'
-	w32_make_cmd = 'mingw32-make'
-	w32_qt_version = '4.6.2'
+	w32_make_cmd = 'nmake'
+	w32_qt_version = '5.6.1'
 	defaultTarget = 'release'
 
 	cmake_dir = 'res'
@@ -240,6 +240,9 @@ class InternalCommands:
 	
 	# by default, compile the gui
 	enableMakeGui = True
+
+	# by default, compile the tests
+	enableMakeTests = True
 	
 	# by default, unknown
 	macSdk = None
@@ -254,13 +257,15 @@ class InternalCommands:
 	gmockDir = 'gmock-1.6.0'
 
 	win32_generators = {
-		1 : VisualStudioGenerator('10'),
-		2 : VisualStudioGenerator('10 Win64'),
-		3 : VisualStudioGenerator('9 2008'),
-		4 : VisualStudioGenerator('9 2008 Win64'),
-		5 : VisualStudioGenerator('8 2005'),
-		6 : VisualStudioGenerator('8 2005 Win64')
-	}
+		1 : VisualStudioGenerator('14'),
+		2 : VisualStudioGenerator('14 Win64'),
+		3 : VisualStudioGenerator('10'),
+		4 : VisualStudioGenerator('10 Win64'),
+		5 : VisualStudioGenerator('9 2008'),
+		6 : VisualStudioGenerator('9 2008 Win64'),
+		7 : VisualStudioGenerator('8 2005'),
+		8 : VisualStudioGenerator('8 2005 Win64'),
+			}
 
 	unix_generators = {
 		1 : MakefilesGenerator(),
@@ -442,6 +447,8 @@ def configureCore(self, target="", extraArgs=""):
 
 			cmake_args += " -DOSX_TARGET_MAJOR=" + macSdkMatch.group(1)
 			cmake_args += " -DOSX_TARGET_MINOR=" + macSdkMatch.group(2)
+
+		cmake_args += " -DDISABLE_TESTS=" + str(int(not self.enableMakeTests))
 		
 		# if not visual studio, use parent dir
 		sourceDir = generator.getSourceDir()
@@ -603,13 +610,12 @@ def persist_qmake(self):
 				print (
 					'Suggestions:\n'
 					'1. Ensure that qmake.exe exists in your system path.\n'
-					'2. Try to download Qt (check our dev FAQ for links):\n'
-					'  qt-sdk-win-opensource-2010.02.exe')
+					'2. Try to download Qt 5.6\n')
 			raise Exception('Cannot continue without qmake.')
 		
 		stdout, stderr = p.communicate()
 		if p.returncode != 0:
-			raise Exception('Could not test for cmake: %s' % stderr)
+			raise Exception('Could not test for qmake: %s' % stderr)
 		else:
 			m = re.search('.*Using Qt version (\d+\.\d+\.\d+).*', stdout)
 			if m:
@@ -760,12 +766,7 @@ def macPostGuiMake(self, target):
 			if err != 0:
 				raise Exception(bin + " failed with error: " + str(err))
 
-			(qMajor, qMinor, qRev) = self.getQmakeVersion()
-			if qMajor <= 4:
-				frameworkRootDir = "/Library/Frameworks"
-			else:
-				# TODO: auto-detect, qt can now be installed anywhere.
-				frameworkRootDir = "/Developer/Qt5.2.1/5.2.1/clang_64/lib"
+			frameworkRootDir = commands.getoutput("qmake -query QT_INSTALL_LIBS")
 
 			target = bundleTargetDir + "/Contents/Frameworks"
 
@@ -892,8 +893,8 @@ def cleanCore(self, targets):
 		generator = self.getGeneratorFromConfig().cmakeName
 
 		if generator.startswith('Visual Studio'):
-			# special case for version 10, use new /target:clean
-			if generator.startswith('Visual Studio 10'):
+			# special case for version 10 and above, use new /target:clean
+			if generator.startswith('Visual Studio 10') or generator.startswith('Visual Studio 14'):
 				for target in targets:
 					self.run_vcbuild(generator, target, self.sln_filepath(), '/target:clean')
 				
@@ -1723,6 +1724,8 @@ def get_vcvarsall(self, generator):
 			value,type = _winreg.QueryValueEx(key, '9.0')
 		elif generator.startswith('Visual Studio 10'):
 			value,type = _winreg.QueryValueEx(key, '10.0')
+		elif generator.startswith('Visual Studio 14'):
+			value,type = _winreg.QueryValueEx(key, '14.0')
 		else:
 			raise Exception('Cannot determine vcvarsall.bat location for: ' + generator)
 		
@@ -1765,7 +1768,7 @@ def run_vcbuild(self, generator, mode, solution, args='', dir='', config32='Win3
 		else:
 			config = 'Debug'
 				
-		if generator.startswith('Visual Studio 10'):
+		if generator.startswith('Visual Studio 10') or generator.startswith('Visual Studio 14'):
 			cmd = ('@echo off\n'
 				'call "%s" %s \n'
 				'cd "%s"\n'
@@ -1888,6 +1891,8 @@ def __init__(self, argv, opts, args, verbose):
 				self.ic.enableMakeGui = False
 			elif o == '--skip-core':
 				self.ic.enableMakeCore = False
+			elif o == '--skip-tests':
+				self.ic.enableMakeTests = False
 			elif o in ('-d', '--debug'):
 				self.build_targets += ['debug',]
 			elif o in ('-r', '--release'):

res/dpiaware.manifest

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3" manifestVersion="1.0">
-  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
-    <application>
-      <!-- Windows 7 -->
-      <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}" />
-    </application>
-  </compatibility>
-  <asmv3:application>
-    <asmv3:windowsSettings xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">
-      <dpiAware>true</dpiAware>
-    </asmv3:windowsSettings>
-  </asmv3:application>
-</assembly>
-

src/CMakeLists.txt

@@ -14,42 +14,10 @@
 # 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 (WIN32)
-	if(CMAKE_SIZEOF_VOID_P EQUAL 8)
-		set(OPENSSL_PLAT_DIR openssl-win64)
-	else()
-		set(OPENSSL_PLAT_DIR openssl-win32)
-	endif()
-	set(OPENSSL_INCLUDE ${CMAKE_SOURCE_DIR}/ext/${OPENSSL_PLAT_DIR}/inc32)
-endif()
-
-if (APPLE)
-	set(OPENSSL_PLAT_DIR openssl-osx)
-	set(OPENSSL_INCLUDE ${CMAKE_SOURCE_DIR}/ext/${OPENSSL_PLAT_DIR}/include)
-endif()
-
-if (WIN32)
-	set(OPENSSL_LIBS
-		${CMAKE_SOURCE_DIR}/ext/${OPENSSL_PLAT_DIR}/out32dll/libeay32.lib
-		${CMAKE_SOURCE_DIR}/ext/${OPENSSL_PLAT_DIR}/out32dll/ssleay32.lib
-	)
-endif()
-
-if (UNIX)
-	if (APPLE)
-		set(OPENSSL_LIBS
-		${CMAKE_SOURCE_DIR}/ext/${OPENSSL_PLAT_DIR}/libssl.a
-		${CMAKE_SOURCE_DIR}/ext/${OPENSSL_PLAT_DIR}/libcrypto.a
-		)
-	else()
-		set(OPENSSL_LIBS ssl crypto)
-	endif()
-endif()
-
 add_subdirectory(lib)
 add_subdirectory(cmd)
 add_subdirectory(micro)
 
-if (NOT ${CMAKE_SYSTEM_NAME} MATCHES "IRIX")
+if ((NOT ${CMAKE_SYSTEM_NAME} MATCHES "IRIX") AND (NOT ${DISABLE_TESTS}))
 	add_subdirectory(test)
 endif()

src/cmd/CMakeLists.txt

@@ -16,10 +16,13 @@
 
 add_subdirectory(synergyc)
 add_subdirectory(synergys)
-add_subdirectory(synergyd)
 add_subdirectory(usynergy)
 add_subdirectory(syntool)
 
+if (BUILD_SERVICE)
+	add_subdirectory(synergyd)
+endif (BUILD_SERVICE)
+
 if (WIN32)
   add_subdirectory(synergyp)
 endif()

src/cmd/synergyc/CMakeLists.txt

@@ -61,17 +61,18 @@ target_link_libraries(synergyc
 	arch base client common io mt net ipc platform server synergy ${libs} ${OPENSSL_LIBS})
 
 if (WIN32)
-	ADD_CUSTOM_COMMAND(
+	add_custom_command(
 		TARGET synergyc
 		POST_BUILD
-		COMMAND "mt.exe" -manifest \"${CMAKE_SOURCE_DIR}\\res\\dpiaware.manifest\" -inputresource:\"$<TARGET_FILE:synergyc>\"\;\#1 -outputresource:\"$<TARGET_FILE:synergyc>\"\;\#1
-		COMMENT "Adding display aware manifest..."
+		COMMAND xcopy /Y /Q
+			..\\..\\..\\..\\..\\synergy\\bin\\${CMAKE_CFG_INTDIR}\\synergyc.*
+			..\\..\\..\\..\\..\\bin\\${CMAKE_CFG_INTDIR}
 	)
-endif()
-
-if (CONF_CPACK)
-	install(TARGETS
-		synergyc
-		COMPONENT core
-		DESTINATION bin)
+else ()
+	if (CONF_CPACK)
+		install(TARGETS
+			synergyc
+			COMPONENT core
+			DESTINATION bin)
+	endif()
 endif()

src/cmd/synergyd/CMakeLists.txt

@@ -37,15 +37,6 @@ endif()
 target_link_libraries(synergyd
 	arch base common io ipc mt net platform synergy shared ${libs} ${OPENSSL_LIBS})
 
-if (WIN32)
-	ADD_CUSTOM_COMMAND(
-		TARGET synergyd
-		POST_BUILD
-		COMMAND "mt.exe" -manifest \"${CMAKE_SOURCE_DIR}\\res\\dpiaware.manifest\" -inputresource:\"$<TARGET_FILE:synergyd>\"\;\#1 -outputresource:\"$<TARGET_FILE:synergyd>\"\;\#1
-		COMMENT "Adding display aware manifest..."
-	)
-endif()
-
 if (CONF_CPACK)
 	install(TARGETS
 		synergyd

src/cmd/synergyp/CMakeLists.txt

@@ -65,9 +65,19 @@ endif()
 target_link_libraries(synergyp
 	arch base client common io mt net ipc platform server synergy client ${libs} ${OPENSSL_LIBS})
 
-if (CONF_CPACK)
-	install(TARGETS
-		synergyp
-		COMPONENT core
-		DESTINATION bin)
+if (WIN32)
+	add_custom_command(
+		TARGET synergyp
+		POST_BUILD
+		COMMAND xcopy /Y /Q
+			..\\..\\..\\..\\..\\synergy\\bin\\${CMAKE_CFG_INTDIR}\\synergyp.*
+			..\\..\\..\\..\\..\\bin\\${CMAKE_CFG_INTDIR}
+	)
+else ()
+	if (CONF_CPACK)
+		install(TARGETS
+			synergyp
+			COMPONENT core
+			DESTINATION bin)
+	endif()
 endif()

src/cmd/synergys/CMakeLists.txt

@@ -61,17 +61,18 @@ target_link_libraries(synergys
 	arch base client common io mt net ipc platform server synergy ${libs} ${OPENSSL_LIBS})
 
 if (WIN32)
-	ADD_CUSTOM_COMMAND(
+	add_custom_command(
 		TARGET synergys
 		POST_BUILD
-		COMMAND "mt.exe" -manifest \"${CMAKE_SOURCE_DIR}\\res\\dpiaware.manifest\" -inputresource:\"$<TARGET_FILE:synergys>\"\;\#1 -outputresource:\"$<TARGET_FILE:synergys>\"\;\#1
-		COMMENT "Adding display aware manifest..."
+		COMMAND xcopy /Y /Q
+			..\\..\\..\\..\\..\\synergy\\bin\\${CMAKE_CFG_INTDIR}\\synergys.*
+			..\\..\\..\\..\\..\\bin\\${CMAKE_CFG_INTDIR}
 	)
-endif()
-
-if (CONF_CPACK)
-	install(TARGETS
-		synergys
-		COMPONENT core
-		DESTINATION bin)
+else ()
+	if (CONF_CPACK)
+		install(TARGETS
+			synergys
+			COMPONENT core
+			DESTINATION bin)
+	endif()
 endif()