diff options
| author | Darshan Shaligram <scintilla@gmail.com> | 2014-05-05 15:54:02 -0400 |
|---|---|---|
| committer | Darshan Shaligram <scintilla@gmail.com> | 2014-05-05 20:44:15 -0400 |
| commit | 332536bcd766995a9ad19bd580f9ad96df1e0863 (patch) | |
| tree | 6650cbfea549ba915f69a105b274d4ba8b6ce815 | |
| parent | 86354defe9dc5cb3d15b7596668d15c0c946aaac (diff) | |
| download | crawl-ref-332536bcd766995a9ad19bd580f9ad96df1e0863.tar.gz crawl-ref-332536bcd766995a9ad19bd580f9ad96df1e0863.zip | |
On experimental branches, log explbr=branchname.
Set EXPERIMENTAL_BRANCH and log explbr to logfile and milestones on
experimental branches.
| -rw-r--r-- | crawl-ref/source/Makefile | 7 | ||||
| -rw-r--r-- | crawl-ref/source/hiscores.cc | 3 |
2 files changed, 10 insertions, 0 deletions
diff --git a/crawl-ref/source/Makefile b/crawl-ref/source/Makefile index 327e6db67e..36daa8ddad 100644 --- a/crawl-ref/source/Makefile +++ b/crawl-ref/source/Makefile @@ -719,6 +719,13 @@ ifdef EUCLIDEAN DEFINES_L += -DEUCLIDEAN endif + +SRC_BRANCH := $(shell git rev-parse --abbrev-ref HEAD || echo release) +ifneq ($(SRC_BRANCH),$(filter master release stone_soup-%, $(SRC_BRANCH))) + DEFINES_L += -DEXPERIMENTAL_BRANCH="\"$(SRC_BRANCH)\"" +endif + + # # Figure out the build settings for this type of build # diff --git a/crawl-ref/source/hiscores.cc b/crawl-ref/source/hiscores.cc index 05d77a6a8b..9422041ed2 100644 --- a/crawl-ref/source/hiscores.cc +++ b/crawl-ref/source/hiscores.cc @@ -978,6 +978,9 @@ void scorefile_entry::set_base_xlog_fields() const score_version += "-zotdef.1"; fields->add_field("v", "%s", Version::Short); fields->add_field("lv", "%s", score_version.c_str()); +#ifdef EXPERIMENTAL_BRANCH + fields->add_field("explbr", EXPERIMENTAL_BRANCH); +#endif if (tiles) fields->add_field("tiles", "%d", tiles); fields->add_field("name", "%s", name.c_str()); |