Skip to content

Commit

Permalink
Fixed the problem that the release package file could not be compiled…
Browse files Browse the repository at this point in the history 
… normally.
  • Loading branch information
@byrnexu
byrnexu committed Dec 8, 2022
1 parent 1e06185 commit 3f686f2
Show file tree
Hide file tree
Showing 36 changed files with 140 additions and 116 deletions.
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

[![github](https://img.shields.io/badge/github-byrnexu-brightgreen.svg)](https://github.com/byrnexu)

[<img src="./assets/logo-big.png" width="180" />]()
[<img src="./assets/logo.png" width="180" />]()

**Better quant today, best quant tomorrow.** 💪

Expand Down
4 changes: 2 additions & 2 deletions README_cn.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

[![github](https://img.shields.io/badge/github-byrnexu-brightgreen.svg)](https://github.com/byrnexu)

[<img src="./assets/logo-big.png" width="180" />]()
[<img src="./assets/logo.png" width="180" />]()

**Better quant today, best quant tomorrow.** 💪

Expand All @@ -13,7 +13,7 @@
&emsp;&emsp;**最近在外面看机会，上海地区私募机构需要技术总监/合伙人或者架构师请邮件联系：28645861@qqcom**

&emsp;&emsp;目前交易所只接了数字货币的币安，但是国内现货和其他衍生品的仓位管理、盈亏计算、资产管理的算法及订单的状态维护基本都类似，稍加修改即可同时支持国内的二级市场，这些功能就暂时放在todo list里了。另外如果要接入更多的交易所，基于目前良好的行情和交易网关的接口，也可以逐个快速接入。betterquant的主要功能和特点包括：<br/>
* 🔥 这是一个设计目标为支持多账户、多策略、多个产品、多托管主机并行的可水平扩展的分布式量化交易系统。<br/>
* 🔥 这是一个设计目标为支持多账户、多策略、多个产品、多托管主机并行的可水平扩展的分布式量化交易系统。也就是说，未来你可以看到类似自营资金跨托管主机、跨账户借仓这样牛X的功能。<br/>
&nbsp;
* 🔥 支持c++和python两种语言编写交易策略，整个系统几个命令即可完成安装部署。<br/>
&nbsp;
Expand Down
Binary file added assets/containers.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed assets/logo-big.png
View file
Binary file not shown.
Binary file removed assets/logo-main.png
View file
Binary file not shown.
Binary file modified assets/logo.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 4 additions & 4 deletions bqassetsmgr/cmake/util.cmake
View file
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
function(get_proj_ver ${PROJ_VER})
execute_process(
COMMAND bash -c "git describe --tags --always --dirty | tr -d '\r\n';"
COMMAND bash -c "ver=$(git describe --tags --always --dirty 2>/dev/null || echo v1.0.0-alpha.3); echo $ver| tr -d '\r\n';"
OUTPUT_VARIABLE PROJ_VER)
set(PROJ_VER ${PROJ_VER} PARENT_SCOPE)
message(STATUS "Get project version ${PROJ_VER}")

execute_process(
COMMAND bash -c "git describe --tags --always --dirty | sed 's/v//g' | awk -F'.' '{print $1}' | tr -d '\r\n';"
COMMAND bash -c "ver=$(git describe --tags --always --dirty 2>/dev/null || echo v1.0.0-alpha.3); echo $ver | sed 's/v1/1/g' | awk -F'.' '{print $1}' | tr -d '\r\n';"
OUTPUT_VARIABLE MAJOR_VER)
set(MAJOR_VER ${MAJOR_VER} PARENT_SCOPE)
message(STATUS "Get major version ${MAJOR_VER}")

execute_process(
COMMAND bash -c "git describe --tags --always --dirty | sed 's/v//g' | awk -F'.' '{print $2}' | tr -d '\r\n';"
COMMAND bash -c "ver=$(git describe --tags --always --dirty 2>/dev/null || echo v1.0.0-alpha.3); echo $ver | awk -F'.' '{print $2}' | tr -d '\r\n';"
OUTPUT_VARIABLE MINOR_VER)
set(MINOR_VER ${MINOR_VER} PARENT_SCOPE)
message(STATUS "Get minor version ${MINOR_VER}")

execute_process(
COMMAND bash -c "git describe --tags --always --dirty | sed 's/v//g' | awk -F'.' '{print $3}' | tr -d '\r\n';"
COMMAND bash -c "ver=$(git describe --tags --always --dirty 2>/dev/null || echo v1.0.0-alpha.3); echo $ver | sed 's/v1/1/g' | awk -F'.' '{print $3}' | tr -d '\r\n';"
OUTPUT_VARIABLE PATCH_VER)
set(PATCH_VER ${PATCH_VER} PARENT_SCOPE)
message(STATUS "Get patch version ${PATCH_VER}")
Expand Down
8 changes: 4 additions & 4 deletions bqipc/cmake/util.cmake
View file
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
function(get_proj_ver ${PROJ_VER})
execute_process(
COMMAND bash -c "git describe --tags --always --dirty | tr -d '\r\n';"
COMMAND bash -c "ver=$(git describe --tags --always --dirty 2>/dev/null || echo v1.0.0-alpha.3); echo $ver| tr -d '\r\n';"
OUTPUT_VARIABLE PROJ_VER)
set(PROJ_VER ${PROJ_VER} PARENT_SCOPE)
message(STATUS "Get project version ${PROJ_VER}")

execute_process(
COMMAND bash -c "git describe --tags --always --dirty | sed 's/v//g' | awk -F'.' '{print $1}' | tr -d '\r\n';"
COMMAND bash -c "ver=$(git describe --tags --always --dirty 2>/dev/null || echo v1.0.0-alpha.3); echo $ver | sed 's/v1/1/g' | awk -F'.' '{print $1}' | tr -d '\r\n';"
OUTPUT_VARIABLE MAJOR_VER)
set(MAJOR_VER ${MAJOR_VER} PARENT_SCOPE)
message(STATUS "Get major version ${MAJOR_VER}")

execute_process(
COMMAND bash -c "git describe --tags --always --dirty | sed 's/v//g' | awk -F'.' '{print $2}' | tr -d '\r\n';"
COMMAND bash -c "ver=$(git describe --tags --always --dirty 2>/dev/null || echo v1.0.0-alpha.3); echo $ver | awk -F'.' '{print $2}' | tr -d '\r\n';"
OUTPUT_VARIABLE MINOR_VER)
set(MINOR_VER ${MINOR_VER} PARENT_SCOPE)
message(STATUS "Get minor version ${MINOR_VER}")

execute_process(
COMMAND bash -c "git describe --tags --always --dirty | sed 's/v//g' | awk -F'.' '{print $3}' | tr -d '\r\n';"
COMMAND bash -c "ver=$(git describe --tags --always --dirty 2>/dev/null || echo v1.0.0-alpha.3); echo $ver | sed 's/v1/1/g' | awk -F'.' '{print $3}' | tr -d '\r\n';"
OUTPUT_VARIABLE PATCH_VER)
set(PATCH_VER ${PATCH_VER} PARENT_SCOPE)
message(STATUS "Get patch version ${PATCH_VER}")
Expand Down
8 changes: 4 additions & 4 deletions bqmd/bqmd-binance/cmake/util.cmake
View file
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
function(get_proj_ver ${PROJ_VER})
execute_process(
COMMAND bash -c "git describe --tags --always --dirty | tr -d '\r\n';"
COMMAND bash -c "ver=$(git describe --tags --always --dirty 2>/dev/null || echo v1.0.0-alpha.3); echo $ver| tr -d '\r\n';"
OUTPUT_VARIABLE PROJ_VER)
set(PROJ_VER ${PROJ_VER} PARENT_SCOPE)
message(STATUS "Get project version ${PROJ_VER}")

execute_process(
COMMAND bash -c "git describe --tags --always --dirty | sed 's/v//g' | awk -F'.' '{print $1}' | tr -d '\r\n';"
COMMAND bash -c "ver=$(git describe --tags --always --dirty 2>/dev/null || echo v1.0.0-alpha.3); echo $ver | sed 's/v1/1/g' | awk -F'.' '{print $1}' | tr -d '\r\n';"
OUTPUT_VARIABLE MAJOR_VER)
set(MAJOR_VER ${MAJOR_VER} PARENT_SCOPE)
message(STATUS "Get major version ${MAJOR_VER}")

execute_process(
COMMAND bash -c "git describe --tags --always --dirty | sed 's/v//g' | awk -F'.' '{print $2}' | tr -d '\r\n';"
COMMAND bash -c "ver=$(git describe --tags --always --dirty 2>/dev/null || echo v1.0.0-alpha.3); echo $ver | awk -F'.' '{print $2}' | tr -d '\r\n';"
OUTPUT_VARIABLE MINOR_VER)
set(MINOR_VER ${MINOR_VER} PARENT_SCOPE)
message(STATUS "Get minor version ${MINOR_VER}")

execute_process(
COMMAND bash -c "git describe --tags --always --dirty | sed 's/v//g' | awk -F'.' '{print $3}' | tr -d '\r\n';"
COMMAND bash -c "ver=$(git describe --tags --always --dirty 2>/dev/null || echo v1.0.0-alpha.3); echo $ver | sed 's/v1/1/g' | awk -F'.' '{print $3}' | tr -d '\r\n';"
OUTPUT_VARIABLE PATCH_VER)
set(PATCH_VER ${PATCH_VER} PARENT_SCOPE)
message(STATUS "Get patch version ${PATCH_VER}")
Expand Down
8 changes: 4 additions & 4 deletions bqmd/bqmd-pub/cmake/util.cmake
View file
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
function(get_proj_ver ${PROJ_VER})
execute_process(
COMMAND bash -c "git describe --tags --always --dirty | tr -d '\r\n';"
COMMAND bash -c "ver=$(git describe --tags --always --dirty 2>/dev/null || echo v1.0.0-alpha.3); echo $ver| tr -d '\r\n';"
OUTPUT_VARIABLE PROJ_VER)
set(PROJ_VER ${PROJ_VER} PARENT_SCOPE)
message(STATUS "Get project version ${PROJ_VER}")

execute_process(
COMMAND bash -c "git describe --tags --always --dirty | sed 's/v//g' | awk -F'.' '{print $1}' | tr -d '\r\n';"
COMMAND bash -c "ver=$(git describe --tags --always --dirty 2>/dev/null || echo v1.0.0-alpha.3); echo $ver | sed 's/v1/1/g' | awk -F'.' '{print $1}' | tr -d '\r\n';"
OUTPUT_VARIABLE MAJOR_VER)
set(MAJOR_VER ${MAJOR_VER} PARENT_SCOPE)
message(STATUS "Get major version ${MAJOR_VER}")

execute_process(
COMMAND bash -c "git describe --tags --always --dirty | sed 's/v//g' | awk -F'.' '{print $2}' | tr -d '\r\n';"
COMMAND bash -c "ver=$(git describe --tags --always --dirty 2>/dev/null || echo v1.0.0-alpha.3); echo $ver | awk -F'.' '{print $2}' | tr -d '\r\n';"
OUTPUT_VARIABLE MINOR_VER)
set(MINOR_VER ${MINOR_VER} PARENT_SCOPE)
message(STATUS "Get minor version ${MINOR_VER}")

execute_process(
COMMAND bash -c "git describe --tags --always --dirty | sed 's/v//g' | awk -F'.' '{print $3}' | tr -d '\r\n';"
COMMAND bash -c "ver=$(git describe --tags --always --dirty 2>/dev/null || echo v1.0.0-alpha.3); echo $ver | sed 's/v1/1/g' | awk -F'.' '{print $3}' | tr -d '\r\n';"
OUTPUT_VARIABLE PATCH_VER)
set(PATCH_VER ${PATCH_VER} PARENT_SCOPE)
message(STATUS "Get patch version ${PATCH_VER}")
Expand Down
8 changes: 4 additions & 4 deletions bqmd/bqmd-sim/cmake/util.cmake
View file
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
function(get_proj_ver ${PROJ_VER})
execute_process(
COMMAND bash -c "git describe --tags --always --dirty | tr -d '\r\n';"
COMMAND bash -c "ver=$(git describe --tags --always --dirty 2>/dev/null || echo v1.0.0-alpha.3); echo $ver| tr -d '\r\n';"
OUTPUT_VARIABLE PROJ_VER)
set(PROJ_VER ${PROJ_VER} PARENT_SCOPE)
message(STATUS "Get project version ${PROJ_VER}")

execute_process(
COMMAND bash -c "git describe --tags --always --dirty | sed 's/v//g' | awk -F'.' '{print $1}' | tr -d '\r\n';"
COMMAND bash -c "ver=$(git describe --tags --always --dirty 2>/dev/null || echo v1.0.0-alpha.3); echo $ver | sed 's/v1/1/g' | awk -F'.' '{print $1}' | tr -d '\r\n';"
OUTPUT_VARIABLE MAJOR_VER)
set(MAJOR_VER ${MAJOR_VER} PARENT_SCOPE)
message(STATUS "Get major version ${MAJOR_VER}")

execute_process(
COMMAND bash -c "git describe --tags --always --dirty | sed 's/v//g' | awk -F'.' '{print $2}' | tr -d '\r\n';"
COMMAND bash -c "ver=$(git describe --tags --always --dirty 2>/dev/null || echo v1.0.0-alpha.3); echo $ver | awk -F'.' '{print $2}' | tr -d '\r\n';"
OUTPUT_VARIABLE MINOR_VER)
set(MINOR_VER ${MINOR_VER} PARENT_SCOPE)
message(STATUS "Get minor version ${MINOR_VER}")

execute_process(
COMMAND bash -c "git describe --tags --always --dirty | sed 's/v//g' | awk -F'.' '{print $3}' | tr -d '\r\n';"
COMMAND bash -c "ver=$(git describe --tags --always --dirty 2>/dev/null || echo v1.0.0-alpha.3); echo $ver | sed 's/v1/1/g' | awk -F'.' '{print $3}' | tr -d '\r\n';"
OUTPUT_VARIABLE PATCH_VER)
set(PATCH_VER ${PATCH_VER} PARENT_SCOPE)
message(STATUS "Get patch version ${PATCH_VER}")
Expand Down
8 changes: 4 additions & 4 deletions bqmd/bqmd-svc-base/cmake/util.cmake
View file
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
function(get_proj_ver ${PROJ_VER})
execute_process(
COMMAND bash -c "git describe --tags --always --dirty | tr -d '\r\n';"
COMMAND bash -c "ver=$(git describe --tags --always --dirty 2>/dev/null || echo v1.0.0-alpha.3); echo $ver| tr -d '\r\n';"
OUTPUT_VARIABLE PROJ_VER)
set(PROJ_VER ${PROJ_VER} PARENT_SCOPE)
message(STATUS "Get project version ${PROJ_VER}")

execute_process(
COMMAND bash -c "git describe --tags --always --dirty | sed 's/v//g' | awk -F'.' '{print $1}' | tr -d '\r\n';"
COMMAND bash -c "ver=$(git describe --tags --always --dirty 2>/dev/null || echo v1.0.0-alpha.3); echo $ver | sed 's/v1/1/g' | awk -F'.' '{print $1}' | tr -d '\r\n';"
OUTPUT_VARIABLE MAJOR_VER)
set(MAJOR_VER ${MAJOR_VER} PARENT_SCOPE)
message(STATUS "Get major version ${MAJOR_VER}")

execute_process(
COMMAND bash -c "git describe --tags --always --dirty | sed 's/v//g' | awk -F'.' '{print $2}' | tr -d '\r\n';"
COMMAND bash -c "ver=$(git describe --tags --always --dirty 2>/dev/null || echo v1.0.0-alpha.3); echo $ver | awk -F'.' '{print $2}' | tr -d '\r\n';"
OUTPUT_VARIABLE MINOR_VER)
set(MINOR_VER ${MINOR_VER} PARENT_SCOPE)
message(STATUS "Get minor version ${MINOR_VER}")

execute_process(
COMMAND bash -c "git describe --tags --always --dirty | sed 's/v//g' | awk -F'.' '{print $3}' | tr -d '\r\n';"
COMMAND bash -c "ver=$(git describe --tags --always --dirty 2>/dev/null || echo v1.0.0-alpha.3); echo $ver | sed 's/v1/1/g' | awk -F'.' '{print $3}' | tr -d '\r\n';"
OUTPUT_VARIABLE PATCH_VER)
set(PATCH_VER ${PATCH_VER} PARENT_SCOPE)
message(STATUS "Get patch version ${PATCH_VER}")
Expand Down
8 changes: 4 additions & 4 deletions bqordmgr/cmake/util.cmake
View file
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
function(get_proj_ver ${PROJ_VER})
execute_process(
COMMAND bash -c "git describe --tags --always --dirty | tr -d '\r\n';"
COMMAND bash -c "ver=$(git describe --tags --always --dirty 2>/dev/null || echo v1.0.0-alpha.3); echo $ver| tr -d '\r\n';"
OUTPUT_VARIABLE PROJ_VER)
set(PROJ_VER ${PROJ_VER} PARENT_SCOPE)
message(STATUS "Get project version ${PROJ_VER}")

execute_process(
COMMAND bash -c "git describe --tags --always --dirty | sed 's/v//g' | awk -F'.' '{print $1}' | tr -d '\r\n';"
COMMAND bash -c "ver=$(git describe --tags --always --dirty 2>/dev/null || echo v1.0.0-alpha.3); echo $ver | sed 's/v1/1/g' | awk -F'.' '{print $1}' | tr -d '\r\n';"
OUTPUT_VARIABLE MAJOR_VER)
set(MAJOR_VER ${MAJOR_VER} PARENT_SCOPE)
message(STATUS "Get major version ${MAJOR_VER}")

execute_process(
COMMAND bash -c "git describe --tags --always --dirty | sed 's/v//g' | awk -F'.' '{print $2}' | tr -d '\r\n';"
COMMAND bash -c "ver=$(git describe --tags --always --dirty 2>/dev/null || echo v1.0.0-alpha.3); echo $ver | awk -F'.' '{print $2}' | tr -d '\r\n';"
OUTPUT_VARIABLE MINOR_VER)
set(MINOR_VER ${MINOR_VER} PARENT_SCOPE)
message(STATUS "Get minor version ${MINOR_VER}")

execute_process(
COMMAND bash -c "git describe --tags --always --dirty | sed 's/v//g' | awk -F'.' '{print $3}' | tr -d '\r\n';"
COMMAND bash -c "ver=$(git describe --tags --always --dirty 2>/dev/null || echo v1.0.0-alpha.3); echo $ver | sed 's/v1/1/g' | awk -F'.' '{print $3}' | tr -d '\r\n';"
OUTPUT_VARIABLE PATCH_VER)
set(PATCH_VER ${PATCH_VER} PARENT_SCOPE)
message(STATUS "Get patch version ${PATCH_VER}")
Expand Down
8 changes: 4 additions & 4 deletions bqposmgr/cmake/util.cmake
View file
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
function(get_proj_ver ${PROJ_VER})
execute_process(
COMMAND bash -c "git describe --tags --always --dirty | tr -d '\r\n';"
COMMAND bash -c "ver=$(git describe --tags --always --dirty 2>/dev/null || echo v1.0.0-alpha.3); echo $ver| tr -d '\r\n';"
OUTPUT_VARIABLE PROJ_VER)
set(PROJ_VER ${PROJ_VER} PARENT_SCOPE)
message(STATUS "Get project version ${PROJ_VER}")

execute_process(
COMMAND bash -c "git describe --tags --always --dirty | sed 's/v//g' | awk -F'.' '{print $1}' | tr -d '\r\n';"
COMMAND bash -c "ver=$(git describe --tags --always --dirty 2>/dev/null || echo v1.0.0-alpha.3); echo $ver | sed 's/v1/1/g' | awk -F'.' '{print $1}' | tr -d '\r\n';"
OUTPUT_VARIABLE MAJOR_VER)
set(MAJOR_VER ${MAJOR_VER} PARENT_SCOPE)
message(STATUS "Get major version ${MAJOR_VER}")

execute_process(
COMMAND bash -c "git describe --tags --always --dirty | sed 's/v//g' | awk -F'.' '{print $2}' | tr -d '\r\n';"
COMMAND bash -c "ver=$(git describe --tags --always --dirty 2>/dev/null || echo v1.0.0-alpha.3); echo $ver | awk -F'.' '{print $2}' | tr -d '\r\n';"
OUTPUT_VARIABLE MINOR_VER)
set(MINOR_VER ${MINOR_VER} PARENT_SCOPE)
message(STATUS "Get minor version ${MINOR_VER}")

execute_process(
COMMAND bash -c "git describe --tags --always --dirty | sed 's/v//g' | awk -F'.' '{print $3}' | tr -d '\r\n';"
COMMAND bash -c "ver=$(git describe --tags --always --dirty 2>/dev/null || echo v1.0.0-alpha.3); echo $ver | sed 's/v1/1/g' | awk -F'.' '{print $3}' | tr -d '\r\n';"
OUTPUT_VARIABLE PATCH_VER)
set(PATCH_VER ${PATCH_VER} PARENT_SCOPE)
message(STATUS "Get patch version ${PATCH_VER}")
Expand Down
8 changes: 4 additions & 4 deletions bqpub/cmake/util.cmake
View file
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
function(get_proj_ver ${PROJ_VER})
execute_process(
COMMAND bash -c "git describe --tags --always --dirty | tr -d '\r\n';"
COMMAND bash -c "ver=$(git describe --tags --always --dirty 2>/dev/null || echo v1.0.0-alpha.3); echo $ver| tr -d '\r\n';"
OUTPUT_VARIABLE PROJ_VER)
set(PROJ_VER ${PROJ_VER} PARENT_SCOPE)
message(STATUS "Get project version ${PROJ_VER}")

execute_process(
COMMAND bash -c "git describe --tags --always --dirty | sed 's/v//g' | awk -F'.' '{print $1}' | tr -d '\r\n';"
COMMAND bash -c "ver=$(git describe --tags --always --dirty 2>/dev/null || echo v1.0.0-alpha.3); echo $ver | sed 's/v1/1/g' | awk -F'.' '{print $1}' | tr -d '\r\n';"
OUTPUT_VARIABLE MAJOR_VER)
set(MAJOR_VER ${MAJOR_VER} PARENT_SCOPE)
message(STATUS "Get major version ${MAJOR_VER}")

execute_process(
COMMAND bash -c "git describe --tags --always --dirty | sed 's/v//g' | awk -F'.' '{print $2}' | tr -d '\r\n';"
COMMAND bash -c "ver=$(git describe --tags --always --dirty 2>/dev/null || echo v1.0.0-alpha.3); echo $ver | awk -F'.' '{print $2}' | tr -d '\r\n';"
OUTPUT_VARIABLE MINOR_VER)
set(MINOR_VER ${MINOR_VER} PARENT_SCOPE)
message(STATUS "Get minor version ${MINOR_VER}")

execute_process(
COMMAND bash -c "git describe --tags --always --dirty | sed 's/v//g' | awk -F'.' '{print $3}' | tr -d '\r\n';"
COMMAND bash -c "ver=$(git describe --tags --always --dirty 2>/dev/null || echo v1.0.0-alpha.3); echo $ver | sed 's/v1/1/g' | awk -F'.' '{print $3}' | tr -d '\r\n';"
OUTPUT_VARIABLE PATCH_VER)
set(PATCH_VER ${PATCH_VER} PARENT_SCOPE)
message(STATUS "Get patch version ${PATCH_VER}")
Expand Down
8 changes: 4 additions & 4 deletions bqriskmgr/cmake/util.cmake
View file
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
function(get_proj_ver ${PROJ_VER})
execute_process(
COMMAND bash -c "git describe --tags --always --dirty | tr -d '\r\n';"
COMMAND bash -c "ver=$(git describe --tags --always --dirty 2>/dev/null || echo v1.0.0-alpha.3); echo $ver| tr -d '\r\n';"
OUTPUT_VARIABLE PROJ_VER)
set(PROJ_VER ${PROJ_VER} PARENT_SCOPE)
message(STATUS "Get project version ${PROJ_VER}")

execute_process(
COMMAND bash -c "git describe --tags --always --dirty | sed 's/v//g' | awk -F'.' '{print $1}' | tr -d '\r\n';"
COMMAND bash -c "ver=$(git describe --tags --always --dirty 2>/dev/null || echo v1.0.0-alpha.3); echo $ver | sed 's/v1/1/g' | awk -F'.' '{print $1}' | tr -d '\r\n';"
OUTPUT_VARIABLE MAJOR_VER)
set(MAJOR_VER ${MAJOR_VER} PARENT_SCOPE)
message(STATUS "Get major version ${MAJOR_VER}")

execute_process(
COMMAND bash -c "git describe --tags --always --dirty | sed 's/v//g' | awk -F'.' '{print $2}' | tr -d '\r\n';"
COMMAND bash -c "ver=$(git describe --tags --always --dirty 2>/dev/null || echo v1.0.0-alpha.3); echo $ver | awk -F'.' '{print $2}' | tr -d '\r\n';"
OUTPUT_VARIABLE MINOR_VER)
set(MINOR_VER ${MINOR_VER} PARENT_SCOPE)
message(STATUS "Get minor version ${MINOR_VER}")

execute_process(
COMMAND bash -c "git describe --tags --always --dirty | sed 's/v//g' | awk -F'.' '{print $3}' | tr -d '\r\n';"
COMMAND bash -c "ver=$(git describe --tags --always --dirty 2>/dev/null || echo v1.0.0-alpha.3); echo $ver | sed 's/v1/1/g' | awk -F'.' '{print $3}' | tr -d '\r\n';"
OUTPUT_VARIABLE PATCH_VER)
set(PATCH_VER ${PATCH_VER} PARENT_SCOPE)
message(STATUS "Get patch version ${PATCH_VER}")
Expand Down
Loading

0 comments on commit 3f686f2

Please sign in to comment.