自动读取分支名

This commit is contained in:
shenmo 2023-03-07 17:12:22 +08:00
parent bcb399dc30
commit 1613825b7c
3 changed files with 4 additions and 3 deletions

2
debian/changelog vendored
View File

@ -3,7 +3,7 @@ spark-store (4.2.3.2~Reason5) stable; urgency=medium
* aptss 支持非root模式启动 * aptss 支持非root模式启动
* aptss 添加transhell支持 * aptss 添加transhell支持
-- shenmo <shenmo@spark-app.store> Sun, 5 Mar 2022 11:45:14 +0800 -- shenmo <shenmo@spark-app.store>
spark-store (4.2.3.2~Reason3) stable; urgency=medium spark-store (4.2.3.2~Reason3) stable; urgency=medium
* 现在可在x86上编译使用同一套代码 * 现在可在x86上编译使用同一套代码
* 暂时在aarch64上使用旧web----等待柚子 * 暂时在aarch64上使用旧web----等待柚子

View File

@ -91,11 +91,12 @@ void Application::setBuildDateTime(const QString &buildDateTime)
qDebug() << "Spark Store has been updated!"; qDebug() << "Spark Store has been updated!";
config.setValue("build/version", QString(APP_VERSION)); config.setValue("build/version", QString(APP_VERSION));
config.setValue("build/branch",QString(APP_BRANCH));
config.setValue("build/time", buildDateTime); config.setValue("build/time", buildDateTime);
config.sync(); config.sync();
} }
setApplicationVersion(DApplication::buildVersion(QString(APP_VERSION) + "-" + "Reason" + "-" + buildDateTime)); setApplicationVersion(DApplication::buildVersion(QString(APP_VERSION) + "-" + QString(APP_BRANCH) + "-" + buildDateTime));
} }
void Application::setMainWindow(MainWindow *window) void Application::setMainWindow(MainWindow *window)

View File

@ -26,7 +26,7 @@ DEFINES += QT_DEPRECATED_WARNINGS
VERSION = $$BUILD_VERSION VERSION = $$BUILD_VERSION
isEmpty(VERSION): VERSION = 4.0.0 isEmpty(VERSION): VERSION = 4.0.0
DEFINES += APP_VERSION=\\\"'$${VERSION}'\\\" DEFINES += APP_VERSION=\\\"'$${VERSION}'\\\"
DEFINES += APP_BRANCH=\\\"'$$system(git symbolic-ref --short -q HEAD)'\\\"
# Disable qWarning / qDebug output in Release # Disable qWarning / qDebug output in Release
#CONFIG(release, debug | release): DEFINES += QT_NO_WARNING_OUTPUT QT_NO_DEBUG_OUTPUT #CONFIG(release, debug | release): DEFINES += QT_NO_WARNING_OUTPUT QT_NO_DEBUG_OUTPUT