Subzero: Include commit count in revision string.

Instead of the version string being like this: Subzero_revision_efdf4120 Make it more like this: Subzero_revision_1089_efdf4120 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 .

Subzero: Include commit count in revision string.
6b0ee2ab · Jim Stichnoth · efdf4120 · 6b0ee2ab · 6b0ee2ab · 6b0ee2ab
Commit 6b0ee2ab authored Aug 17, 2016 by Jim Stichnoth
Hide whitespace changes
Inline Side-by-side

Showing with 13 additions and 4 deletions

CMakeLists.txt CMakeLists.txt +7 -2

Makefile Makefile +3 -1

Makefile.standalone Makefile.standalone +3 -1

No files found.
--- 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)
--- 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)
--- 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