Fixed version number retrieval from Github

This commit is contained in:
John Wellbelove 2020-11-27 18:29:08 +00:00
parent 14868412ce
commit b40431f998
7 changed files with 13 additions and 5 deletions

View File

@ -18,12 +18,12 @@ def get_version_from_git_tag():
class EmbeddedTemplateLibraryConan(ConanFile):
name = "embedded-template-library"
version = "18.20.0"
version = get_version_from_git_tag()
license = "MIT"
author = "John Wellbelove <john.wellbelove@etlcpp.com>"
url = "https://github.com/ETLCPP/etl"
description = "A C++ template library for embedded applications"
topics = ("embedded", "template", "container")
topics = ("C++", "embedded", "template", "container", "utility", "framework", "messaging")
# Source info
scm = {

View File

@ -39,7 +39,7 @@ SOFTWARE.
#define ETL_VERSION_MAJOR 19
#define ETL_VERSION_MINOR 2
#define ETL_VERSION_PATCH 0
#define ETL_VERSION_PATCH 1
#define ETL_VERSION ETL_STRINGIFY(ETL_VERSION_MAJOR) "." ETL_STRINGIFY(ETL_VERSION_MINOR) "." ETL_STRINGIFY(ETL_VERSION_PATCH)
#define ETL_VERSION_W ETL_STRINGIFY(ETL_VERSION_MAJOR) L"." ETL_STRINGIFY(ETL_VERSION_MINOR) L"." ETL_STRINGIFY(ETL_VERSION_PATCH)
#define ETL_VERSION_U16 ETL_STRINGIFY(ETL_VERSION_MAJOR) u"." ETL_STRINGIFY(ETL_VERSION_MINOR) u"." ETL_STRINGIFY(ETL_VERSION_PATCH)

View File

@ -1,6 +1,6 @@
{
"name": "Embedded Template Library",
"version": "19.2.0",
"version": "19.2.1",
"author s": {
"name": "John Wellbelove",
"email": "john.wellbelove@etlcpp.com"

View File

@ -1,5 +1,5 @@
name=Embedded Template Library
version=19.2.0
version=19.2.1
author= John Wellbelove <john.wellbelove@etlcpp.com>
maintainer=John Wellbelove <john.wellbelove@etlcpp.com>
license=MIT

View File

@ -1,3 +1,7 @@
===============================================================================
19.2.1
Fixed version number retrieval from Github.
===============================================================================
19.2.0
Security flag for a string is copied on assignment or copy constructor.

View File

@ -1981,6 +1981,7 @@
<None Include="..\..\.github\workflows\gcc.yml" />
<None Include="..\..\.github\workflows\vs2019.yml" />
<None Include="..\..\appveyor.yml" />
<None Include="..\..\conanfile.py" />
<None Include="..\..\etl.pspimage" />
<None Include="..\..\etl.xar" />
<None Include="..\..\include\etl\generators\generate.bat" />

View File

@ -1501,6 +1501,9 @@
<None Include="..\runtests.sh">
<Filter>Source Files</Filter>
</None>
<None Include="..\..\conanfile.py">
<Filter>Resource Files</Filter>
</None>
</ItemGroup>
<ItemGroup>
<Text Include="..\..\include\etl\file_error_numbers.txt">