This repository has been archived by the owner. It is now read-only.
Permalink
...
Comparing changes
Open a pull request
3
contributors
Commits on Jul 07, 2015
Commits on Jul 09, 2015
Commits on Jul 10, 2015
Commits on Jul 24, 2015
Commits on Jul 31, 2015
Commits on Aug 03, 2015
Commits on Aug 05, 2015
Commits on Aug 06, 2015
Commits on Aug 07, 2015
Commits on Aug 10, 2015
Commits on Oct 17, 2015
Commits on Nov 18, 2015
Commits on Nov 21, 2015
Commits on Dec 12, 2015
Commits on Dec 30, 2015
Commits on Jan 11, 2016
Commits on Jan 16, 2016
Unified
Split
Showing
with
2,615 additions
and 2,458 deletions.
- +24 −17 CMakeLists.txt
- +9 −14 ChangeLog
- +1,469 −2,025 ext/toolchain/commands1.py
- +2 −2 src/CMakeLists.txt
- +1 −1 src/cmd/synergyc/MSWindowsClientTaskBarReceiver.cpp
- +1 −1 src/cmd/synergyp/MSWindowsPortableTaskBarReceiver.cpp
- +1 −1 src/cmd/synergys/MSWindowsServerTaskBarReceiver.cpp
- +6 −2 src/gui/gui.pro
- +16 −1 src/gui/res/SettingsDialogBase.ui
- +5 −10 src/gui/src/AppConfig.cpp
- +4 −4 src/gui/src/AppConfig.h
- +65 −78 src/gui/src/MainWindow.cpp
- +12 −6 src/gui/src/MainWindow.h
- +3 −0 src/gui/src/PluginManager.cpp
- +0 −2 src/gui/src/PluginWizardPage.cpp
- +2 −18 src/gui/src/SettingsDialog.cpp
- +0 −1 src/gui/src/SettingsDialog.h
- +1 −1 src/lib/CMakeLists.txt
- +2 −1 src/lib/arch/IArchPlugin.h
- +1 −1 src/lib/arch/unix/ArchLogUnix.cpp
- +2 −0 src/lib/arch/unix/ArchMultithreadPosix.cpp
- +2 −2 src/lib/arch/unix/ArchNetworkBSD.cpp
- +64 −25 src/lib/arch/unix/ArchPluginUnix.cpp
- +4 −2 src/lib/arch/unix/ArchPluginUnix.h
- +14 −5 src/lib/arch/win32/ArchMiscWindows.cpp
- +67 −28 src/lib/arch/win32/ArchPluginWindows.cpp
- +3 −1 src/lib/arch/win32/ArchPluginWindows.h
- +9 −6 src/lib/arch/win32/ArchSystemWindows.cpp
- +1 −1 src/lib/base/ELevel.h
- +1 −1 src/lib/base/EventQueue.cpp
- +3 −1 src/lib/base/Log.cpp
- +1 −1 src/lib/base/Log.h
- +1 −1 src/lib/base/log_outputters.cpp
- +8 −11 src/lib/client/Client.cpp
- +8 −8 src/lib/client/ServerProxy.cpp
- +36 −0 src/lib/common/PluginVersion.cpp
- +31 −0 src/lib/common/PluginVersion.h
- +6 −4 src/lib/common/basic_types.h
- +18 −8 src/lib/ipc/IpcLogOutputter.cpp
- +5 −1 src/lib/ipc/IpcLogOutputter.h
- +3 −8 src/lib/net/TCPSocketFactory.cpp
- +6 −4 src/lib/platform/CMakeLists.txt
- +396 −0 src/lib/platform/IOSScreen.cpp
- +128 −0 src/lib/platform/IOSScreen.h
- +2 −2 src/lib/platform/MSWindowsDropTarget.cpp
- +4 −4 src/lib/platform/MSWindowsKeyState.cpp
- +2 −2 src/lib/platform/MSWindowsScreen.cpp
- +0 −11 src/lib/platform/OSXScreen.cpp
- +2 −2 src/lib/platform/XWindowsClipboard.cpp
- +1 −1 src/lib/platform/XWindowsEventQueueBuffer.cpp
- +0 −1 src/lib/platform/XWindowsScreen.cpp
- +10 −12 src/lib/plugin/ns/SecureSocket.cpp
- +0 −3 src/lib/plugin/ns/SecureSocket.h
- +3 −3 src/lib/plugin/ns/ns.cpp
- +1 −1 src/lib/plugin/winmmjoy/winmmjoy.cpp
- +7 −12 src/lib/server/ClientListener.cpp
- +2 −2 src/lib/server/ClientProxy1_0.cpp
- +1 −1 src/lib/server/ClientProxy1_5.cpp
- +7 −7 src/lib/server/ClientProxy1_6.cpp
- +3 −3 src/lib/server/ClientProxyUnknown.cpp
- +10 −0 src/lib/server/Config.cpp
- +2 −2 src/lib/server/Config.h
- +4 −3 src/lib/server/InputFilter.cpp
- +7 −7 src/lib/server/Server.cpp
- +5 −5 src/lib/synergy/App.cpp
- +3 −1 src/lib/synergy/ArgParser.cpp
- +9 −7 src/lib/synergy/ClientApp.cpp
- +1 −2 src/lib/synergy/ClipboardChunk.cpp
- +1 −1 src/lib/synergy/DaemonApp.cpp
- +1 −3 src/lib/synergy/DropHelper.cpp
- +0 −1 src/lib/synergy/FileChunk.cpp
- +22 −0 src/lib/synergy/PlatformScreen.cpp
- +2 −2 src/lib/synergy/ProtocolUtil.cpp
- +1 −1 src/lib/synergy/ProtocolUtil.h
- +17 −9 src/lib/synergy/ServerApp.cpp
- +5 −16 src/lib/synergy/StreamChunker.cpp
- +1 −1 src/lib/synergy/unix/AppUtilUnix.cpp
- +3 −3 src/lib/synwinhk/synwinhk.cpp
- +10 −0 src/test/mock/ipc/MockIpcServer.h
- +25 −23 src/test/unittests/ipc/IpcLogOutputterTests.cpp
View
41
CMakeLists.txt
| @@ -16,10 +16,17 @@ | ||
| # Version number for Synergy | ||
| set(VERSION_MAJOR 1) | ||
| -set(VERSION_MINOR 7) | ||
| -set(VERSION_REV 4) | ||
| +set(VERSION_MINOR 8) | ||
| +set(VERSION_REV 0) | ||
| +set(VERSION_STAGE alpha) | ||
| set(VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_REV}") | ||
| +set(CURL_INCLUDE_DIR "/Users/diego/tarballs/iOScURL/curl") | ||
| +set(CURL_LIBRARY "/Users/diego/tarballs/iOScURL/libcurl.a") | ||
| + | ||
| +set (CMAKE_CXX_COMPILER_WORKS TRUE) | ||
| +set (CMAKE_C_COMPILER_WORKS TRUE) | ||
| + | ||
| cmake_minimum_required(VERSION 2.6) | ||
| # CMake complains if we don't have this. | ||
| @@ -145,16 +152,16 @@ if (UNIX) | ||
| check_type_size(char SIZEOF_CHAR) | ||
| check_type_size(int SIZEOF_INT) | ||
| - check_type_size(long SIZEOF_LONG) | ||
| + #check_type_size(long SIZEOF_LONG) | ||
| check_type_size(short SIZEOF_SHORT) | ||
| # pthread is used on both Linux and Mac | ||
| - check_library_exists("pthread" pthread_create "" HAVE_PTHREAD) | ||
| - if (HAVE_PTHREAD) | ||
| - list(APPEND libs pthread) | ||
| - else() | ||
| - message(FATAL_ERROR "Missing library: pthread") | ||
| - endif() | ||
| +# check_library_exists("pthread" pthread_create "" HAVE_PTHREAD) | ||
| +# if (HAVE_PTHREAD) | ||
| +# list(APPEND libs pthread) | ||
| +# else() | ||
| +# message(FATAL_ERROR "Missing library: pthread") | ||
| +# endif() | ||
| # curl is used on both Linux and Mac | ||
| find_package(CURL) | ||
| @@ -168,27 +175,27 @@ if (UNIX) | ||
| message(STATUS "OSX_TARGET_MAJOR=${OSX_TARGET_MAJOR}") | ||
| message(STATUS "OSX_TARGET_MINOR=${OSX_TARGET_MINOR}") | ||
| - if (NOT (OSX_TARGET_MAJOR EQUAL 10)) | ||
| - message(FATAL_ERROR "Mac OS X target must be 10.x") | ||
| - endif () | ||
| + #if (NOT (OSX_TARGET_MAJOR EQUAL 10)) | ||
| + # message(FATAL_ERROR "Mac OS X target must be 10.x") | ||
| + #endif () | ||
| if (OSX_TARGET_MINOR LESS 6) | ||
| # <= 10.5: 32-bit Intel and PowerPC | ||
| set(CMAKE_OSX_ARCHITECTURES "ppc;i386" | ||
| CACHE STRING "" FORCE) | ||
| else() | ||
| # >= 10.6: Intel only | ||
| - set(CMAKE_OSX_ARCHITECTURES "i386" | ||
| + set(CMAKE_OSX_ARCHITECTURES "armv7;armv7s;arm64" | ||
| CACHE STRING "" FORCE) | ||
| endif() | ||
| set(CMAKE_CXX_FLAGS "--sysroot ${CMAKE_OSX_SYSROOT} ${CMAKE_CXX_FLAGS} -DGTEST_USE_OWN_TR1_TUPLE=1") | ||
| - find_library(lib_ScreenSaver ScreenSaver) | ||
| + #find_library(lib_ScreenSaver ScreenSaver) | ||
| find_library(lib_IOKit IOKit) | ||
| - find_library(lib_ApplicationServices ApplicationServices) | ||
| + #find_library(lib_ApplicationServices ApplicationServices) | ||
| find_library(lib_Foundation Foundation) | ||
| - find_library(lib_Carbon Carbon) | ||
| + #find_library(lib_Carbon Carbon) | ||
| list(APPEND libs | ||
| ${lib_ScreenSaver} | ||
| @@ -297,7 +304,7 @@ if (UNIX) | ||
| add_definitions(-DSYSAPI_UNIX=1 -DHAVE_CONFIG_H) | ||
| if (APPLE) | ||
| - add_definitions(-DWINAPI_CARBON=1 -D_THREAD_SAFE) | ||
| + add_definitions(-D_THREAD_SAFE) | ||
| else (APPLE) | ||
| add_definitions(-DWINAPI_XWINDOWS=1) | ||
| endif() | ||
View
23
ChangeLog
| @@ -1,22 +1,17 @@ | ||
| v1.7.4-stable | ||
| ============= | ||
| -Bug #4809 - Intermittent freeze caused by mutex deadlock in logging code | ||
| -Bug #4721 - High CPU usage for Windows service on client | ||
| -Bug #4712 - Unable to send clipboard with size above 1KB when using SSL | ||
| +Bug #4721 - High CPU usage for Windows service | ||
| +Bug #4750 - SSL connect error 'passive ssl error limit' | ||
| Bug #4584 - Drag and drop with SSL causes crash | ||
| -Bug #3774 - Missing MinGW dependencies after install on Windows | ||
| Bug #4749 - Clipboard thread race condition causes assertion failure | ||
| -Bug #4723 - Waiting for active desktop result freezes Windows service | ||
| -Bug #4690 - Log line 'activeDesktop' does not use logging system | ||
| Bug #4720 - Plugin download shows 'Could not get Linux package type' error | ||
| -Bug #4737 - Using error log level does not show SSL fingerprint dialog | ||
| -Bug #451 - Fast cursor on any client with Mac server | ||
| -Bug #4810 - Non-existent file listed in Qt gui.pro file | ||
| -Enhancement #4696 - Include 'ns' plugin in installers instead of wizard download | ||
| -Enhancement #4796 - Improve secure socket intensive try operations | ||
| -Enhancement #4327 - GUI setting to disable drag and drop feature | ||
| -Enhancement #4745 - Tray icon notification for clipboard data transfer progress | ||
| -Enhancement #4793 - Additional logging to output OpenSSL version | ||
| +Bug #4712 - Unable to send clipboard with size above 1KB when using SSL | ||
| +Bug #4642 - Connecting causes SSL23_GET_SERVER_HELLO error | ||
| +Bug #4690 - Log line 'activeDesktop' does not use logging system | ||
| +Bug #4866 - Wrong ns plugin version can be loaded | ||
| +Enhancement #4901 - Auto restart when running from GUI in desktop mode | ||
| +Enhancement #4845 - Add timestamp to log output | ||
| +Enhancement #4898 - Move version stage name to build config | ||
| v1.7.3-stable | ||
| ============= | ||
Oops, something went wrong.