Skip to content

Commit b1765ab

Browse files
fmaugerfmauger
committed
Solve conflict
2 parents f683203 + 14cef39 commit b1765ab

File tree

4 files changed

+88
-7
lines changed

4 files changed

+88
-7
lines changed

‎CMakeLists.txt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@ endif()
1717
# - Load Custom Modules
1818
list(INSERT CMAKE_MODULE_PATH 0 ${PROJECT_SOURCE_DIR}/cmake)
1919

20-
# - Versioning
21-
set(BxRabbitMQ_VERSION_MAJOR 0)
22-
set(BxRabbitMQ_VERSION_MINOR 4)
23-
set(BxRabbitMQ_VERSION_PATCH 0)
24-
set(BxRabbitMQ_VERSION
25-
"${BxRabbitMQ_VERSION_MAJOR}.${BxRabbitMQ_VERSION_MINOR}.${BxRabbitMQ_VERSION_PATCH}")
20+
# - Version number management utilities:
21+
include(BxVersionManager)
22+
23+
# - Versioning only giving major and minor. Patch number is
24+
# automatically deduced from an external file.
25+
bx_version_set(BxRabbitMQ 0 3)
2626

2727
#-----------------------------------------------------------------------
2828
# - Standard UNIX Tool install paths, including relative paths for use

‎cmake/BxPackageVersions.db‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# List of released versions addressed by their MAJOR.MINOR version number
2+
# and update through a PATCH number:
3+
0.3.1
4+
#1.0.0
5+
#1.1.0
6+
#1.2.0
7+
# end

‎cmake/BxVersionManager.cmake‎

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
# CMake tools for version management
2+
# Author: F.Mauger
3+
# Date: 2017-09-26
4+
# Copyright 2017 (c) François Mauger, Université de Caen Normandie
5+
6+
function(bx_version_build_version_number prefix_)
7+
set(${prefix_}_VERSION
8+
"${${prefix_}_VERSION_MAJOR}.${${prefix_}_VERSION_MINOR}.${${prefix_}_VERSION_PATCH}"
9+
PARENT_SCOPE)
10+
endfunction()
11+
12+
function(bx_version_extract_patch_from_db major_ minor_ patch_)
13+
# message(STATUS "[info] bx_version_extract_patch_from_db: Entering...")
14+
# message(STATUS "[info] - Major = ${major_}")
15+
# message(STATUS "[info] - Minor = ${minor_}")
16+
set(_version_patch 0)
17+
if (EXISTS ${PROJECT_SOURCE_DIR}/cmake/BxPackageVersions.db)
18+
file(STRINGS
19+
${PROJECT_SOURCE_DIR}/cmake/BxPackageVersions.db
20+
_bx_package_versions_lines
21+
REGEX "^([0-9]+)\\.([0-9]+)\\.([0-9+])"
22+
)
23+
# message(STATUS "[info] Lines = ${_bx_package_versions_lines}")
24+
foreach(line ${_bx_package_versions_lines})
25+
string(REPLACE "." ";" _version_list ${line})
26+
# message(STATUS "[info] Version list = ${_version_list}")
27+
list(GET _version_list 0 _version_major)
28+
list(GET _version_list 1 _version_minor)
29+
list(GET _version_list 2 _version_patch)
30+
if(${_version_major} EQUAL ${major_})
31+
if(${_version_minor} EQUAL ${minor_})
32+
set(${patch_} ${_version_patch} PARENT_SCOPE)
33+
# message(STATUS "[info] Resolved patch = ${_version_patch}")
34+
endif()
35+
endif()
36+
endforeach()
37+
else()
38+
set(${patch_} ${_version_patch} PARENT_SCOPE)
39+
endif()
40+
# message(STATUS "[info] - New patch is set to : $ {${patch_}}")
41+
# message(STATUS "[info] bx_version_extract_patch_from_db: Exiting.")
42+
endfunction()
43+
44+
macro(bx_version_set prefix_ major_ minor_)
45+
#message(STATUS "[info] bx_version_set: prefix_ = ${prefix_}")
46+
#message(STATUS "[info] bx_version_set: major_ = ${major_}")
47+
#message(STATUS "[info] bx_version_set: minor_ = ${minor_}")
48+
#message(STATUS "[info] bx_version_set: key = ${prefix_}_VERSION_MAJOR")
49+
set(_version_major ${major_})
50+
set(_version_minor ${minor_})
51+
set(_version_patch 0)
52+
set(${prefix_}_VERSION_MAJOR ${_version_major})
53+
set(${prefix_}_VERSION_MINOR ${_version_minor})
54+
set(${prefix_}_VERSION_PATCH ${_version_patch})
55+
# message(STATUS "[info] bx_version_set: Major = ${${prefix_}_VERSION_MAJOR}")
56+
# message(STATUS "[info] bx_version_set: Minor = ${${prefix_}_VERSION_MINOR}")
57+
# message(STATUS "[info] bx_version_set: Patch = ${${prefix_}_VERSION_PATCH}")
58+
bx_version_extract_patch_from_db(
59+
${${prefix_}_VERSION_MAJOR}
60+
${${prefix_}_VERSION_MINOR}
61+
${prefix_}_VERSION_PATCH
62+
)
63+
bx_version_build_version_number(${prefix_})
64+
message(STATUS "[info] bx_version_set: Major = ${${prefix_}_VERSION_MAJOR}")
65+
message(STATUS "[info] bx_version_set: Minor = ${${prefix_}_VERSION_MINOR}")
66+
message(STATUS "[info] bx_version_set: Patch = ${${prefix_}_VERSION_PATCH}")
67+
message(STATUS "[info] bx_version_set: Version = ${${prefix_}_VERSION}")
68+
endmacro()

‎tools/build.sh‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ install_dir=$(pwd)/_install.d
3434
build_dir=$(pwd)/_build.d
3535

3636
devel=false
37-
bxjsontools_prefix=$(bxjsontools-query --cmakedir)
37+
bxjsontools_prefix=
3838
with_management=false
3939

4040
while [ -n "$1" ]; do
@@ -51,6 +51,12 @@ while [ -n "$1" ]; do
5151
shift 1
5252
done
5353

54+
if [ ${with_management} = true ]; then
55+
if [ "x${bxjsontools_prefix}" = "x" ]; then
56+
bxjsontools_prefix=$(bxjsontools-query --cmakedir)
57+
fi
58+
fi
59+
5460
# brewsh
5561
# curlpp_setup
5662
# rabbitmqc_setup

0 commit comments

Comments
 (0)