[Version] bump to 2.3.1 for new release

Delete .travis.yml As We Switch To Azure Pipelines (#376 )
Delete .travis.yml As We Switch To Azure Pipelines
2026-02-12 22:55:53 +08:00 · 2019-08-09 16:17:30 -04:00 · 2019-08-09 09:34:51 -04:00 · 2019-08-09 09:31:31 -04:00 · 2019-08-05 12:07:06 -04:00 · 2019-08-04 18:02:21 -04:00
10 changed files with 126 additions and 152 deletions
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,34 +0,0 @@
-language: cpp
-
-matrix:
-  include:
-    - os: linux
-      sudo: false
-      dist: trusty
-      addons:
-        apt:
-          packages:
-            - libxtst-dev
-            - qtdeclarative5-dev
-            - libavahi-compat-libdnssd-dev
-      script: sh -x ./clean_build.sh
-
-    - os: osx
-      osx_image: xcode9
-      script:
-        - export COLUMNS=80
-        - curl -LO https://raw.githubusercontent.com/GiovanniBussi/macports-ci/master/macports-ci
-        - chmod +x ./macports-ci
-        - ./macports-ci install
-        - PATH="$PATH:/opt/local/bin"
-        - sudo port -N install qt5-qtbase openssl
-        - sh -x ./clean_build.sh
-
-    - os: osx
-      osx_image: xcode9
-      script:
-        - brew update
-        - brew install qt openssl
-        - sh -x ./clean_build.sh
-
-install: true
--- a/Build.properties
+++ b/Build.properties
@@ -1,7 +1,7 @@
 #
 # Barrier build parameters
 #
-BARRIER_VERSION_MAJOR = 1
-BARRIER_VERSION_MINOR = 9
-BARRIER_VERSION_PATCH = 0
+BARRIER_VERSION_MAJOR = 2
+BARRIER_VERSION_MINOR = 3
+BARRIER_VERSION_PATCH = 1
 BARRIER_VERSION_STAGE = snapshot
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -21,6 +21,7 @@ project (barrier C CXX)
 option (BARRIER_BUILD_GUI "Build the GUI" ON)
 option (BARRIER_BUILD_INSTALLER "Build the installer" ON)

+set (CMAKE_EXPORT_COMPILE_COMMANDS ON)
 set (CMAKE_CXX_STANDARD 14)
 set (CMAKE_CXX_EXTENSIONS OFF)
 set (CMAKE_CXX_STANDARD_REQUIRED ON)
--- a/README.md
+++ b/README.md
@@ -1,15 +1,21 @@
 # Barrier

 Eliminate the barrier between your machines. 
-Find [releaes here](https://github.com/debauchee/barrier/releases).
+Find [releases here](https://github.com/debauchee/barrier/releases).

 ### Contact info:

 - `#barrier` on freenode

-Master branch build status: &nbsp; [![Build Status](https://travis-ci.org/debauchee/barrier.svg?branch=master)](https://travis-ci.org/debauchee/barrier)
+#### CI Build Status

-Azure Pipelines 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)
+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)
+* Linux Build Status: [![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: [![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: [![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: [![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)
+
+Our CI Builds are provided by Microsoft Azure Pipelines.

 ### What is it?

@@ -36,3 +42,21 @@ For short and simple questions or to just say hello find us on the Freenode IRC
 ### 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.
+
+### FAQ
+
+Q: Does drag and drop work on linux?
+
+A: No
+
+Q: What OSes are supported?
+
+A:
+  - Windows 7, 8, 8.1, and 10
+  - MacOS/OS X
+  - Linux
+  - FreeBSD
+
+Q: Are 32-bit versions of Windows supported?
+
+A: No
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -48,7 +48,10 @@ jobs:
      displayName: Publish Completed Build Directory Archive Build Artifact
      inputs:
        pathtoPublish: $(Build.ArtifactStagingDirectory)\$(CI_ENV_BUILD_TYPE).zip
-        artifactName: $(CI_ENV_BUILD_TYPE)
+        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')
@@ -57,13 +60,14 @@ jobs:
      condition: eq(variables['CI_ENV_BUILD_TYPE'], 'Release')
      inputs:
        pathtoPublish: build\installer-inno\bin
-        artifactName: Release Installer
+        artifactName: Windows Release Installer

 - job: LinuxBuild
  displayName: Linux Build
  pool:
    vmImage: 'ubuntu-16.04'
  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
@@ -73,10 +77,21 @@ jobs:
  displayName: Mac Build
  pool:
    vmImage: 'macOS-10.14'
+  strategy:
+    matrix:
+      Release:
+        B_BUILD_TYPE: Release
+        BARRIER_VERSION_STAGE: Release
  steps:
-    - script: brew update
-      displayName: Update brew
-    - script: brew install qt openssl
-      displayName: Install Dependencies
+    - script: brew install https://raw.githubusercontent.com/Homebrew/homebrew-core/aac86fc018c48d7b6f23a2e7535276899774567a/Formula/qt.rb
+      displayName: Installed Pinned Qt
+    - script: brew install https://raw.githubusercontent.com/Homebrew/homebrew-core/aac86fc018c48d7b6f23a2e7535276899774567a/Formula/openssl.rb
+      displayName: Installed Pinned OpenSSL
    - 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
--- a/azure-pipelines/download_install_qt.ps1
+++ b/azure-pipelines/download_install_qt.ps1
@@ -1,6 +1,6 @@
 $ErrorActionPreference = "Stop"

-$qli_install_version = '2019.05.12.4'
+$qli_install_version = '2019.05.26.1'
 $qt_version = '5.12.3'

 New-Item -Force -ItemType Directory -Path ".\deps\"
@@ -21,5 +21,6 @@ Write-Output 'Installed QLI Installer Dependencies'

 Write-Output 'Starting QT Installer'
 $Env:QLI_OUT_DIR = ".\deps\Qt\Qt$qt_version"
+$Env:QLI_BASE_URL = "http://mirrors.ocf.berkeley.edu/qt/online/qtsdkrepository/"
 python .\deps\qli-installer\qli-installer.py $qt_version windows desktop win64_msvc2017_64
 Write-Output 'Installed QT Installer'
--- a/cmake/Version.cmake
+++ b/cmake/Version.cmake
@@ -1,8 +1,8 @@
 cmake_minimum_required (VERSION 3.4)

 set (BARRIER_VERSION_MAJOR 2)
-set (BARRIER_VERSION_MINOR 2)
-set (BARRIER_VERSION_PATCH 0)
+set (BARRIER_VERSION_MINOR 3)
+set (BARRIER_VERSION_PATCH 1)

 #
 # Barrier Version
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -1,104 +1,83 @@
 name: barrier-kvm # the Barrier Snappy for Linux / not tested on MAC yet
 base: core18 
-version: '2.2.0' # 03/2019 
-summary: Eliminate the barrier between your machines.
-description: |
-       Barrier is KVM software forked from Symless's synergy 1.9 codebase. 
-       Synergy was a commercialized reimplementation of the original 
-       CosmoSynergy written by Chris Schoeneman.
+version: master
+version-script: git describe --tags --long | sed "s/^v//"
+adopt-info: appstream-flathub
 grade: stable # must be 'stable' to release into candidate/stable channels
 confinement: strict # use 'strict' once you have the right plugs and slots
+icon: res/barrier.svg
+license: GPL-2.0

 apps:
-  barrier-kvm:
+  barrier:
    command: desktop-launch barrier #first run might take longer
-    plugs:
-      gnome-3-26-1604:
-        interface: content
-        target: gnome-platform
-        default-provider: gnome-3-26-1604:gnome-3-26-1604
-    plugs: [gnome-3-26-1604]
-    plugs: [x11]
-parts: [qt5conf]
+    desktop: usr/share/applications/barrier.desktop
+    common-id: com.github.debauchee.barrier
+    plugs: &plugs
+      - desktop
+      - desktop-legacy
+      - home
+      - joystick
+      - network
+      - opengl
+      - pulseaudio
+      - screen-inhibit-control
+      - unity7
+      - wayland
+      - x11
+  barrierc:
+    command: desktop-launch barrierc
+    plugs: *plugs
+  barriers:
+    command: desktop-launch barriers
+    plugs: *plugs
+
 parts:
-  desktop:
-    plugin: nil
-    source: https://github.com/ubuntu/snapcraft-desktop-helpers.git
  desktop-qt5:
    source: https://github.com/ubuntu/snapcraft-desktop-helpers.git
    source-subdir: qt
    plugin: make
-    make-parameters: ["FLAVOR=qt5"]
-    build-packages:
-      - build-essential
-      - qtbase5-dev
-      - dpkg-dev
-    stage-packages:
-      - libxkbcommon0
-      - ttf-ubuntu-font-family
-      - dmz-cursor-theme
-      - light-themes
-      - adwaita-icon-theme
-      - gnome-themes-standard
-      - shared-mime-info
-      - libqt5gui5
-      - libgdk-pixbuf2.0-0
-      - libqt5svg5 # for loading icon themes which are svg
-      - try: [appmenu-qt5] # not available on core18
-      - locales-all
-      - xdg-user-dirs
-      - fcitx-frontend-qt5  
-  qt5:
-    source: https://github.com/ubuntu/snapcraft-desktop-helpers.git    
-    source-subdir: qt
-    plugin: make
-    make-parameters: ["FLAVOR=qt5"]
-    build-packages:
-      - qtbase5-dev
-      - dpkg-dev
-    stage-packages:
-      - libxkbcommon0
-      - ttf-ubuntu-font-family
-      - dmz-cursor-theme
-      - light-themes
-      - adwaita-icon-theme
-      - gnome-themes-standard
-      - shared-mime-info
-      - libqt5gui5
-      - libgdk-pixbuf2.0-0
-      - libqt5svg5 # for loading icon themes which are svg
-      - try: [appmenu-qt5] # not available on core18
-      - locales-all    
-  barrier-kvm:
-    source: https://github.com/payomagic/barrier.git
+
+  barrier:
+    source: .
    plugin: cmake
+    configflags:
+      - "-DCMAKE_INSTALL_PREFIX=/usr"
    build-packages:
-      - g++
-      - gcc
-      - make
      - xorg-dev 
      - libcurl4-openssl-dev
      - libavahi-compat-libdnssd-dev
      - libssl-dev
      - libx11-dev
-      - libqt4-dev
      - qtbase5-dev
      - qt5-style-plugins
-      - qt5ct
-    stage-packages:
      - libxinerama-dev
-      - libxinerama1
      - libxrandr-dev
-      - libxrandr2
      - libxrender-dev
-      - libxrender1
      - libxtst-dev
      - qtdeclarative5-dev
-      - libavahi-compat-libdnssd-dev
-      - libqt5gui5
      - libavahi-common-dev
+      - libqt5svg5-dev
+    stage-packages:
+      - libxinerama1
+      - libxrandr2
+      - libxrender1
+      - libqt5gui5
      - libqt5x11extras5
      - libqt5svg5
-      - libqt5svg5-dev
-      - qt5ct
+      - libxtst6
+      - libavahi-client3
+      - libavahi-common3
+      - libavahi-compat-libdnssd1
    after: [desktop-qt5]
+
+  fix-icon:
+    plugin: nil
+    override-build:
+      sed -i 's|Icon=barrier|Icon=/usr/share/icons/hicolor/scalable/apps/barrier.svg|' $SNAPCRAFT_STAGE/usr/share/applications/barrier.desktop
+    after: [barrier]
+
+  appstream-flathub:
+    plugin: dump
+    source: https://github.com/flathub/com.github.debauchee.barrier.git
+    parse-info: [com.github.debauchee.barrier.appdata.xml]
--- a/src/lib/barrier/KeyMap.cpp
+++ b/src/lib/barrier/KeyMap.cpp
@@ -1104,6 +1104,7 @@ KeyMap::getDeadKey(KeyID key)
    case '`':
        return kKeyDeadGrave;

+    case '\'':
    case 0xb4u:
        return kKeyDeadAcute;

--- a/src/lib/platform/OSXScreen.mm
+++ b/src/lib/platform/OSXScreen.mm
@@ -1263,36 +1263,23 @@ OSXScreen::onKey(CGEventRef event)
 		return true;
 	}

-	// check for hot key.  when we're on a secondary screen we disable
-	// all hotkeys so we can capture the OS defined hot keys as regular
-	// keystrokes but that means we don't get our own hot keys either.
-	// so we check for a key/modifier match in our hot key map.
-	if (!m_isOnScreen) {
-		HotKeyToIDMap::const_iterator i =
-			m_hotKeyToIDMap.find(HotKeyItem(virtualKey, 
-											 m_keyState->mapModifiersToCarbon(macMask) 
-											 & 0xff00u));
-		if (i != m_hotKeyToIDMap.end()) {
-			UInt32 id = i->second;
-	
-			// determine event type
-			Event::Type type;
-			//UInt32 eventKind = GetEventKind(event);
-			if (eventKind == kCGEventKeyDown) {
-				type = m_events->forIPrimaryScreen().hotKeyDown();
-			}
-			else if (eventKind == kCGEventKeyUp) {
-				type = m_events->forIPrimaryScreen().hotKeyUp();
-			}
-			else {
-				return false;
-			}
-	
-			m_events->addEvent(Event(type, getEventTarget(),
-										HotKeyInfo::alloc(id)));
-		
-			return true;
+	HotKeyToIDMap::const_iterator i = m_hotKeyToIDMap.find(HotKeyItem(virtualKey, m_keyState->mapModifiersToCarbon(macMask) & 0xff00u));
+	if (i != m_hotKeyToIDMap.end()) {
+		UInt32 id = i->second;
+		// determine event type
+		Event::Type type;
+		//UInt32 eventKind = GetEventKind(event);
+		if (eventKind == kCGEventKeyDown) {
+			type = m_events->forIPrimaryScreen().hotKeyDown();
 		}
+		else if (eventKind == kCGEventKeyUp) {
+			type = m_events->forIPrimaryScreen().hotKeyUp();
+		}
+		else {
+			return false;
+		}
+		m_events->addEvent(Event(type, getEventTarget(), HotKeyInfo::alloc(id)));
+		return true;
 	}

 	// decode event type
Author	SHA1	Message	Date
Adrian Lucrèce Céleste	58d8f020dc	[Version] bump to 2.3.1 for new release	2019-08-09 16:17:30 -04:00
Adrian Lucrèce Céleste	910f1f3ac1	Delete .travis.yml As We Switch To Azure Pipelines (#376 ) Delete .travis.yml As We Switch To Azure Pipelines	2019-08-09 09:34:51 -04:00
walker0643	f7b7c55b53	Drop Travis CI	2019-08-09 09:31:31 -04:00
Adrian Lucrèce Céleste	c6ff6a6de6	Merge pull request #374 from TafThorne/patch-1 Reference Only Microsoft Azue Pipelines In Readme.md	2019-08-05 12:07:06 -04:00
Adrian Lucrèce Céleste	0ddd38ece1	Merge pull request #373 from shymega/feature/compile_commands_cmake Feature: CMake now generates compile_commands.json	2019-08-04 18:02:21 -04:00
Thomas Thorne	3e3e183e75	Delete .travis.yml As We Switch To Azure Pipelines Azure Pipelines have been made to work well enough for this project. All other CI systems are to be disabled as mentioned dunder #308 Delete the .travis.yml file now that it is not longer needed. It can be recovered from git history if we ever wish to resurrect it. A separate action will need to be taken by someone with administrator access to the present https://travis-ci.org/debauchee/barrier project to unlink from the system there.	2019-07-26 10:52:01 +01:00
Thomas Thorne	6dc59d14a3	Reference Only Microsoft Azue Pipelines In Readme.md We plan to remove all the CI pipeline apart from Microsoft Azue Pipelines. This was documented under #308 after the Azure Pipeline system was successfully integrated under #303 and shown to provide all the build targetes we needed. As there are presently have 4 seperate main build targes. As well as giving the overall master branch status in the Readme (which forms part of the main page on github.com) also show the seperate build status. This makes it clear if a single part fails and gives an obvious indicator that this project works for Linux, Mac and Windows.	2019-07-26 10:24:37 +01:00
Dom Rodriguez	f399c8c642	Feature: CMake now generates compile_commands.json This commit adds suppotr for generating a 'compile commands' JSON file. This provides fairly sufficient autocomplete support for most text editors, such as (Neo)vim and VS Code. It specifies include paths, and the compiler arguments used to compile each source file. Signed-off-by: Dom Rodriguez <shymega@shymega.org.uk>	2019-07-25 13:46:00 +01:00
Adrian Lucrèce Céleste	ea0717b5f5	Merge pull request #368 from maxiberta/snap-fix-version-script Fix snap version-control script for local LXD builds	2019-07-23 19:00:26 -04:00
Maximiliano Bertacchini	4e83ea7f9a	Fix snap version-control script for local lxd builds.	2019-07-23 18:44:12 -03:00
Maximiliano Bertacchini	f23a2ecec3	Use appstream metadata from flathub.	2019-07-10 15:38:01 -04:00
Maximiliano Bertacchini	30bc1948c6	Set snap icon and license.	2019-07-10 15:38:01 -04:00
Maximiliano Bertacchini	bad0373bbb	Add desktop entry with an app icon.	2019-07-10 15:38:01 -04:00
Maximiliano Bertacchini	7a2c3f7741	Update build-packages and stage-packages.	2019-07-10 15:38:01 -04:00
Maximiliano Bertacchini	e2f59c7475	Drop custom qt5, use distro provided one.	2019-07-10 15:38:01 -04:00
Maximiliano Bertacchini	49210e1ea4	Add commands: `barrier`, `barrierc`, `barriers`.	2019-07-10 15:38:01 -04:00
Maximiliano Bertacchini	1c5a95f810	Fix interface plugs.	2019-07-10 15:38:01 -04:00
Maximiliano Bertacchini	1c398dcd66	Use version from git tag.	2019-07-10 15:38:01 -04:00
Patrizio Tufarolo	40ee389296	Fixed quote key on US International keyboard Fixes single quote key on US international keyboard, backported from symless/synergy-core#6448	2019-07-10 09:28:22 -04:00
Nelson Chen	af444a6932	Ensure Inno Setup 5 is installed in Azure Pipelines	2019-07-09 08:25:20 -04:00
Adrian Lucrèce Céleste	8e8b38b493	[Cmake] bump version to 2.3.0	2019-06-27 21:33:34 -04:00
Adrian Lucrèce Céleste	8e1a5921f6	[Release] Bump up to a new release version	2019-06-27 21:18:24 -04:00
Adrian Lucrèce Céleste	1e118ee8e8	[README] Add FaQ to the bottom	2019-06-26 18:07:19 -04:00
Chun Wang	0f5cdecf51	Fix #232 MACOS serious config file errors - hotkeys totally broken	2019-06-14 12:22:56 -07:00
Adrian Lucrèce Céleste	6c19a87f63	Add Q/A about 32-bit windows Clarify that 32-bit editions of windows are not supported.	2019-06-14 09:34:18 -04:00
Adrian Lucrèce Céleste	b3374a07ed	Add a quick Q/A about what OSes are supported	2019-06-14 09:32:08 -04:00
Adrian Lucrèce Céleste	b09a3985d0	fix #163	2019-05-30 09:30:38 -04:00
Nelson Chen	40f94c6477	Upgrade QLI Installer and use Cal's Qt Mirror This should provide more reliable Windows builds in CI.	2019-05-26 13:22:10 -04:00
Nelson Chen	0be33c3032	Publish Mac Artifacts	2019-05-26 13:20:00 -04:00
Nelson Chen	500a82824f	Build Release version of Barrier on Mac	2019-05-26 13:20:00 -04:00
Nelson Chen	cd8176e69f	Install Pinned Qt and OpenSSL on Mac	2019-05-26 13:20:00 -04:00
Nelson Chen	ae8ef7f4f2	Prefix Windows artifact names with 'Windows' on Azure Pipelines (#319 )	2019-05-26 13:18:55 -04:00
Nelson Chen	6074f9b648	Update Apt on Linux before installing dependencies on Azure Pipelines (#321 )	2019-05-26 13:16:41 -04:00
pack	a3804c4915	typo fix (#311 )	2019-05-17 22:54:42 -04:00
Adrian Lucrèce Céleste	e4392b51b4	📝 add release link and contact info (#310 ) 📝 add release link and contact info	2019-05-17 19:30:02 -04:00