From 6712ac0a726efe55637f9747e6faf332d913ed2a Mon Sep 17 00:00:00 2001 From: JohnHolmesII Date: Fri, 27 Mar 2020 12:11:16 -0700 Subject: [PATCH] Build: Do not warn for local builds --- Utilities/git-version-gen.cmd | 5 +++-- rpcs3/git-version.cmake | 6 +++--- rpcs3/rpcs3qt/main_window.cpp | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Utilities/git-version-gen.cmd b/Utilities/git-version-gen.cmd index 0538ec0ae7..86fc40cd0b 100644 --- a/Utilities/git-version-gen.cmd +++ b/Utilities/git-version-gen.cmd @@ -47,8 +47,9 @@ if errorlevel 1 ( echo // This is a generated file. > "%GIT_VERSION_FILE%" echo. >> "%GIT_VERSION_FILE%" - echo #define RPCS3_GIT_VERSION "unknown" >> "%GIT_VERSION_FILE%" - echo #define RPCS3_GIT_BRANCH "unknown" >> "%GIT_VERSION_FILE%" + echo #define RPCS3_GIT_VERSION ^"local_build^" >> "%GIT_VERSION_FILE%" + echo #define RPCS3_GIT_BRANCH ^"local_build^" >> "%GIT_VERSION_FILE%" + echo #define RPCS3_GIT_FULL_BRANCH ^"local_build^" >> "%GIT_VERSION_FILE%" echo. >> "%GIT_VERSION_FILE%" echo // If you don't want this file to update/recompile, change to 1. >> "%GIT_VERSION_FILE%" echo #define RPCS3_GIT_VERSION_NO_UPDATE 0 >> "%GIT_VERSION_FILE%" diff --git a/rpcs3/git-version.cmake b/rpcs3/git-version.cmake index d0dd2d9e4e..bd5c326eb1 100644 --- a/rpcs3/git-version.cmake +++ b/rpcs3/git-version.cmake @@ -1,6 +1,6 @@ -set(RPCS3_GIT_VERSION "unknown") -set(RPCS3_GIT_BRANCH "unknown") -set(RPCS3_GIT_FULL_BRANCH "unknown") +set(RPCS3_GIT_VERSION "local_build") +set(RPCS3_GIT_BRANCH "local_build") +set(RPCS3_GIT_FULL_BRANCH "local_build") find_package(Git) if(GIT_FOUND AND EXISTS "${CMAKE_SOURCE_DIR}/.git/") diff --git a/rpcs3/rpcs3qt/main_window.cpp b/rpcs3/rpcs3qt/main_window.cpp index 77921afb3f..1e3c1820b3 100644 --- a/rpcs3/rpcs3qt/main_window.cpp +++ b/rpcs3/rpcs3qt/main_window.cpp @@ -93,7 +93,7 @@ void main_window::Init() Q_EMIT RequestGlobalStylesheetChange(m_gui_settings->GetCurrentStylesheetPath()); ConfigureGuiFromSettings(true); - if (const std::string_view branch_name = rpcs3::get_full_branch(); branch_name != "RPCS3/rpcs3/master") + if (const std::string_view branch_name = rpcs3::get_full_branch(); branch_name != "RPCS3/rpcs3/master" && branch_name != "local_build") { gui_log.warning("Experimental Build Warning! Build origin: %s", branch_name);