Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-09 00:02:39 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

replace ApplicationVersion with BuildInfo

Browse source
This commit is contained in:
Stephen Birarda 2016-01-14 10:13:43 -08:00
parent e9ce0318a2
commit 0b118a8e98
6 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
assignment-client/src/AssignmentClientApp.cpp
View file

@ -12,7 +12,7 @@
#include <QCommandLineParser>
#include <QThread>
#include <ApplicationVersion.h>
#include <BuildInfo.h>
#include <LogHandler.h>
#include <SharedUtil.h>
#include <HifiConfigVariantMap.h>
@ -44,10 +44,10 @@ AssignmentClientApp::AssignmentClientApp(int argc, char* argv[]) :
ShutdownEventListener::getInstance();
# endif
setOrganizationName("High Fidelity");
setOrganizationName(BuildInfo::MODIFIED_ORGANIZATION);
setOrganizationDomain("highfidelity.io");
setApplicationName("assignment-client");
setApplicationName(BUILD_VERSION);
setApplicationName(BuildInfo::VERSION);
// use the verbose message handler in Logging
qInstallMessageHandler(LogHandler::verboseMessageHandler);

11
cmake/macros/SetPackagingParameters.cmake
View file

@ -20,8 +20,7 @@ macro(SET_PACKAGING_PARAMETERS)
set(DEPLOY_PACKAGE TRUE)
set(BUILD_SEQ $ENV{JOB_ID})
set(PRODUCTION_BUILD 1)
set(INSTALLER_COMPANY "High Fidelity")
set(INSTALLER_DIRECTORY "${INSTALLER_COMPANY}")
set(BUILD_ORGANIZATION "High Fidelity")
set(INSTALLER_NAME "interface-win64-${BUILD_SEQ}.exe")
set(HIGH_FIDELITY_PROTOCOL "hifi")
set(INTERFACE_BUNDLE_NAME "High Fidelity")
@ -31,8 +30,7 @@ macro(SET_PACKAGING_PARAMETERS)
set(DEPLOY_PACKAGE TRUE)
set(PR_BUILD 1)
set(BUILD_SEQ "PR-$ENV{ghprbPullId}")
set(INSTALLER_COMPANY "High Fidelity - PR")
set(INSTALLER_DIRECTORY "${INSTALLER_COMPANY}\\${BUILD_SEQ}")
set(BUILD_ORGANIZATION "High Fidelity - PR#$ENV{ghprbPullId}")
set(INSTALLER_NAME "pr-interface-win64-${BUILD_SEQ}.exe")
set(INTERFACE_BUNDLE_NAME "High Fidelity ${BUILD_SEQ}")
set(INTERFACE_ICON_PREFIX "interface-beta")
@ -40,8 +38,7 @@ macro(SET_PACKAGING_PARAMETERS)
else ()
set(BUILD_SEQ "dev")
set(DEV_BUILD 1)
set(INSTALLER_COMPANY "High Fidelity - Dev")
set(INSTALLER_DIRECTORY "${INSTALLER_COMPANY}")
set(BUILD_ORGANIZATION "High Fidelity - Dev")
set(INSTALLER_NAME "dev-interface-win64.exe")
set(INTERFACE_BUNDLE_NAME "Interface")
set(INTERFACE_ICON_PREFIX "interface-beta")
@ -95,6 +92,6 @@ macro(SET_PACKAGING_PARAMETERS)
# create a header file our targets can use to find out the application version
file(MAKE_DIRECTORY "${CMAKE_BINARY_DIR}/includes")
configure_file("${MACRO_DIR}/ApplicationVersion.h.in" "${CMAKE_BINARY_DIR}/includes/ApplicationVersion.h")
configure_file("${HF_CMAKE_DIR}/templates/BuildInfo.h.in" "${CMAKE_BINARY_DIR}/includes/BuildInfo.h")
endmacro(SET_PACKAGING_PARAMETERS)

9
cmake/macros/ApplicationVersion.h.in → cmake/templates/BuildInfo.h.in
View file

@ -1,12 +1,15 @@
//
// ApplicationVersion.h.in
// BuildInfo.h.in
// cmake/macros
//
// Created by Leonardo Murillo on 8/13/15.
// Created by Stephen Birarda on 1/14/16.
// Copyright 2015 High Fidelity, Inc.
//
// Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
//
const QString BUILD_VERSION = "@BUILD_SEQ@";
namespace BuildInfo {
const QString MODIFIED_ORGANIZATION = "@BUILD_ORGANIZATION@";
const QString VERSION = "@BUILD_SEQ@";
}

6
domain-server/src/DomainServer.cpp
View file

@ -24,7 +24,7 @@
#include <QUrlQuery>
#include <AccountManager.h>
#include <ApplicationVersion.h>
#include <BuildInfo.h>
#include <HifiConfigVariantMap.h>
#include <HTTPConnection.h>
#include <LogUtils.h>
@ -72,10 +72,10 @@ DomainServer::DomainServer(int argc, char* argv[]) :
connect(this, &QCoreApplication::aboutToQuit, this, &DomainServer::aboutToQuit);
setOrganizationName("High Fidelity");
setOrganizationName(BuildInfo::MODIFIED_ORGANIZATION);
setOrganizationDomain("highfidelity.io");
setApplicationName("domain-server");
setApplicationVersion(BUILD_VERSION);
setApplicationVersion(BuildInfo::VERSION);
QSettings::setDefaultFormat(QSettings::IniFormat);
// make sure we have a fresh AccountManager instance

4
interface/src/Application.cpp
View file

@ -60,7 +60,7 @@
#include <ResourceScriptingInterface.h>
#include <AccountManager.h>
#include <AddressManager.h>
#include <ApplicationVersion.h>
#include <BuildInfo.h>
#include <AssetClient.h>
#include <AssetUpload.h>
#include <AutoUpdater.h>
@ -306,7 +306,7 @@ bool setupEssentials(int& argc, char** argv) {
listenPort = atoi(portStr);
}
// Set build version
QCoreApplication::setApplicationVersion(BUILD_VERSION);
QCoreApplication::setApplicationVersion(BuildInfo::VERSION);
Setting::preInit();

4
libraries/networking/src/Assignment.cpp
View file

@ -16,7 +16,7 @@
#include <QtCore/QDataStream>
#include <ApplicationVersion.h>
#include <BuildInfo.h>
#include "Assignment.h"
#include <QtCore/QStandardPaths>
@ -66,7 +66,7 @@ Assignment::Assignment(Assignment::Command command, Assignment::Type type, const
// this is a newly created assignment, generate a random UUID
_uuid = QUuid::createUuid();
} else if (_command == Assignment::RequestCommand) {
_nodeVersion = BUILD_VERSION;
_nodeVersion = BuildInfo::VERSION;
}
}