diff options
| author | Pierre Bourdon <delroth@gmail.com> | 2016-06-18 00:13:37 +0200 |
|---|---|---|
| committer | Pierre Bourdon <delroth@gmail.com> | 2016-06-18 18:31:40 +0200 |
| commit | 49ce9b153df07647a3fd70bf2fdec705d927455c (patch) | |
| tree | 6e3f4b3809fb93f24daab0d08cc85f5e4ef2c3e9 /Source | |
| parent | c4f5c471bb61a2c66a5acc235c1f4057ec03ec67 (diff) | |
scmrev: Add "distributor" option.
Used to distinguish between Dolphin distributions (e.g. "dolphin-emu.org",
"Ishiiruka", etc.).
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/Core/Common/Common.h | 1 | ||||
| -rw-r--r-- | Source/Core/Common/Version.cpp | 1 | ||||
| -rw-r--r-- | Source/Core/Common/make_scmrev.h.js | 9 |
3 files changed, 9 insertions, 2 deletions
diff --git a/Source/Core/Common/Common.h b/Source/Core/Common/Common.h index 7f8e6ce639..4d60332d6c 100644 --- a/Source/Core/Common/Common.h +++ b/Source/Core/Common/Common.h @@ -15,6 +15,7 @@ extern const std::string scm_branch_str; extern const std::string scm_rev_str; extern const std::string scm_rev_git_str; extern const std::string netplay_dolphin_ver; +extern const std::string scm_distributor_str; // Force enable logging in the right modes. For some reason, something had changed // so that debugfast no longer logged. diff --git a/Source/Core/Common/Version.cpp b/Source/Core/Common/Version.cpp index 8c97ed78a9..c02a83a21c 100644 --- a/Source/Core/Common/Version.cpp +++ b/Source/Core/Common/Version.cpp @@ -36,3 +36,4 @@ const std::string scm_rev_git_str = SCM_REV_STR; const std::string scm_desc_str = SCM_DESC_STR; const std::string scm_branch_str = SCM_BRANCH_STR; +const std::string scm_distributor_str = SCM_DISTRIBUTOR_STR; diff --git a/Source/Core/Common/make_scmrev.h.js b/Source/Core/Common/make_scmrev.h.js index 1d5fa902f4..4d9c4806d9 100644 --- a/Source/Core/Common/make_scmrev.h.js +++ b/Source/Core/Common/make_scmrev.h.js @@ -76,7 +76,11 @@ var gitexe = GetGitExe(); var revision = GetFirstStdOutLine(gitexe + cmd_revision); var describe = GetFirstStdOutLine(gitexe + cmd_describe); var branch = GetFirstStdOutLine(gitexe + cmd_branch); -var isStable = +("master" == branch || "stable" == branch); +var isStable = +("master" == branch || "stable" == branch); + +// Get environment information. +var distributor = wshShell.ExpandEnvironmentStrings("%DOLPHIN_DISTRIBUTOR%"); +if (distributor == "%DOLPHIN_DISTRIBUTOR%") distributor = "None"; // remove hash (and trailing "-0" if needed) from description describe = describe.replace(/(-0)?-[^-]+(-dirty)?$/, '$2'); @@ -85,7 +89,8 @@ var out_contents = "#define SCM_REV_STR \"" + revision + "\"\n" + "#define SCM_DESC_STR \"" + describe + "\"\n" + "#define SCM_BRANCH_STR \"" + branch + "\"\n" + - "#define SCM_IS_MASTER " + isStable + "\n"; + "#define SCM_IS_MASTER " + isStable + "\n" + + "#define SCM_DISTRIBUTOR_STR \"" + distributor + "\"\n"; // check if file needs updating if (out_contents == GetFileContents(outfile)) |