piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-11-14 13:27:45 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

scmrev: Add "distributor" option.

Browse Source 
Used to distinguish between Dolphin distributions (e.g. "dolphin-emu.org",
"Ishiiruka", etc.).
This commit is contained in:
Pierre Bourdon 2016-06-18 00:13:37 +02:00
parent c4f5c471bb
commit 49ce9b153d
4 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -24,6 +24,11 @@ option(ENABLE_HEADLESS "Enables running Dolphin as a headless variant" OFF)
# of our software in the wild. # of our software in the wild.
option(ENABLE_ANALYTICS "Enables opt-in Analytics collection" ON) option(ENABLE_ANALYTICS "Enables opt-in Analytics collection" ON)
# Name of the Dolphin distributor. If you redistribute Dolphin builds (forks,
# unofficial builds) please consider identifying your distribution with a
# unique name here.
set(DISTRIBUTOR "None" CACHE STRING "Name of the distributor.")
# Enable SDL for default on operating systems that aren't OSX, Android, Linux or Windows. # Enable SDL for default on operating systems that aren't OSX, Android, Linux or Windows.
if(NOT APPLE AND NOT ANDROID AND NOT ${CMAKE_SYSTEM_NAME} STREQUAL "Linux" AND NOT MSVC) if(NOT APPLE AND NOT ANDROID AND NOT ${CMAKE_SYSTEM_NAME} STREQUAL "Linux" AND NOT MSVC)
option(ENABLE_SDL "Enables SDL as a generic controller backend" ON) option(ENABLE_SDL "Enables SDL as a generic controller backend" ON)
@ -935,6 +940,7 @@ file(WRITE ${PROJECT_BINARY_DIR}/Source/Core/Common/scmrev.h
"#define SCM_DESC_STR \"" ${DOLPHIN_WC_DESCRIBE} "\"\n" "#define SCM_DESC_STR \"" ${DOLPHIN_WC_DESCRIBE} "\"\n"
"#define SCM_BRANCH_STR \"" ${DOLPHIN_WC_BRANCH} "\"\n" "#define SCM_BRANCH_STR \"" ${DOLPHIN_WC_BRANCH} "\"\n"
"#define SCM_IS_MASTER " ${DOLPHIN_WC_IS_STABLE} "\n" "#define SCM_IS_MASTER " ${DOLPHIN_WC_IS_STABLE} "\n"
"#define SCM_DISTRIBUTOR_STR \"" ${DISTRIBUTOR} "\"\n"
) )
include_directories("${PROJECT_BINARY_DIR}/Source/Core/Common") include_directories("${PROJECT_BINARY_DIR}/Source/Core/Common")

1
Source/Core/Common/Common.h
View File

@ -15,6 +15,7 @@ extern const std::string scm_branch_str;
extern const std::string scm_rev_str; extern const std::string scm_rev_str;
extern const std::string scm_rev_git_str; extern const std::string scm_rev_git_str;
extern const std::string netplay_dolphin_ver; 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 // Force enable logging in the right modes. For some reason, something had changed
// so that debugfast no longer logged. // so that debugfast no longer logged.

1
Source/Core/Common/Version.cpp
View File

@ -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_desc_str = SCM_DESC_STR;
const std::string scm_branch_str = SCM_BRANCH_STR; const std::string scm_branch_str = SCM_BRANCH_STR;
const std::string scm_distributor_str = SCM_DISTRIBUTOR_STR;

9
Source/Core/Common/make_scmrev.h.js
View File

@ -76,7 +76,11 @@ var gitexe = GetGitExe();
var revision = GetFirstStdOutLine(gitexe + cmd_revision); var revision = GetFirstStdOutLine(gitexe + cmd_revision);
var describe = GetFirstStdOutLine(gitexe + cmd_describe); var describe = GetFirstStdOutLine(gitexe + cmd_describe);
var branch = GetFirstStdOutLine(gitexe + cmd_branch); 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 // remove hash (and trailing "-0" if needed) from description
describe = describe.replace(/(-0)?-[^-]+(-dirty)?$/, '$2'); describe = describe.replace(/(-0)?-[^-]+(-dirty)?$/, '$2');
@ -85,7 +89,8 @@ var out_contents =
"#define SCM_REV_STR \"" + revision + "\"\n" + "#define SCM_REV_STR \"" + revision + "\"\n" +
"#define SCM_DESC_STR \"" + describe + "\"\n" + "#define SCM_DESC_STR \"" + describe + "\"\n" +
"#define SCM_BRANCH_STR \"" + branch + "\"\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 // check if file needs updating
if (out_contents == GetFileContents(outfile)) if (out_contents == GetFileContents(outfile))