Compare commits

...

7 Commits

Author SHA1 Message Date
Jnewbon
8c0101405a #6497 Fixed problem with windows version variables not working in cmd 2019-05-09 17:52:59 +01:00
Jamie Newbon
e412cd2189 #6497 Updated ChangLog and version for release 2019-05-09 16:28:07 +01:00
Jnewbon
78be330320 Merge pull request #6497 from symless/v1.10.2
Release v1.10.2-stable
2019-05-09 15:47:04 +01:00
Nick Bolton
6f053590f9 Update README.md 2019-05-03 16:05:00 +01:00
Nick Bolton
2d76a4c5f5 Create ChangeLog 2019-05-03 13:35:39 +01:00
Nick Bolton
faf9e48993 Delete ChangeLog 2019-05-03 13:35:19 +01:00
Nick Bolton
409150ec4f #6485 Copied README.md from v2-dev to master 2019-04-26 17:02:45 +01:00
5 changed files with 31 additions and 7 deletions

2
.gitignore vendored
View File

@@ -22,3 +22,5 @@ src/setup/win32/synergy.suo
/.idea
/cmake-build-debug
/CMakeLists.txt.user
/.vs
/CMakeLists.txt.*

View File

@@ -344,11 +344,11 @@ macro(generate_versionfile)
"export SYNERGY_VERSION_PATCH=\"${SYNERGY_VERSION_PATCH}\"\n"
"export SYNERGY_VERSION_STAGE=\"${SYNERGY_VERSION_STAGE}\"\n")
elseif(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
FILE(WRITE ${CMAKE_BINARY_DIR}/version
"$env:SYNERGY_VERSION_MAJOR=\"${SYNERGY_VERSION_MAJOR}\"\n"
"$env:SYNERGY_VERSION_MINOR=\"${SYNERGY_VERSION_MINOR}\"\n"
"$env:SYNERGY_VERSION_PATCH=\"${SYNERGY_VERSION_PATCH}\"\n"
"$env:SYNERGY_VERSION_STAGE=\"${SYNERGY_VERSION_STAGE}\"\n")
FILE(WRITE ${CMAKE_BINARY_DIR}/version.bat
"SET SYNERGY_VERSION_MAJOR=\"${SYNERGY_VERSION_MAJOR}\"\n"
"SET SYNERGY_VERSION_MINOR=\"${SYNERGY_VERSION_MINOR}\"\n"
"SET SYNERGY_VERSION_PATCH=\"${SYNERGY_VERSION_PATCH}\"\n"
"SET SYNERGY_VERSION_STAGE=\"${SYNERGY_VERSION_STAGE}\"\n")
endif()
endmacro(generate_versionfile)

View File

@@ -1,4 +1,4 @@
v1.10.2-rc2
v1.10.2-stable
==============
Bug fixes:

22
README.md Normal file
View File

@@ -0,0 +1,22 @@
# Synergy Core
This is the open source core component of Synergy, a keyboard and mouse sharing tool.
## Recommended
Things most people will need.
* [Download](https://symless.com/synergy/downloads) - Get the compiled version of Synergy 1 or Synergy 2.
* [Contact Support](https://symless.com/contact/customer-support) - Open a support ticket and talk directly to the Synergy team.
* [Help Guides](https://symless.com/synergy-help) - Self-help guides and information for when you don't want to talk to people.
* [Join us on Slack](http://bitly.com/synergy-slack) - Talk to other Synergy users in real time using instant messaging.
* [Symless Forums](https://symless.com/forums/forum/11-synergy/) - Discuss Synergy issues on the Symless Forums.
## Advanced Users
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.
* [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.

View File

@@ -7,7 +7,7 @@ cmake_minimum_required (VERSION 3.4)
set (SYNERGY_VERSION_MAJOR 1)
set (SYNERGY_VERSION_MINOR 10)
set (SYNERGY_VERSION_PATCH 2)
set (SYNERGY_VERSION_STAGE "rc2")
set (SYNERGY_VERSION_STAGE "stable")
#
# Version from CI