jyapayne/anbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Integrate review feedback

Browse source
This commit is contained in:
Simon Fels 2017-05-05 08:09:52 +02:00
commit 16831f100e
4 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

8
CMakeLists.txt
View file

@ -94,12 +94,12 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14 -fPIC")
set(ANBOX_TRANSLATOR_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}/anbox/translators) set(ANBOX_TRANSLATOR_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}/anbox/translators)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DTRANSLATOR_INSTALL_DIR=\\\"${CMAKE_INSTALL_PREFIX}/${ANBOX_TRANSLATOR_INSTALL_DIR}\\\"") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DTRANSLATOR_INSTALL_DIR=\\\"${CMAKE_INSTALL_PREFIX}/${ANBOX_TRANSLATOR_INSTALL_DIR}\\\"")
if (NOT VERSION) if (NOT ANBOX_VERSION)
set(VERSION 2) set(ANBOX_VERSION 2)
if ("${cmake_build_type_lower}" STREQUAL "release") if ("${cmake_build_type_lower}" STREQUAL "release")
set(VERSION_SUFFIX "") set(ANBOX_VERSION_SUFFIX "")
else() else()
set(VERSION_SUFFIX dev) set(ANBOX_VERSION_SUFFIX dev)
endif() endif()
endif() endif()
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/anbox/build/version.h.in configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/anbox/build/version.h.in

6
src/anbox/build/version.h.in
View file

@ -26,12 +26,12 @@
namespace anbox { namespace anbox {
namespace build { namespace build {
/// @brief version_major marks the major version /// @brief version_major marks the major version
static constexpr const std::uint32_t version_major{@VERSION@}; static constexpr const std::uint32_t version_major{@ANBOX_VERSION@};
/// @brief version_suffix is an additional suffix which can be amended to /// @brief version_suffix is an additional suffix which can be amended to
/// the major version number to indicate a dev build for example. /// the major version number to indicate a dev build for example.
static const std::string version_suffix{"@VERSION_SUFFIX@"}; static constexpr const char *version_suffix{"@ANBOX_VERSION_SUFFIX@"};
/// @brief version queries the version of Anbox /// @brief version queries the version of Anbox
std::string version(); std::string print_version();
} // namespace build } // namespace build
} // namespace anbox } // namespace anbox

2
src/anbox/cmds/system_info.cpp
View file

@ -50,7 +50,7 @@ class SystemInformation {
std::stringstream s; std::stringstream s;
s << "version: " s << "version: "
<< anbox::build::version() << anbox::build::print_version()
<< std::endl; << std::endl;
s << "os:" << std::endl s << "os:" << std::endl

2
src/anbox/cmds/version.cpp
View file

@ -26,7 +26,7 @@ anbox::cmds::Version::Version()
cli::Name{"version"}, cli::Usage{"version"}, cli::Name{"version"}, cli::Usage{"version"},
cli::Description{"print the version of the daemon"}} { cli::Description{"print the version of the daemon"}} {
action([](const cli::Command::Context& ctxt) { action([](const cli::Command::Context& ctxt) {
ctxt.cout << "anbox " << build::version() << std::endl; ctxt.cout << "anbox " << build::print_version() << std::endl;
return 0; return 0;
}); });
} }