diff --git a/desktop_version/src/InterimVersion.h b/desktop_version/src/InterimVersion.h index 109c8014..98abf9e8 100644 --- a/desktop_version/src/InterimVersion.h +++ b/desktop_version/src/InterimVersion.h @@ -13,6 +13,9 @@ extern const int LEN_INTERIM_COMMIT; extern const char* COMMIT_DATE; +extern const char* BRANCH_NAME; +extern const int LEN_BRANCH_NAME; + #ifdef __cplusplus } /* extern "C" */ #endif diff --git a/desktop_version/src/InterimVersion.in.c b/desktop_version/src/InterimVersion.in.c index 24f72d00..dceacdf3 100644 --- a/desktop_version/src/InterimVersion.in.c +++ b/desktop_version/src/InterimVersion.in.c @@ -2,3 +2,6 @@ const char* INTERIM_COMMIT = "@INTERIM_COMMIT@"; const int LEN_INTERIM_COMMIT = sizeof("@INTERIM_COMMIT@") - 1; const char* COMMIT_DATE = "@COMMIT_DATE@"; + +const char* BRANCH_NAME = "@BRANCH_NAME@"; +const int LEN_BRANCH_NAME = sizeof("@BRANCH_NAME@") - 1; diff --git a/desktop_version/src/Render.cpp b/desktop_version/src/Render.cpp index 2608e66f..8aa3ecd3 100644 --- a/desktop_version/src/Render.cpp +++ b/desktop_version/src/Render.cpp @@ -158,8 +158,9 @@ static void menurender(void) graphics.Print(264-graphics.len(editionlabel),temp+35,editionlabel,tr, tg, tb); #endif #ifdef INTERIM_VERSION_EXISTS - graphics.Print( 310 - (10*8), 210, COMMIT_DATE, tr/2, tg/2, tb/2); - graphics.Print( 310 - LEN_INTERIM_COMMIT * 8, 220, INTERIM_COMMIT, tr/2, tg/2, tb/2); + graphics.Print( 310 - (10*8), 200, COMMIT_DATE, tr/2, tg/2, tb/2); + graphics.Print( 310 - LEN_INTERIM_COMMIT * 8, 210, INTERIM_COMMIT, tr/2, tg/2, tb/2); + graphics.Print( 310 - LEN_BRANCH_NAME * 8, 220, BRANCH_NAME, tr/2, tg/2, tb/2); #endif graphics.Print( 310 - (SDL_arraysize(RELEASE_VERSION) - 1) * 8, 230, RELEASE_VERSION, tr/2, tg/2, tb/2); diff --git a/desktop_version/src/main.cpp b/desktop_version/src/main.cpp index 2ac397c7..37479e36 100644 --- a/desktop_version/src/main.cpp +++ b/desktop_version/src/main.cpp @@ -401,6 +401,7 @@ int main(int argc, char *argv[]) #ifdef INTERIM_VERSION_EXISTS puts(COMMIT_DATE); puts(INTERIM_COMMIT); + puts(BRANCH_NAME); #endif VVV_exit(0); } diff --git a/desktop_version/version.cmake b/desktop_version/version.cmake index 04bfe8db..547a78ab 100644 --- a/desktop_version/version.cmake +++ b/desktop_version/version.cmake @@ -13,7 +13,13 @@ EXECUTE_PROCESS( OUTPUT_STRIP_TRAILING_WHITESPACE ) -MESSAGE(STATUS "This is interim commit ${INTERIM_COMMIT} (committed ${COMMIT_DATE})") +EXECUTE_PROCESS( + COMMAND "${GIT_EXECUTABLE}" branch --show-current + OUTPUT_VARIABLE BRANCH_NAME + OUTPUT_STRIP_TRAILING_WHITESPACE +) + +MESSAGE(STATUS "This is interim commit ${INTERIM_COMMIT} (committed ${COMMIT_DATE}) on branch ${BRANCH_NAME}") # Take the template file and replace the macros with what we have CONFIGURE_FILE(${INPUT_FILE} ${OUTPUT_FILE})