From 6b0ee2aba2ccc689d658b813504fafa8ca9726ab Mon Sep 17 00:00:00 2001 From: Jim Stichnoth Date: Wed, 17 Aug 2016 16:20:21 -0700 Subject: [PATCH] Subzero: Include commit count in revision string. Instead of the version string being like this: Subzero_revision_efdf412032f7622a0663696896708d75b82e92f6 Make it more like this: Subzero_revision_1089_efdf412032f7622a0663696896708d75b82e92f6 I.e., provide both git hash and commit count. That way, it's easier to compare revision strings and determine which one is newer. BUG= none R=eholk@chromium.org Review URL: https://codereview.chromium.org/2251153002 . --- CMakeLists.txt | 9 +++++++-- Makefile | 4 +++- Makefile.standalone | 4 +++- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 542171d0a..3c7b3afe9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -52,9 +52,14 @@ endif() execute_process(COMMAND git rev-parse HEAD WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - OUTPUT_VARIABLE SUBZERO_REVISION + OUTPUT_VARIABLE SZ_GIT_HASH OUTPUT_STRIP_TRAILING_WHITESPACE ) -add_definitions(-DSUBZERO_REVISION=${SUBZERO_REVISION}) +execute_process(COMMAND git rev-list --count HEAD + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} + OUTPUT_VARIABLE SZ_COMMIT_COUNT + OUTPUT_STRIP_TRAILING_WHITESPACE + ) +add_definitions(-DSUBZERO_REVISION=${SZ_COMMIT_COUNT}_${SZ_GIT_HASH}) target_link_libraries(pnacl-sz pthread) diff --git a/Makefile b/Makefile index e49eec351..ca1d4e321 100644 --- a/Makefile +++ b/Makefile @@ -31,4 +31,6 @@ else endif CPP.Defines += -DPNACL_LLVM -CPP.Defines += -DSUBZERO_REVISION=$(shell git rev-parse HEAD) +SZ_COMMIT_COUNT := $(shell git rev-list --count HEAD) +SZ_GIT_HASH := $(shell git rev-parse HEAD) +CPP.Defines += -DSUBZERO_REVISION=$(SZ_COMMIT_COUNT)_$(SZ_GIT_HASH) diff --git a/Makefile.standalone b/Makefile.standalone index 56fd8a444..f3a5d8771 100644 --- a/Makefile.standalone +++ b/Makefile.standalone @@ -111,7 +111,9 @@ ifdef SZTARGET endif BASE_CXX_DEFINES += -DPNACL_LLVM -BASE_CXX_DEFINES += -DSUBZERO_REVISION=$(shell git rev-parse HEAD) +SZ_COMMIT_COUNT := $(shell git rev-list --count HEAD) +SZ_GIT_HASH := $(shell git rev-parse HEAD) +BASE_CXX_DEFINES += -DSUBZERO_REVISION=$(SZ_COMMIT_COUNT)_$(SZ_GIT_HASH) CXX_DEFINES := $(BASE_CXX_DEFINES) -DPNACL_BROWSER_TRANSLATOR=0 -- 2.11.0