From 4a90760ec872312dab3db6625cf0c7df664b90b6 Mon Sep 17 00:00:00 2001 From: Jamie Newbon Date: Mon, 9 Mar 2020 16:55:04 +0000 Subject: [PATCH 01/20] Updated Stage --- cmake/Version.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/Version.cmake b/cmake/Version.cmake index 2258dd2e5..55f87e9a7 100644 --- a/cmake/Version.cmake +++ b/cmake/Version.cmake @@ -7,7 +7,7 @@ cmake_minimum_required (VERSION 3.4) set (SYNERGY_VERSION_MAJOR 1) set (SYNERGY_VERSION_MINOR 11) set (SYNERGY_VERSION_PATCH 1) -set (SYNERGY_VERSION_STAGE "snapshot") +set (SYNERGY_VERSION_STAGE "rc2") # # Version from CI From 1fb400da44471aac8eb3475435d25b46ffdc3727 Mon Sep 17 00:00:00 2001 From: Aaron Hinojosa <67hz@protonmail.com> Date: Tue, 3 Mar 2020 16:38:57 -0600 Subject: [PATCH 02/20] 6472 - adding help site to help menu 6472 - updating help hyperlink text --- src/gui/src/MainWindow.cpp | 8 ++++++++ src/gui/src/MainWindow.h | 1 + src/gui/src/MainWindowBase.ui | 8 ++++++++ 3 files changed, 17 insertions(+) diff --git a/src/gui/src/MainWindow.cpp b/src/gui/src/MainWindow.cpp index 33c89ae41..ad5e39bc8 100644 --- a/src/gui/src/MainWindow.cpp +++ b/src/gui/src/MainWindow.cpp @@ -17,6 +17,7 @@ */ #define DOWNLOAD_URL "http://symless.com/?source=gui" +#define HELP_URL "http://symless.com/help?source=gui" #include @@ -290,6 +291,8 @@ void MainWindow::createMenuBar() m_pMenuWindow->addAction(m_pActionMinimize); m_pMenuWindow->addAction(m_pActionRestore); m_pMenuHelp->addAction(m_pActionAbout); + m_pMenuHelp->addAction(m_pActionHelp); + setMenuBar(m_pMenuBar); } @@ -1228,6 +1231,11 @@ void MainWindow::on_m_pActionAbout_triggered() dlg.exec(); } +void MainWindow::on_m_pActionHelp_triggered() +{ + QDesktopServices::openUrl(QUrl(HELP_URL)); +} + void MainWindow::updateZeroconfService() { #ifndef SYNERGY_ENTERPRISE diff --git a/src/gui/src/MainWindow.h b/src/gui/src/MainWindow.h index 79b81081e..dc2212a76 100644 --- a/src/gui/src/MainWindow.h +++ b/src/gui/src/MainWindow.h @@ -149,6 +149,7 @@ public slots: void on_m_pButtonConfigureServer_clicked(); bool on_m_pActionSave_triggered(); void on_m_pActionAbout_triggered(); + void on_m_pActionHelp_triggered(); void on_m_pActionSettings_triggered(); void on_m_pActivate_triggered(); void synergyFinished(int exitCode, QProcess::ExitStatus); diff --git a/src/gui/src/MainWindowBase.ui b/src/gui/src/MainWindowBase.ui index a9345e26a..ca2169d86 100644 --- a/src/gui/src/MainWindowBase.ui +++ b/src/gui/src/MainWindowBase.ui @@ -535,6 +535,14 @@ + + + Visit &help site + + + + + &Quit From f04134b19ad9fa350d31d0881767c885be672c7e Mon Sep 17 00:00:00 2001 From: Jamie Newbon Date: Thu, 19 Mar 2020 15:37:23 +0000 Subject: [PATCH 03/20] Set release 1.11.1-stable --- ChangeLog | 2 +- cmake/Version.cmake | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index eb6f52052..07c2edbc4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -v1.11.1-rc2 +v1.11.1-stable =========== Bug fixes: diff --git a/cmake/Version.cmake b/cmake/Version.cmake index 55f87e9a7..9274a5aa4 100644 --- a/cmake/Version.cmake +++ b/cmake/Version.cmake @@ -7,7 +7,7 @@ cmake_minimum_required (VERSION 3.4) set (SYNERGY_VERSION_MAJOR 1) set (SYNERGY_VERSION_MINOR 11) set (SYNERGY_VERSION_PATCH 1) -set (SYNERGY_VERSION_STAGE "rc2") +set (SYNERGY_VERSION_STAGE "stable") # # Version from CI From 3e80a0bfc01b870e34cd4a265561aaf97e182480 Mon Sep 17 00:00:00 2001 From: talyz Date: Fri, 14 Feb 2020 16:26:36 +0100 Subject: [PATCH 04/20] Build tests again The tests were accidentally disabled in 688095d0a7d22704b5c3282bc68b41ceca42ab7e. Since then, the code has drifted slightly: the synergy lib has been renamed from synergy to synlib in 4263fd17177d7717b04ac6d6ec62efa2f657ed74 and the curl dependency was dropped in 491bb2de000245a943b8298462c4a9d8f34c9a44. This re-enables the tests, targets the right lib and removes the obsolete test. --- src/CMakeLists.txt | 2 + src/test/integtests/CMakeLists.txt | 2 +- .../integtests/arch/ArchInternetTests.cpp | 37 ------------------- src/test/unittests/CMakeLists.txt | 2 +- 4 files changed, 4 insertions(+), 39 deletions(-) delete mode 100644 src/test/integtests/arch/ArchInternetTests.cpp diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index ab63a0666..fee080ab0 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -22,3 +22,5 @@ add_subdirectory(cmd) if (SYNERGY_BUILD_LEGACY_GUI) add_subdirectory(gui) endif (SYNERGY_BUILD_LEGACY_GUI) + +add_subdirectory(test) diff --git a/src/test/integtests/CMakeLists.txt b/src/test/integtests/CMakeLists.txt index f39968a33..096ba3d50 100644 --- a/src/test/integtests/CMakeLists.txt +++ b/src/test/integtests/CMakeLists.txt @@ -68,4 +68,4 @@ endif() add_executable(integtests ${sources}) target_link_libraries(integtests - arch base client common io ipc mt net platform server synergy gtest gmock ${libs} ${OPENSSL_LIBS}) + arch base client common io ipc mt net platform server synlib gtest gmock ${libs} ${OPENSSL_LIBS}) diff --git a/src/test/integtests/arch/ArchInternetTests.cpp b/src/test/integtests/arch/ArchInternetTests.cpp deleted file mode 100644 index 95823e9fb..000000000 --- a/src/test/integtests/arch/ArchInternetTests.cpp +++ /dev/null @@ -1,37 +0,0 @@ -/* - * synergy -- mouse and keyboard sharing utility - * Copyright (C) 2014-2016 Symless Ltd. - * - * This package is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * found in the file LICENSE that should have accompanied this file. - * - * This package is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#include "arch/Arch.h" - -#include "test/global/gtest.h" - -#define TEST_URL "https://symless.com/tests/?testString" -//#define TEST_URL "http://localhost/synergy/tests/?testString" - -TEST(ArchInternetTests, get) -{ - ARCH_INTERNET internet; - String result = internet.get(TEST_URL); - ASSERT_EQ("Hello world!", result); -} - -TEST(ArchInternetTests, urlEncode) -{ - ARCH_INTERNET internet; - String result = internet.urlEncode("hello=+&world"); - ASSERT_EQ("hello%3D%2B%26world", result); -} diff --git a/src/test/unittests/CMakeLists.txt b/src/test/unittests/CMakeLists.txt index 54131eb20..46307e90e 100644 --- a/src/test/unittests/CMakeLists.txt +++ b/src/test/unittests/CMakeLists.txt @@ -68,4 +68,4 @@ endif() add_executable(unittests ${sources}) target_link_libraries(unittests - arch base client server common io net platform server synergy mt ipc gtest gmock shared ${libs} ${OPENSSL_LIBS}) + arch base client server common io net platform server synlib mt ipc gtest gmock shared ${libs} ${OPENSSL_LIBS}) From 820b882f8ae2ed36533ae42520b65179b76f90e9 Mon Sep 17 00:00:00 2001 From: Jnewbon <48688400+Jnewbon@users.noreply.github.com> Date: Thu, 19 Mar 2020 22:20:31 +0000 Subject: [PATCH 05/20] Added crowdin link for translations to the readme --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index fd3f4d81d..ff9f6862e 100644 --- a/README.md +++ b/README.md @@ -23,5 +23,6 @@ Not for the faint hearted. Only use these if you know what you're doing. * [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. +* [Translations](https://crowdin.com/project/synergy-core) - If you want to submit translations to the Synergy Core. * [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. From c7a55a6fa7b22699b3e41b1ab6dae134891b82da Mon Sep 17 00:00:00 2001 From: Jamie Newbon Date: Mon, 23 Mar 2020 23:32:22 +0000 Subject: [PATCH 06/20] #6622 Moved compiled translations and added language resource file --- src/gui/CMakeLists.txt | 5 +++++ src/gui/res/Languages.qrc | 46 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+) create mode 100644 src/gui/res/Languages.qrc diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt index f662d61e6..bdb4d1f9d 100644 --- a/src/gui/CMakeLists.txt +++ b/src/gui/CMakeLists.txt @@ -12,6 +12,10 @@ file (GLOB LEGACY_ACTIVATION_FILES src/*Activation* src/*License*) file (GLOB LEGACY_ZEROCONF_FILES src/Zeroconf*) file (GLOB LEGACY_LANGUAGE_FILES res/lang/*.ts) +configure_file(res/Languages.qrc res/Languages.qrc) + +set_source_files_properties(${LEGACY_LANGUAGE_FILES} PROPERTIES OUTPUT_LOCATION "${CMAKE_CURRENT_BINARY_DIR}/res/lang") + qt5_add_translation(QM_FILES ${LEGACY_LANGUAGE_FILES}) if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") @@ -34,6 +38,7 @@ add_executable (synergy WIN32 ${LEGACY_GUI_UI_FILES} ${LEGACY_GUI_RC_FILES} res/Synergy.qrc + ${CMAKE_CURRENT_BINARY_DIR}/res/Languages.qrc ${QM_FILES} ) diff --git a/src/gui/res/Languages.qrc b/src/gui/res/Languages.qrc new file mode 100644 index 000000000..f4a718cb3 --- /dev/null +++ b/src/gui/res/Languages.qrc @@ -0,0 +1,46 @@ + + + lang/gui_ar-SA.qm + lang/gui_lv-LV.qm + lang/gui_bg-BG.qm + lang/gui_mr-IN.qm + lang/gui_ca-ES.qm + lang/gui_nl-NL.qm + lang/gui_cs-CZ.qm + lang/gui_no-NO.qm + lang/gui_cy-GB.qm + lang/gui_pl-PL.qm + lang/gui_da-DK.qm + lang/gui_pt-BR.qm + lang/gui_de-DE.qm + lang/gui_pt-PT.qm + lang/gui_el-GR.qm + lang/gui_ro-RO.qm + lang/gui_ru-RU.qm + lang/gui_es-ES.qm + lang/gui_sk-SK.qm + lang/gui_et-EE.qm + lang/gui_sl-SI.qm + lang/gui_fi-FI.qm + lang/gui_sq-AL.qm + lang/gui_fr-FR.qm + lang/gui_sr-SP.qm + lang/gui_gl-ES.qm + lang/gui_sv-SE.qm + lang/gui_he-IL.qm + lang/gui_th-TH.qm + lang/gui_hr-HR.qm + lang/gui_tr-TR.qm + lang/gui_hu-HU.qm + lang/gui_uk-UA.qm + lang/gui_id-ID.qm + lang/gui_ur-IN.qm + lang/gui_it-IT.qm + lang/gui_vi-VN.qm + lang/gui_ja-JP.qm + lang/gui_zh-CN.qm + lang/gui_ko-KR.qm + lang/gui_zh-TW.qm + lang/gui_lt-LT.qm + + From a38ac37280a05744ee96aa726fcd3acc0a3dba1a Mon Sep 17 00:00:00 2001 From: Jamie Newbon Date: Mon, 23 Mar 2020 23:38:18 +0000 Subject: [PATCH 07/20] #6622 Changed translation command to update ts files as well --- src/gui/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt index bdb4d1f9d..80b37f7b5 100644 --- a/src/gui/CMakeLists.txt +++ b/src/gui/CMakeLists.txt @@ -16,7 +16,7 @@ configure_file(res/Languages.qrc res/Languages.qrc) set_source_files_properties(${LEGACY_LANGUAGE_FILES} PROPERTIES OUTPUT_LOCATION "${CMAKE_CURRENT_BINARY_DIR}/res/lang") -qt5_add_translation(QM_FILES ${LEGACY_LANGUAGE_FILES}) +qt5_create_translation(QM_FILES ${LEGACY_LANGUAGE_FILES}) if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") file (GLOB LEGACY_GUI_MAC_SOURCE_FILES src/*.mm) From 91db5906f5faa7efd8207e9a1c25e0b0a12f5e98 Mon Sep 17 00:00:00 2001 From: Jamie Newbon Date: Mon, 23 Mar 2020 23:51:03 +0000 Subject: [PATCH 08/20] #6622 Updated update languages command --- src/gui/lang.cmd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/lang.cmd b/src/gui/lang.cmd index 44185934c..9fb094333 100644 --- a/src/gui/lang.cmd +++ b/src/gui/lang.cmd @@ -1 +1 @@ -lupdate -noobsolete gui.pro -ts gui.ts \ No newline at end of file +lupdate -noobsolete gui.pro -ts gui.ts res/lang/*.ts \ No newline at end of file From 1cd306628302df53cf2e41c9aac05cf9822d1a99 Mon Sep 17 00:00:00 2001 From: Jamie Newbon Date: Tue, 24 Mar 2020 00:26:17 +0000 Subject: [PATCH 09/20] #6622 Fixed error in html text cause all translations to fail to build silently --- src/gui/src/SetupWizardBase.ui | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/src/gui/src/SetupWizardBase.ui b/src/gui/src/SetupWizardBase.ui index 8c0898861..7ec85fb45 100644 --- a/src/gui/src/SetupWizardBase.ui +++ b/src/gui/src/SetupWizardBase.ui @@ -156,11 +156,7 @@ - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">My main mouse and keyboard are connected to this computer. This will allow you to move your mouse over to another computer's screen. There can only be one server in your setup.</span></p></body></html> + My main mouse and keyboard are connected to this computer. This will allow you to move your mouse over to another computer's screen. There can only be one server in your setup. true @@ -205,11 +201,7 @@ p, li { white-space: pre-wrap; } - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">You have already set up a server. This computer will be controlled using the server's mouse and keyboard. There can be many clients in your setup.</span></p></body></html> + You have already set up a server. This computer will be controlled using the server's mouse and keyboard. There can be many clients in your setup. true From 3eb2fe26f0d11fb09468389fd46575cac9f6d1c0 Mon Sep 17 00:00:00 2001 From: Jamie Newbon Date: Tue, 24 Mar 2020 00:29:08 +0000 Subject: [PATCH 10/20] #6622 Fixed accidentally removed image --- src/gui/res/Synergy.qrc | 1 + 1 file changed, 1 insertion(+) diff --git a/src/gui/res/Synergy.qrc b/src/gui/res/Synergy.qrc index d17aab71d..0d73e05fb 100644 --- a/src/gui/res/Synergy.qrc +++ b/src/gui/res/Synergy.qrc @@ -18,5 +18,6 @@ icons/64x64/synergy-light-transfering.png icons/64x64/synergy-light-disconnected.png icons/64x64/synergy-light-connected.png + icons/16x16/auto-config.png From 5bdafa321480eae5758c832109b0146286c86a14 Mon Sep 17 00:00:00 2001 From: Jamie Newbon Date: Tue, 24 Mar 2020 00:45:11 +0000 Subject: [PATCH 11/20] Revert "#6622 Changed translation command to update ts files as well" This reverts commit a38ac372 --- src/gui/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt index 80b37f7b5..bdb4d1f9d 100644 --- a/src/gui/CMakeLists.txt +++ b/src/gui/CMakeLists.txt @@ -16,7 +16,7 @@ configure_file(res/Languages.qrc res/Languages.qrc) set_source_files_properties(${LEGACY_LANGUAGE_FILES} PROPERTIES OUTPUT_LOCATION "${CMAKE_CURRENT_BINARY_DIR}/res/lang") -qt5_create_translation(QM_FILES ${LEGACY_LANGUAGE_FILES}) +qt5_add_translation(QM_FILES ${LEGACY_LANGUAGE_FILES}) if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") file (GLOB LEGACY_GUI_MAC_SOURCE_FILES src/*.mm) From 3841c91b5623ed62e54ddfc9a4983b2886c39be4 Mon Sep 17 00:00:00 2001 From: Jamie Newbon Date: Tue, 24 Mar 2020 10:29:23 +0000 Subject: [PATCH 12/20] #6622 Removed Serra from pipelines as it was obsoleted by azure --- azure-pipelines.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 6d9888eb5..60ccc2f3d 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -64,8 +64,6 @@ jobs: - job: MacOS strategy: matrix: - sierra: - image: macOS-10.13 mojave: image: macOS-10.14 From 2262a2c715954e4f2e731cd2af7bdb6dafd699fb Mon Sep 17 00:00:00 2001 From: Jamie Newbon Date: Tue, 24 Mar 2020 11:56:33 +0000 Subject: [PATCH 13/20] #6622 Changed Cmake to 3.14 --- azure-pipelines.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 60ccc2f3d..c1c4d4e72 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -47,11 +47,16 @@ jobs: sudo ln -snf /usr/share/zoneinfo/Europe/London /etc/localtime sudo bash -c "echo 'Europe/London' > /etc/timezone" displayName: 'Sort out timezones for updates' + - script: | + wget https://github.com/Kitware/CMake/releases/download/v3.14.7/cmake-3.14.7-Linux-x86_64.sh + chmod +x ./cmake-3.14.7-Linux-x86_64.sh + ./cmake-3.14.7-Linux-x86_64.sh --skip-license + displayName: 'Installing CMake 3.14' - script: | sudo DEBIAN_FRONTEND=noninteractive sudo apt-get -y update sudo apt-get -y upgrade - sudo apt-get -y install git cmake qtbase5-dev build-essential libx11-dev libxtst-dev libgl1-mesa-dev libssl-dev libavahi-compat-libdnssd-dev debhelper devscripts + sudo apt-get -y install git qtbase5-dev build-essential libx11-dev libxtst-dev libgl1-mesa-dev libssl-dev libavahi-compat-libdnssd-dev debhelper devscripts sudo apt-get -y install qttools5-dev qttools5-dev-tools --no-install-recommends #These will try to install gnome if we allow dependancies displayName: 'Install Pakages' - script: | From cb6d67cd18b83c7ba0b01d69520cd1136f9ece4d Mon Sep 17 00:00:00 2001 From: Jamie Newbon Date: Tue, 24 Mar 2020 11:59:32 +0000 Subject: [PATCH 14/20] #6622 Changed Cmake to 3.14 --- azure-pipelines.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index c1c4d4e72..712a6688d 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -48,14 +48,15 @@ jobs: sudo bash -c "echo 'Europe/London' > /etc/timezone" displayName: 'Sort out timezones for updates' - script: | - wget https://github.com/Kitware/CMake/releases/download/v3.14.7/cmake-3.14.7-Linux-x86_64.sh - chmod +x ./cmake-3.14.7-Linux-x86_64.sh - ./cmake-3.14.7-Linux-x86_64.sh --skip-license - displayName: 'Installing CMake 3.14' - - script: | - sudo DEBIAN_FRONTEND=noninteractive sudo apt-get -y update sudo apt-get -y upgrade + sudo apt install wget + wget https://github.com/Kitware/CMake/releases/download/v3.14.7/cmake-3.14.7-Linux-x86_64.sh + sudo chmod +x ./cmake-3.14.7-Linux-x86_64.sh + sudo ./cmake-3.14.7-Linux-x86_64.sh --skip-license + displayName: 'Installing CMake 3.14' + - script: | + sudo DEBIAN_FRONTEND=noninteractive sudo apt-get -y install git qtbase5-dev build-essential libx11-dev libxtst-dev libgl1-mesa-dev libssl-dev libavahi-compat-libdnssd-dev debhelper devscripts sudo apt-get -y install qttools5-dev qttools5-dev-tools --no-install-recommends #These will try to install gnome if we allow dependancies displayName: 'Install Pakages' From 9b9122daef52ceb4ca93050d8369bb1a2d155b98 Mon Sep 17 00:00:00 2001 From: Jamie Newbon Date: Tue, 24 Mar 2020 12:01:34 +0000 Subject: [PATCH 15/20] #6622 Changed Cmake to 3.14 --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 712a6688d..5c76f0b69 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -50,7 +50,7 @@ jobs: - script: | sudo apt-get -y update sudo apt-get -y upgrade - sudo apt install wget + sudo apt-get -y install wget wget https://github.com/Kitware/CMake/releases/download/v3.14.7/cmake-3.14.7-Linux-x86_64.sh sudo chmod +x ./cmake-3.14.7-Linux-x86_64.sh sudo ./cmake-3.14.7-Linux-x86_64.sh --skip-license From df2858cd0b4160285790c436af2533dcdb8cc39a Mon Sep 17 00:00:00 2001 From: Jamie Newbon Date: Tue, 24 Mar 2020 12:13:54 +0000 Subject: [PATCH 16/20] #6622 Changed Cmake to 3.14 --- azure-pipelines.yml | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 5c76f0b69..5520c6ca1 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -48,19 +48,16 @@ jobs: sudo bash -c "echo 'Europe/London' > /etc/timezone" displayName: 'Sort out timezones for updates' - script: | + sudo DEBIAN_FRONTEND=noninteractive sudo apt-get -y update sudo apt-get -y upgrade - sudo apt-get -y install wget - wget https://github.com/Kitware/CMake/releases/download/v3.14.7/cmake-3.14.7-Linux-x86_64.sh - sudo chmod +x ./cmake-3.14.7-Linux-x86_64.sh - sudo ./cmake-3.14.7-Linux-x86_64.sh --skip-license - displayName: 'Installing CMake 3.14' - - script: | - sudo DEBIAN_FRONTEND=noninteractive - sudo apt-get -y install git qtbase5-dev build-essential libx11-dev libxtst-dev libgl1-mesa-dev libssl-dev libavahi-compat-libdnssd-dev debhelper devscripts + sudo apt-get -y install git wget qtbase5-dev build-essential libx11-dev libxtst-dev libgl1-mesa-dev libssl-dev libavahi-compat-libdnssd-dev debhelper devscripts sudo apt-get -y install qttools5-dev qttools5-dev-tools --no-install-recommends #These will try to install gnome if we allow dependancies displayName: 'Install Pakages' - script: | + wget https://github.com/Kitware/CMake/releases/download/v3.14.7/cmake-3.14.7-Linux-x86_64.sh + sudo chmod +x ./cmake-3.14.7-Linux-x86_64.sh + sudo ./cmake-3.14.7-Linux-x86_64.sh --skip-license mkdir build cd build cmake .. From d2e236f1725a18d3254c813d9a3d4bf18fed97ae Mon Sep 17 00:00:00 2001 From: Jamie Newbon Date: Tue, 24 Mar 2020 12:19:43 +0000 Subject: [PATCH 17/20] #6622 Changed Cmake to 3.14 --- azure-pipelines.yml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 5520c6ca1..0607c27c8 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -51,13 +51,17 @@ jobs: sudo DEBIAN_FRONTEND=noninteractive sudo apt-get -y update sudo apt-get -y upgrade - sudo apt-get -y install git wget qtbase5-dev build-essential libx11-dev libxtst-dev libgl1-mesa-dev libssl-dev libavahi-compat-libdnssd-dev debhelper devscripts + sudo apt-get -y install wget + wget https://github.com/Kitware/CMake/releases/download/v3.14.7/cmake-3.14.7-Linux-x86_64.sh + sudo chmod +x ./cmake-3.14.7-Linux-x86_64.sh + sudo ./cmake-3.14.7-Linux-x86_64.sh --skip-license --prefix=/ + displayName: 'Installing CMake 3.14' + - script: | + sudo DEBIAN_FRONTEND=noninteractive + sudo apt-get -y install git qtbase5-dev build-essential libx11-dev libxtst-dev libgl1-mesa-dev libssl-dev libavahi-compat-libdnssd-dev debhelper devscripts sudo apt-get -y install qttools5-dev qttools5-dev-tools --no-install-recommends #These will try to install gnome if we allow dependancies displayName: 'Install Pakages' - script: | - wget https://github.com/Kitware/CMake/releases/download/v3.14.7/cmake-3.14.7-Linux-x86_64.sh - sudo chmod +x ./cmake-3.14.7-Linux-x86_64.sh - sudo ./cmake-3.14.7-Linux-x86_64.sh --skip-license mkdir build cd build cmake .. From 07a70ec6f64e6cdc53b5c35dbd1a8919e9571603 Mon Sep 17 00:00:00 2001 From: Jamie Newbon Date: Tue, 24 Mar 2020 13:21:16 +0000 Subject: [PATCH 18/20] #6622 Changed Cmake to 3.14 --- azure-pipelines.yml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 0607c27c8..3ef0e5f12 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -47,20 +47,23 @@ jobs: sudo ln -snf /usr/share/zoneinfo/Europe/London /etc/localtime sudo bash -c "echo 'Europe/London' > /etc/timezone" displayName: 'Sort out timezones for updates' + - script: | sudo DEBIAN_FRONTEND=noninteractive sudo apt-get -y update sudo apt-get -y upgrade + sudo apt-get -y install git qtbase5-dev build-essential libx11-dev libxtst-dev libgl1-mesa-dev libssl-dev libavahi-compat-libdnssd-dev debhelper devscripts + sudo apt-get -y install qttools5-dev qttools5-dev-tools --no-install-recommends #These will try to install gnome if we allow dependancies + displayName: 'Install Pakages' + + - script: | + sudo DEBIAN_FRONTEND=noninteractive sudo apt-get -y install wget wget https://github.com/Kitware/CMake/releases/download/v3.14.7/cmake-3.14.7-Linux-x86_64.sh sudo chmod +x ./cmake-3.14.7-Linux-x86_64.sh sudo ./cmake-3.14.7-Linux-x86_64.sh --skip-license --prefix=/ displayName: 'Installing CMake 3.14' - - script: | - sudo DEBIAN_FRONTEND=noninteractive - sudo apt-get -y install git qtbase5-dev build-essential libx11-dev libxtst-dev libgl1-mesa-dev libssl-dev libavahi-compat-libdnssd-dev debhelper devscripts - sudo apt-get -y install qttools5-dev qttools5-dev-tools --no-install-recommends #These will try to install gnome if we allow dependancies - displayName: 'Install Pakages' + - script: | mkdir build cd build From 0a539c245350a1c56a5c6518c3d33e63debb5337 Mon Sep 17 00:00:00 2001 From: Jamie Newbon Date: Wed, 25 Mar 2020 12:01:32 +0000 Subject: [PATCH 19/20] #6622 Split deb jobs --- azure-pipelines.yml | 57 ++++++++++++++++++++++++++++++++++----------- 1 file changed, 43 insertions(+), 14 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 3ef0e5f12..158b235a6 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -26,19 +26,15 @@ jobs: make displayName: 'Build' -- job: LinuxDeb +- job: LinuxDeb1 pool: vmImage: 'ubuntu-16.04' strategy: matrix: - ubuntu16: - image: symless/ubuntu-sudo:16.04 ubuntu18: image: symless/ubuntu-sudo:18.04 ubuntu19: image: symless/ubuntu-sudo:19.04 - debian9: - image: symless/debian-sudo:stretch container: $[ variables['image'] ] @@ -52,18 +48,10 @@ jobs: sudo DEBIAN_FRONTEND=noninteractive sudo apt-get -y update sudo apt-get -y upgrade - sudo apt-get -y install git qtbase5-dev build-essential libx11-dev libxtst-dev libgl1-mesa-dev libssl-dev libavahi-compat-libdnssd-dev debhelper devscripts + sudo apt-get -y install git cmake qtbase5-dev build-essential libx11-dev libxtst-dev libgl1-mesa-dev libssl-dev libavahi-compat-libdnssd-dev debhelper devscripts sudo apt-get -y install qttools5-dev qttools5-dev-tools --no-install-recommends #These will try to install gnome if we allow dependancies displayName: 'Install Pakages' - - script: | - sudo DEBIAN_FRONTEND=noninteractive - sudo apt-get -y install wget - wget https://github.com/Kitware/CMake/releases/download/v3.14.7/cmake-3.14.7-Linux-x86_64.sh - sudo chmod +x ./cmake-3.14.7-Linux-x86_64.sh - sudo ./cmake-3.14.7-Linux-x86_64.sh --skip-license --prefix=/ - displayName: 'Installing CMake 3.14' - - script: | mkdir build cd build @@ -71,6 +59,47 @@ jobs: make displayName: 'Build' +- job: LinuxDeb2 + pool: + vmImage: 'ubuntu-16.04' + strategy: + matrix: + ubuntu16: + image: symless/ubuntu-sudo:16.04 + debian9: + image: symless/debian-sudo:stretch + + container: $[ variables['image'] ] + + steps: + - script: | + sudo ln -snf /usr/share/zoneinfo/Europe/London /etc/localtime + sudo bash -c "echo 'Europe/London' > /etc/timezone" + displayName: 'Sort out timezones for updates' + + - script: | + sudo DEBIAN_FRONTEND=noninteractive + sudo apt-get -y update + sudo apt-get -y upgrade + sudo apt-get -y install git qtbase5-dev build-essential libx11-dev libxtst-dev libgl1-mesa-dev libssl-dev libavahi-compat-libdnssd-dev debhelper devscripts + sudo apt-get -y install qttools5-dev qttools5-dev-tools --no-install-recommends #These will try to install gnome if we allow dependancies + displayName: 'Install Pakages' + + - script: | + sudo DEBIAN_FRONTEND=noninteractive + sudo apt-get -y install wget + wget https://github.com/Kitware/CMake/releases/download/v3.14.7/cmake-3.14.7-Linux-x86_64.sh + sudo chmod +x ./cmake-3.14.7-Linux-x86_64.sh + sudo ./cmake-3.14.7-Linux-x86_64.sh --skip-license --prefix=/ + displayName: 'Installing CMake 3.14' + + - script: | + mkdir build + cd build + cmake .. + make + displayName: 'Build' + - job: MacOS strategy: matrix: From 8cda3b7076216db55c716a695adf44f0bdde4248 Mon Sep 17 00:00:00 2001 From: Jamie Newbon Date: Wed, 25 Mar 2020 13:48:09 +0000 Subject: [PATCH 20/20] Set stage back to snapshot --- cmake/Version.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/Version.cmake b/cmake/Version.cmake index 9274a5aa4..b7c3420f9 100644 --- a/cmake/Version.cmake +++ b/cmake/Version.cmake @@ -6,8 +6,8 @@ cmake_minimum_required (VERSION 3.4) set (SYNERGY_VERSION_MAJOR 1) set (SYNERGY_VERSION_MINOR 11) -set (SYNERGY_VERSION_PATCH 1) -set (SYNERGY_VERSION_STAGE "stable") +set (SYNERGY_VERSION_PATCH 2) +set (SYNERGY_VERSION_STAGE "snapshot") # # Version from CI