[PATCH] Added the current commit to "soffice --version". Fixes bug 6...
Christopher Hotchkiss (via Code Review)
gerrit at gerrit.libreoffice.org
Thu Feb 14 20:50:33 PST 2013
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2160
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/60/2160/1
Added the current commit to "soffice --version". Fixes bug 60688.
Change-Id: I95300b093b4fabc9a52f9c92de874f7c8e4d2869
---
M desktop/source/app/app.cxx
M desktop/source/app/cmdlinehelp.cxx
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 70060ed..bc75d8d 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -72,6 +72,7 @@
#include <toolkit/unohlp.hxx>
#include <comphelper/configuration.hxx>
#include <comphelper/processfactory.hxx>
+#include <unotools/bootstrap.hxx>
#include <unotools/configmgr.hxx>
#include <unotools/moduleoptions.hxx>
#include <officecfg/Office/Common.hxx>
@@ -484,6 +485,7 @@
{
rtl::OUString sBrandName = BrandName::get();
rtl::OUString sVersion = Version::get();
+ rtl::OUString sBuildId = utl::Bootstrap::getBuildIdData("development");
rtl::OUString sAboutBoxVersion = AboutBoxVersion::get();
rtl::OUString sAboutBoxVersionSuffix = AboutBoxVersionSuffix::get();
rtl::OUString sExtension = Extension::get();
@@ -507,6 +509,7 @@
sRet = sRet.replaceAll( "%PRODUCTNAME", sBrandName );
sRet = sRet.replaceAll( "%PRODUCTVERSION", sVersion );
+ sRet = sRet.replaceAll( "%BUILDID", sBuildId );
sRet = sRet.replaceAll( "%ABOUTBOXPRODUCTVERSIONSUFFIX", sAboutBoxVersionSuffix );
sRet = sRet.replaceAll( "%ABOUTBOXPRODUCTVERSION", sAboutBoxVersion );
sRet = sRet.replaceAll( "%PRODUCTEXTENSION", sExtension );
diff --git a/desktop/source/app/cmdlinehelp.cxx b/desktop/source/app/cmdlinehelp.cxx
index 73d5613..84a5159 100644
--- a/desktop/source/app/cmdlinehelp.cxx
+++ b/desktop/source/app/cmdlinehelp.cxx
@@ -45,7 +45,7 @@
// [OK]
const char aCmdLineHelp_version[] =
- "%PRODUCTNAME %PRODUCTVERSION%PRODUCTEXTENSION\n"\
+ "%PRODUCTNAME %PRODUCTVERSION%PRODUCTEXTENSION %BUILDID\n"\
"\n";
const char aCmdLineHelp_head[] =
"Usage: %CMDNAME [options] [documents...]\n"\
--
To view, visit https://gerrit.libreoffice.org/2160
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I95300b093b4fabc9a52f9c92de874f7c8e4d2869
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Christopher Hotchkiss <christopher.hotchkiss at gmail.com>
More information about the LibreOffice
mailing list