diff options
| author | Jordan Woyak <jordan.woyak@gmail.com> | 2011-08-22 20:06:17 -0500 |
|---|---|---|
| committer | Jordan Woyak <jordan.woyak@gmail.com> | 2011-08-22 20:06:17 -0500 |
| commit | 1528c95fe99d2607f9980da67be3ce40835c6f28 (patch) | |
| tree | 373905b8a40b395f6ec670f3467fe0e4c14ea7ef | |
| parent | 6a80b9989af820fa3e2af5b8a3efb8a547f20e34 (diff) | |
Remove hash from revision description for cmake and windows.
| -rw-r--r-- | CMakeLists.txt | 6 | ||||
| -rw-r--r-- | Source/Core/Common/make_scmrev.h.js | 9 |
2 files changed, 8 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 3aed637ae0..e691e5b53f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -54,9 +54,13 @@ if(GIT_FOUND AND NOT DOLPHIN_WC_REVISION) OUTPUT_VARIABLE DOLPHIN_WC_REVISION OUTPUT_STRIP_TRAILING_WHITESPACE) # defines DOLPHIN_WC_DESCRIBE - EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} describe --always --dirty + EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} describe --always --long --dirty OUTPUT_VARIABLE DOLPHIN_WC_DESCRIBE OUTPUT_STRIP_TRAILING_WHITESPACE) + +# remove hash from description + STRING(REGEX REPLACE "-[^-]+(-dirty)?$" "\\1" DOLPHIN_WC_DESCRIBE "${DOLPHIN_WC_DESCRIBE}") + # defines DOLPHIN_WC_BRANCH EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} rev-parse --abbrev-ref HEAD OUTPUT_VARIABLE DOLPHIN_WC_BRANCH diff --git a/Source/Core/Common/make_scmrev.h.js b/Source/Core/Common/make_scmrev.h.js index 914c5df95a..82f6394c2b 100644 --- a/Source/Core/Common/make_scmrev.h.js +++ b/Source/Core/Common/make_scmrev.h.js @@ -3,7 +3,7 @@ var oFS = new ActiveXObject("Scripting.FileSystemObject"); var outfile = "./Src/scmrev.h"; var cmd_revision = " rev-parse HEAD"; -var cmd_describe = " describe --always --dirty"; +var cmd_describe = " describe --always --long --dirty"; var cmd_branch = " rev-parse --abbrev-ref HEAD"; function GetGitExe() @@ -56,13 +56,10 @@ var gitexe = GetGitExe(); var revision = GetFirstStdOutLine(gitexe + cmd_revision); var describe = GetFirstStdOutLine(gitexe + cmd_describe); var branch = GetFirstStdOutLine(gitexe + cmd_branch); -var isMaster = 0 +var isMaster = +("master" == branch); // remove hash from description -describe = describe.replace(/-g\w+/, ''); - -if (branch == "master") - isMaster = 1 +describe = describe.replace(/-[^-]+(-dirty)?$/, '$1'); var out_contents = "#define SCM_REV_STR \"" + revision + "\"\n" + |