izackp/Apollo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build(packaging): version number improvements (#4037)

Browse Source
This commit is contained in:
ReenigneArcher
2025-07-03 19:07:02 -04:00
committed by GitHub
parent 5ef3f2ff5c
commit 2259141bd2
16 changed files with 104 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/confighttp.cpp
View File

@@ -34,7 +34,6 @@
#include "process.h"
#include "utility.h"
#include "uuid.h"
#include "version.h"
using namespace std::literals;
@@ -843,7 +842,7 @@ namespace confighttp {
nlohmann::json output_tree;
output_tree["status"] = true;
output_tree["platform"] = SUNSHINE_PLATFORM;
output_tree["version"] = PROJECT_VER;
output_tree["version"] = PROJECT_VERSION;
auto vars = config::parse_config(file_handler::read_file(config::sunshine.config_file.c_str()));

1
src/entry_handler.cpp
View File

@@ -16,7 +16,6 @@
#include "logging.h"
#include "network.h"
#include "platform/common.h"
#include "version.h"
extern "C" {
#ifdef _WIN32

3
src/main.cpp
View File

@@ -20,7 +20,6 @@
#include "process.h"
#include "system_tray.h"
#include "upnp.h"
#include "version.h"
#include "video.h"
extern "C" {
@@ -123,7 +122,7 @@ int main(int argc, char *argv[]) {
// logging can begin at this point
// if anything is logged prior to this point, it will appear in stdout, but not in the log viewer in the UI
// the version should be printed to the log before anything else
BOOST_LOG(info) << PROJECT_NAME << " version: " << PROJECT_VER;
BOOST_LOG(info) << PROJECT_NAME << " version: " << PROJECT_VERSION << " commit: " << PROJECT_VERSION_COMMIT;
// Log publisher metadata
log_publisher_data();

1
src/system_tray.cpp
View File

@@ -42,7 +42,6 @@
#include "platform/common.h"
#include "process.h"
#include "src/entry_handler.h"
#include "version.h"
using namespace std::literals;

13
src/version.h.in
View File

@@ -1,13 +0,0 @@
/**
* @file src/version.h.in
* @brief Version definitions for Sunshine.
* @note The final `version.h` is generated from this file during the CMake build.
* @todo Use CMake definitions directly, instead of configuring this file.
*/
#pragma once
#define PROJECT_NAME "@PROJECT_NAME@"
#define PROJECT_VER "@PROJECT_VERSION@"
#define PROJECT_VER_MAJOR "@PROJECT_VERSION_MAJOR@"
#define PROJECT_VER_MINOR "@PROJECT_VERSION_MINOR@"
#define PROJECT_VER_PATCH "@PROJECT_VERSION_PATCH@"