diff --git a/BUILD.md b/BUILD.md index 3fa36e3d57..e9eb97b324 100644 --- a/BUILD.md +++ b/BUILD.md @@ -111,10 +111,7 @@ CMAKE_BACKTRACE_TOKEN // The release version, e.g., 2021.3.2. RELEASE_NUMBER -// The release name, e.g., Eos. -RELEASE_NAME // The build commit, e.g., use a Git hash for the most recent commit in the branch - fd6973b. - BUILD_NUMBER // The type of release. diff --git a/INSTALLER.md b/INSTALLER.md index 19614c1abe..1c69611a97 100644 --- a/INSTALLER.md +++ b/INSTALLER.md @@ -106,7 +106,7 @@ For code signing to work, you will need to set the `HF_PFX_FILE` and `HF_PFX_PAS 1. Ensure you have all the prerequisites fulfilled from the [MacOS Build Guide](BUILD_OSX.md). 2. Perform a clean CMake in your build folder. e.g. ```bash - BUILD_GLOBAL_SERVICES=STABLE USE_STABLE_GLOBAL_SERVICES=1 RELEASE_BUILD=PRODUCTION BUILD_NUMBER="Insert Build Identifier here e.g. short hash of your last Git commit" RELEASE_NAME="Insert Release Name Here" STABLE_BUILD=1 PRODUCTION_BUILD=1 RELEASE_NUMBER="Insert Release Version Here e.g. 1.1.0" RELEASE_TYPE=PRODUCTION cmake -DCMAKE_OSX_SYSROOT="/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk" -DCLIENT_ONLY=1 -DCMAKE_OSX_DEPLOYMENT_TARGET=10.12 -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl -DOSX_SDK=10.12 .. + BUILD_GLOBAL_SERVICES=STABLE USE_STABLE_GLOBAL_SERVICES=1 RELEASE_BUILD=PRODUCTION BUILD_NUMBER="Insert Build Identifier here e.g. short hash of your last Git commit" STABLE_BUILD=1 PRODUCTION_BUILD=1 RELEASE_NUMBER="Insert Release Version Here e.g. 1.1.0" RELEASE_TYPE=PRODUCTION cmake -DCMAKE_OSX_SYSROOT="/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk" -DCLIENT_ONLY=1 -DCMAKE_OSX_DEPLOYMENT_TARGET=10.12 -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl -DOSX_SDK=10.12 .. ``` 3. Pick a method to build and package your release. diff --git a/cmake/macros/SetPackagingParameters.cmake b/cmake/macros/SetPackagingParameters.cmake index 0ae25f6651..4d2cac7b3e 100644 --- a/cmake/macros/SetPackagingParameters.cmake +++ b/cmake/macros/SetPackagingParameters.cmake @@ -23,7 +23,6 @@ macro(SET_PACKAGING_PARAMETERS) set_from_env(RELEASE_TYPE RELEASE_TYPE "DEV") set_from_env(RELEASE_NUMBER RELEASE_NUMBER "") - set_from_env(RELEASE_NAME RELEASE_NAME "") set_from_env(STABLE_BUILD STABLE_BUILD 0) set_from_env(PRELOADED_STARTUP_LOCATION PRELOADED_STARTUP_LOCATION "") diff --git a/cmake/templates/BuildInfo.h.in b/cmake/templates/BuildInfo.h.in index 767807b41b..25541efb17 100644 --- a/cmake/templates/BuildInfo.h.in +++ b/cmake/templates/BuildInfo.h.in @@ -25,7 +25,6 @@ namespace BuildInfo { const QString MODIFIED_ORGANIZATION = "@BUILD_ORGANIZATION@"; const QString ORGANIZATION_DOMAIN = "overte.org"; const QString VERSION = "@BUILD_VERSION@"; - const QString RELEASE_NAME = "@RELEASE_NAME@"; const QString BUILD_NUMBER = "@BUILD_NUMBER@"; const QString BUILD_GLOBAL_SERVICES = "@BUILD_GLOBAL_SERVICES@"; const QString BUILD_TIME = "@BUILD_TIME@"; diff --git a/interface/src/AboutUtil.cpp b/interface/src/AboutUtil.cpp index 577f1c47f7..a121cbb309 100644 --- a/interface/src/AboutUtil.cpp +++ b/interface/src/AboutUtil.cpp @@ -4,7 +4,6 @@ // // Created by Vlad Stelmahovsky on 15/5/2018. // Copyright 2018 High Fidelity, Inc. -// Copyright 2021 Vircadia contributors. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html @@ -43,10 +42,6 @@ QString AboutUtil::getBuildVersion() const { return BuildInfo::VERSION; } -QString AboutUtil::getReleaseName() const { - return BuildInfo::RELEASE_NAME; -} - QString AboutUtil::getQtVersion() const { return qVersion(); } diff --git a/interface/src/AboutUtil.h b/interface/src/AboutUtil.h index 1c46b8549b..97ea31d429 100644 --- a/interface/src/AboutUtil.h +++ b/interface/src/AboutUtil.h @@ -30,7 +30,6 @@ * Read-only. * @property {string} buildDate - The build date of Interface that is currently running. Read-only. * @property {string} buildVersion - The build version of Interface that is currently running. Read-only. - * @property {string} releaseName - The release codename of the version that Interface is currently running. Read-only. * @property {string} qtVersion - The Qt version used in Interface that is currently running. Read-only. * @property {string} qtWebEngineVersion - The Qt WebEngine version used in Interface that is currently running. Read-only. * @property {string} qtChromiumVersion - The Qt Chromium version used in Interface that is currently running. Read-only. @@ -40,7 +39,6 @@ * print("Interface platform: " + About.platform); * print("Interface build date: " + About.buildDate); * print("Interface version: " + About.buildVersion); - * print("Interface release name: " + About.releaseName); * print("Qt version: " + About.qtVersion); */ @@ -71,7 +69,6 @@ class AboutUtil : public QObject { Q_PROPERTY(QString platform READ getPlatformName CONSTANT) Q_PROPERTY(QString buildDate READ getBuildDate CONSTANT) Q_PROPERTY(QString buildVersion READ getBuildVersion CONSTANT) - Q_PROPERTY(QString releaseName READ getReleaseName CONSTANT) Q_PROPERTY(QString qtVersion READ getQtVersion CONSTANT) Q_PROPERTY(QString qtWebEngineVersion READ getQtWebEngineVersion CONSTANT) Q_PROPERTY(QString qtChromiumVersion READ getQtChromiumVersion CONSTANT) @@ -83,7 +80,6 @@ public: QString getPlatformName() const { return "Overte"; } QString getBuildDate() const; QString getBuildVersion() const; - QString getReleaseName() const; QString getQtVersion() const; QString getQtWebEngineVersion() const; QString getQtChromiumVersion() const; diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 8d99e41668..62e6aef46f 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -7251,10 +7251,6 @@ void Application::updateWindowTitle() const { + (BuildInfo::BUILD_TYPE == BuildInfo::BuildType::Stable ? QString("Version") : QString("Build")) + " " + applicationVersion(); - if (BuildInfo::RELEASE_NAME != "") { - buildVersion += " - " + BuildInfo::RELEASE_NAME; - } - QString connectionStatus = isInErrorState ? " (ERROR CONNECTING)" : nodeList->getDomainHandler().isConnected() ? "" : " (NOT CONNECTED)";