Skip to content

switch to constexpr char[] buildinfo #2372

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JulianGro merged 1 commit into from
Aug 12, 2026
+24 −25
Merged

switch to constexpr char[] buildinfo #2372

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 20 additions & 22 deletions cmake/templates/BuildInfo.h.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,24 +13,22 @@

#define USE_STABLE_GLOBAL_SERVICES @USE_STABLE_GLOBAL_SERVICES@

#include <QString>

namespace BuildInfo {
// WARNING: This file has been auto-generated.
// Check cmake/templates/BuildInfo.h.in if you want to modify it.

const QString INTERFACE_NAME = "Interface";
const QString ASSIGNMENT_CLIENT_NAME = "assignment-client";
const QString DOMAIN_SERVER_NAME = "domain-server";
const QString AC_CLIENT_SERVER_NAME = "ac-client";
const QString MODIFIED_ORGANIZATION = "@BUILD_ORGANIZATION@";
const QString ORGANIZATION_DOMAIN = "overte.org";
const QString VERSION = "@BUILD_VERSION@";
const QString BUILD_NUMBER = "@BUILD_VERSION_NO_SHA@";
const QString BUILD_GLOBAL_SERVICES = "@BUILD_GLOBAL_SERVICES@";
const QString BUILD_TIME = "@BUILD_DATE@";
const QString PRELOADED_STARTUP_LOCATION = "@PRELOADED_STARTUP_LOCATION@";
const QString PRELOADED_SCRIPT_ALLOWLIST = "@PRELOADED_SCRIPT_ALLOWLIST@";
constexpr char INTERFACE_NAME[] = "Interface";
constexpr char ASSIGNMENT_CLIENT_NAME[] = "assignment-client";
constexpr char DOMAIN_SERVER_NAME[] = "domain-server";
constexpr char AC_CLIENT_SERVER_NAME[] = "ac-client";
constexpr char MODIFIED_ORGANIZATION[] = "@BUILD_ORGANIZATION@";
constexpr char ORGANIZATION_DOMAIN[] = "overte.org";
constexpr char VERSION[] = "@BUILD_VERSION@";
constexpr char BUILD_NUMBER[] = "@BUILD_VERSION_NO_SHA@";
constexpr char BUILD_GLOBAL_SERVICES[] = "@BUILD_GLOBAL_SERVICES@";
constexpr char BUILD_TIME[] = "@BUILD_DATE@";
constexpr char PRELOADED_STARTUP_LOCATION[] = "@PRELOADED_STARTUP_LOCATION@";
constexpr char PRELOADED_SCRIPT_ALLOWLIST[] = "@PRELOADED_SCRIPT_ALLOWLIST@";

enum BuildType {
Dev,
Expand All @@ -40,17 +38,17 @@ namespace BuildInfo {
};

#if defined(PR_BUILD)
const BuildType BUILD_TYPE = PR;
const QString BUILD_TYPE_STRING = "pr";
constexpr BuildType BUILD_TYPE = PR;
constexpr char BUILD_TYPE_STRING[] = "pr";
#elif defined(PRODUCTION_BUILD)
const BuildType BUILD_TYPE = Stable;
const QString BUILD_TYPE_STRING = "stable";
constexpr BuildType BUILD_TYPE = Stable;
constexpr char BUILD_TYPE_STRING[] = "stable";
#elif defined(NIGHTLY_BUILD)
const BuildType BUILD_TYPE = Nightly;
const QString BUILD_TYPE_STRING = "nightly";
constexpr BuildType BUILD_TYPE = Nightly;
constexpr char BUILD_TYPE_STRING[] = "nightly";
#else
const BuildType BUILD_TYPE = Dev;
const QString BUILD_TYPE_STRING = "dev";
constexpr BuildType BUILD_TYPE = Dev;
constexpr char BUILD_TYPE_STRING[] = "dev";
#endif

}
3 changes: 2 additions & 1 deletion interface/src/Application.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
#include <QtNetwork/QLocalServer>
#include <QtQuick/QQuickWindow>
#include <QWidget>
#include <string_view>

#include <AccountManager.h>
#include <AddressManager.h>
Expand Down Expand Up @@ -1615,7 +1616,7 @@ void Application::handleSandboxStatus(QNetworkReply* reply) {

// If this is a first run we short-circuit the address passed in
if (_firstRun.get()) {
if (!BuildInfo::PRELOADED_STARTUP_LOCATION.isEmpty()) {
if (!std::string_view(BuildInfo::PRELOADED_STARTUP_LOCATION).empty()) {
DependencyManager::get<LocationBookmarks>()->setHomeLocationToAddress(NetworkingConstants::DEFAULT_OVERTE_ADDRESS);
Menu::getInstance()->triggerOption(MenuOption::HomeLocation);
}
Expand Down
4 changes: 2 additions & 2 deletions libraries/networking/src/AddressManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,10 @@ const QString REDIRECT_HIFI_ADDRESS = NetworkingConstants::REDIRECT_HIFI_ADDRESS
const QString ADDRESS_MANAGER_SETTINGS_GROUP = "AddressManager";
const QString SETTINGS_CURRENT_ADDRESS_KEY = "address";

const QString DEFAULT_OVERTE_ADDRESS = (!BuildInfo::PRELOADED_STARTUP_LOCATION.isEmpty())
const QString DEFAULT_OVERTE_ADDRESS = (!std::string_view(BuildInfo::PRELOADED_STARTUP_LOCATION).empty())
? BuildInfo::PRELOADED_STARTUP_LOCATION
: NetworkingConstants::DEFAULT_OVERTE_ADDRESS;
const QString DEFAULT_HOME_ADDRESS = (!BuildInfo::PRELOADED_STARTUP_LOCATION.isEmpty())
const QString DEFAULT_HOME_ADDRESS = (!std::string_view(BuildInfo::PRELOADED_STARTUP_LOCATION).empty())
? BuildInfo::PRELOADED_STARTUP_LOCATION
: NetworkingConstants::DEFAULT_OVERTE_ADDRESS;

Expand Down
Loading