From dfe2d04b3035920accddba005d985d7a1d1d43b5 Mon Sep 17 00:00:00 2001 From: gcontini <1121667+gcontini@users.noreply.github.com> Date: 周六, 22 5月 2021 11:23:20 +0800 Subject: [PATCH] update versions 2.0-> 2.1 --- doc/conf.py | 4 ++-- .gitignore | 1 + CMakeLists.txt | 2 +- README.md | 3 +-- doc/index.rst | 8 ++++---- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 5a0a310..95b8bcc 100644 --- a/.gitignore +++ b/.gitignore @@ -38,3 +38,4 @@ /CMakeSettings.json /.venv/ /Pipfile +/.pydevproject diff --git a/CMakeLists.txt b/CMakeLists.txt index 3ce4e3d..16e641b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -19,7 +19,7 @@ cmake_policy(SET CMP0048 NEW) #cmake_policy(SET CMP0091 NEW) project (licensecc - VERSION 2.0.0 + VERSION 2.1.0 LANGUAGES CXX) set(PROJECT_DESCRIPTION "Copy protection and licensing library") diff --git a/README.md b/README.md index b0c9df2..eac2ee0 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,6 @@ [](https://www.codacy.com/gh/open-license-manager/licensecc/dashboard?utm_source=github.com&utm_medium=referral&utm_content=open-license-manager/licensecc&utm_campaign=Badge_Grade) [](https://codecov.io/gh/open-license-manager/licensecc) [](http://github.com/open-license-manager/licensecc/issues) -[](https://groups.google.com/d/forum/licensecc) Protect the software you develop from unauthorized copies, limit the usage in time, to a specific set of machines, or prevent the usage in virtualized environments. It is an open source license manager that helps to keep your @@ -95,7 +94,7 @@ ## How to contribute -The easiest way you can solve your problems or ask help is through the [forum](https://groups.google.com/forum/#!forum/licensecc) (hosted on Google), otherwise if you think there is a problem you can open an issue in the [issue system](https://github.com/open-license-manager/licensecc/issues). +The easiest way you can solve your problems or ask help is through the [discussion tab](https://github.com/open-license-manager/licensecc/discussions) above, otherwise if you think there is a problem you can open an issue in the [issue system](https://github.com/open-license-manager/licensecc/issues). Have a look to the [contribution guidelines](CONTRIBUTING.md) before reporting. We use [GitFlow](https://datasift.github.io/gitflow/IntroducingGitFlow.html) (or at least a subset of it). Remember to install the gitflow git plugin and use `develop` as default branch for your pull requests. diff --git a/doc/conf.py b/doc/conf.py index c2a8d42..a8003c2 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -63,9 +63,9 @@ # built documents. # # The short X.Y version. -version = '2.0.0' +version = '2.1.0' # The full version, including alpha/beta/rc tags. -release = '2.0.0' +release = '2.1.0' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/doc/index.rst b/doc/index.rst index 23172c7..1e6c7ba 100644 --- a/doc/index.rst +++ b/doc/index.rst @@ -22,7 +22,7 @@ .. |issues| image:: https://img.shields.io/github/issues/open-license-manager/licensecc .. _issues: http://github.com/open-license-manager/licensecc/issues .. |forum| image:: https://img.shields.io/badge/forum-licensecc-blue.svg?style=flat -.. _forum: https://groups.google.com/d/forum/licensecc +.. _forum: https://github.com/open-license-manager/licensecc/discussions Protect the software you develop from unauthorized copies, limit the usage in time, to a specific set of machines, or prevent the usage in virtualized environments. `Licensecc` is an open source license management system @@ -130,8 +130,8 @@ Branches and status ********************* -* On branch ``master`` there is the 'legacy' 1.0.0 version. This version is working but doesn't correspond to the current documentation, and we don't plan to actively fix it. There are well-known bugs and limitations. We still accept community contributions on this branch. Feel free to propose your pull request. -* On branch ``develop`` there is the upcoming 2.0.0 version that corresponds to the documentation. This version is under development and has not been extensively used/tested. However we encourage users to download and use this one. +* On branch ``master`` there is the 'stable' 2.0.0 version. +* On branch ``develop`` there is the upcoming 2.1.0 version that corresponds to this documentation. This version is under development and has not been extensively used/tested. However we encourage users to download and use this one. How to contribute ******************** @@ -143,7 +143,7 @@ We use `GitFlow`_ (or at least a subset of it). Remember to install the gitflow git plugin and use ``develop`` as default branch for your pull requests. -.. _forums: https://groups.google.com/forum/#!forum/licensecc +.. _forums: https://github.com/open-license-manager/licensecc/discussions .. _issue system: https://github.com/open-license-manager/licensecc/issues .. _contribution guidelines: https://github.com/open-license-manager/licensecc/blob/develop/CONTRIBUTING.md .. _GitFlow: https://datasift.github.io/gitflow/IntroducingGitFlow.html -- Gitblit v1.9.1