From 32a56f32f1b900a3e3d46949a56da1ce8a736308 Mon Sep 17 00:00:00 2001 From: moneroexamples Date: Wed, 24 May 2017 13:40:25 +0800 Subject: [PATCH] git_branch_name added to footer --- cmake/MyUtils.cmake | 10 ++++++++++ src/page.h | 3 ++- src/templates/footer.html | 2 +- src/version.h.in | 1 + 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/cmake/MyUtils.cmake b/cmake/MyUtils.cmake index 616dd88..d69fa1f 100644 --- a/cmake/MyUtils.cmake +++ b/cmake/MyUtils.cmake @@ -42,6 +42,16 @@ macro(create_git_version) OUTPUT_STRIP_TRAILING_WHITESPACE ) + # Get current branch name + execute_process( + COMMAND git rev-parse --abbrev-ref HEAD + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} + OUTPUT_VARIABLE GIT_BRANCH_NAME + OUTPUT_STRIP_TRAILING_WHITESPACE + ) + + + configure_file( ${CMAKE_SOURCE_DIR}/src/version.h.in ${CMAKE_BINARY_DIR}/gen/version.h diff --git a/src/page.h b/src/page.h index 2c8d72e..3493d5d 100644 --- a/src/page.h +++ b/src/page.h @@ -5680,7 +5680,8 @@ namespace xmreg static const mstch::map footer_context { {"last_git_commit_hash", string {GIT_COMMIT_HASH}}, {"last_git_commit_date", string {GIT_COMMIT_DATETIME}}, - {"monero_version_full" , string {MONERO_VERSION_FULL}}, + {"git_branch_name" , string {GIT_BRANCH_NAME}}, + {"monero_version_full" , string {MONERO_VERSION_FULL}} }; string footer_html = mstch::render(xmreg::read(TMPL_FOOTER), footer_context); diff --git a/src/templates/footer.html b/src/templates/footer.html index d4ab012..e5db414 100644 --- a/src/templates/footer.html +++ b/src/templates/footer.html @@ -1,7 +1,7 @@
source code - | explorer version: {{last_git_commit_date}}-{{last_git_commit_hash}} + | explorer version: {{git_branch_name}}-{{last_git_commit_date}}-{{last_git_commit_hash}} | monero version: {{monero_version_full}}
diff --git a/src/version.h.in b/src/version.h.in index ef62e86..26b5927 100644 --- a/src/version.h.in +++ b/src/version.h.in @@ -8,6 +8,7 @@ #define GIT_BRANCH "@GIT_BRANCH@" #define GIT_COMMIT_HASH "@GIT_COMMIT_HASH@" #define GIT_COMMIT_DATETIME "@GIT_COMMIT_DATETIME@" +#define GIT_BRANCH_NAME "@GIT_BRANCH_NAME@" #endif //XMRBLOCKS_VERSION_H_IN_H