cui/source/dialogs/about.src | 2 +- desktop/source/app/app.cxx | 5 +++++ desktop/source/deployment/gui/dp_gui_service.cxx | 5 +++++ instsetoo_native/util/openoffice.lst | 15 +++++++++------ officecfg/registry/data/org/openoffice/Setup.xcu | 3 +++ officecfg/registry/schema/org/openoffice/Setup.xcs | 7 +++++++ solenv/bin/modules/installer/download.pm | 1 + unotools/inc/unotools/configmgr.hxx | 2 ++ unotools/source/config/configmgr.cxx | 7 +++++++ 9 files changed, 40 insertions(+), 7 deletions(-)
New commits: commit dac89858f63c0f9527f11ad3a6c8b5ea16053c85 Author: Petr Mladek <pmla...@suse.cz> Date: Fri Dec 16 14:08:38 2011 +0100 add version suffix (beta1) to about dialog configurable at build time via ABOUTBOXPRODUCTVERSIONSUFFIX in instsetoo_native/util/openoffice.lst configurable at runtime via registry/data/org/openoffice/Setup.xcu and ooSetupVersionAboutBoxSuffix property diff --git a/cui/source/dialogs/about.src b/cui/source/dialogs/about.src index 8ee4862..86f3811 100644 --- a/cui/source/dialogs/about.src +++ b/cui/source/dialogs/about.src @@ -70,7 +70,7 @@ ModalDialog RID_DEFAULTABOUT }; String ABOUT_STR_VERSION { - Text[ en-US ] = "%PRODUCTNAME %ABOUTBOXPRODUCTVERSION %PRODUCTEXTENSION"; + Text[ en-US ] = "%PRODUCTNAME %ABOUTBOXPRODUCTVERSION%ABOUTBOXPRODUCTVERSIONSUFFIX %PRODUCTEXTENSION"; }; String ABOUT_STR_VENDOR { diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index 61c3832..49d86b0 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -274,6 +274,8 @@ namespace : public rtl::Static< String, Version > {}; struct AboutBoxVersion : public rtl::Static< String, AboutBoxVersion > {}; + struct AboutBoxVersionSuffix + : public rtl::Static< String, AboutBoxVersionSuffix > {}; struct OOOVendor : public rtl::Static< String, OOOVendor > {}; struct Extension @@ -296,6 +298,7 @@ void ReplaceStringHookProc( UniString& rStr ) String rBrandName = BrandName::get(); String rVersion = Version::get(); String rAboutBoxVersion = AboutBoxVersion::get(); + String rAboutBoxVersionSuffix = AboutBoxVersionSuffix::get(); String rExtension = Extension::get(); String rXMLFileFormatName = XMLFileFormatName::get(); String rXMLFileFormatVersion = XMLFileFormatVersion::get(); @@ -308,6 +311,7 @@ void ReplaceStringHookProc( UniString& rStr ) utl::ConfigManager::getProductXmlFileFormatVersion(); rVersion = utl::ConfigManager::getProductVersion(); rAboutBoxVersion = utl::ConfigManager::getAboutBoxProductVersion(); + rAboutBoxVersionSuffix = utl::ConfigManager::getAboutBoxProductVersionSuffix(); if ( !rExtension.Len() ) { rExtension = utl::ConfigManager::getProductExtension(); @@ -317,6 +321,7 @@ void ReplaceStringHookProc( UniString& rStr ) nPro++; rStr.SearchAndReplaceAllAscii( "%PRODUCTNAME", rBrandName ); rStr.SearchAndReplaceAllAscii( "%PRODUCTVERSION", rVersion ); + rStr.SearchAndReplaceAllAscii( "%ABOUTBOXPRODUCTVERSIONSUFFIX", rAboutBoxVersionSuffix ); rStr.SearchAndReplaceAllAscii( "%ABOUTBOXPRODUCTVERSION", rAboutBoxVersion ); rStr.SearchAndReplaceAllAscii( "%PRODUCTEXTENSION", rExtension ); rStr.SearchAndReplaceAllAscii( "%PRODUCTXMLFILEFORMATNAME", rXMLFileFormatName ); diff --git a/desktop/source/deployment/gui/dp_gui_service.cxx b/desktop/source/deployment/gui/dp_gui_service.cxx index 8108e74..1e98df4 100644 --- a/desktop/source/deployment/gui/dp_gui_service.cxx +++ b/desktop/source/deployment/gui/dp_gui_service.cxx @@ -92,6 +92,8 @@ namespace : public rtl::Static< String, Version > {}; struct AboutBoxVersion : public rtl::Static< String, AboutBoxVersion > {}; + struct AboutBoxVersionSuffix + : public rtl::Static< String, AboutBoxVersionSuffix > {}; struct OOOVendor : public rtl::Static< String, OOOVendor > {}; struct Extension @@ -108,6 +110,7 @@ void ReplaceProductNameHookProc( String& rStr ) String rProductName = ProductName::get(); String rVersion = Version::get(); String rAboutBoxVersion = AboutBoxVersion::get(); + String rAboutBoxVersionSuffix = AboutBoxVersionSuffix::get(); String rExtension = Extension::get(); String rOOOVendor = OOOVendor::get(); @@ -116,6 +119,7 @@ void ReplaceProductNameHookProc( String& rStr ) rProductName = utl::ConfigManager::getProductName(); rVersion = utl::ConfigManager::getProductVersion(); rAboutBoxVersion = utl::ConfigManager::getAboutBoxProductVersion(); + rAboutBoxVersionSuffix = utl::ConfigManager::getAboutBoxProductVersionSuffix(); rOOOVendor = utl::ConfigManager::getVendor(); if ( !rExtension.Len() ) { @@ -126,6 +130,7 @@ void ReplaceProductNameHookProc( String& rStr ) nPro++; rStr.SearchAndReplaceAllAscii( "%PRODUCTNAME", rProductName ); rStr.SearchAndReplaceAllAscii( "%PRODUCTVERSION", rVersion ); + rStr.SearchAndReplaceAllAscii( "%ABOUTBOXPRODUCTVERSIONSUFFIX", rAboutBoxVersionSuffix ); rStr.SearchAndReplaceAllAscii( "%ABOUTBOXPRODUCTVERSION", rAboutBoxVersion ); rStr.SearchAndReplaceAllAscii( "%OOOVENDOR", rOOOVendor ); rStr.SearchAndReplaceAllAscii( "%PRODUCTEXTENSION", rExtension ); diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst index b2f3c20..934126e 100644 --- a/instsetoo_native/util/openoffice.lst +++ b/instsetoo_native/util/openoffice.lst @@ -52,12 +52,13 @@ LibreOffice PRODUCTVERSION 3.6 PRODUCTEXTENSION LONG_PRODUCTEXTENSION - SHORT_PRODUCTEXTENSION beta0 + SHORT_PRODUCTEXTENSION alpha0 POSTVERSIONEXTENSION POSTVERSIONEXTENSIONUNIX BRANDPACKAGEVERSION 3.6 USERDIRPRODUCTVERSION 3 ABOUTBOXPRODUCTVERSION 3.6.0 + ABOUTBOXPRODUCTVERSIONSUFFIX alpha0+ BASEPRODUCTVERSION 3.6 PCPFILENAME libreoffice.pcp UPDATEURL http://update.libreoffice.org/check.php @@ -110,13 +111,14 @@ LibreOffice_Dev PRODUCTVERSION 3.6 PRODUCTEXTENSION LONG_PRODUCTEXTENSION - SHORT_PRODUCTEXTENSION beta0 + SHORT_PRODUCTEXTENSION alpha0 UNIXBASISROOTNAME lodev3.6 POSTVERSIONEXTENSION POSTVERSIONEXTENSIONUNIX BRANDPACKAGEVERSION 3.6 USERDIRPRODUCTVERSION 3 ABOUTBOXPRODUCTVERSION 3.6.0 + ABOUTBOXPRODUCTVERSIONSUFFIX alpha0+ BASEPRODUCTVERSION 3.6 DEVELOPMENTPRODUCT 1 BASISPACKAGEPREFIX lodevbasis @@ -179,7 +181,7 @@ URE PRODUCTEXTENSION BRANDPACKAGEVERSION 3.6 LONG_PRODUCTEXTENSION - SHORT_PRODUCTEXTENSION beta0 + SHORT_PRODUCTEXTENSION alpha0 LICENSENAME LGPL SETSTATICPATH 1 NOVERSIONINDIRNAME 1 @@ -213,7 +215,7 @@ LibreOffice_SDK PRODUCTVERSION 3.6 PRODUCTEXTENSION LONG_PRODUCTEXTENSION - SHORT_PRODUCTEXTENSION beta0 + SHORT_PRODUCTEXTENSION alpha0 POSTVERSIONEXTENSION SDK POSTVERSIONEXTENSIONUNIX sdk BRANDPACKAGEVERSION 3.6 @@ -255,7 +257,7 @@ LibreOffice_Dev_SDK PRODUCTVERSION 3.6 PRODUCTEXTENSION LONG_PRODUCTEXTENSION - SHORT_PRODUCTEXTENSION beta0 + SHORT_PRODUCTEXTENSION alpha0 UNIXBASISROOTNAME lodev3.6 POSTVERSIONEXTENSION SDK POSTVERSIONEXTENSIONUNIX sdk @@ -392,12 +394,13 @@ OxygenOffice PRODUCTVERSION 3.6 PRODUCTEXTENSION LONG_PRODUCTEXTENSION - SHORT_PRODUCTEXTENSION beta0 + SHORT_PRODUCTEXTENSION alpha0 POSTVERSIONEXTENSION POSTVERSIONEXTENSIONUNIX BRANDPACKAGEVERSION 3.6 USERDIRPRODUCTVERSION 3 ABOUTBOXPRODUCTVERSION 3.6.0 + ABOUTBOXPRODUCTVERSIONSUFFIX alpha0+ BASEPRODUCTVERSION 3.6 PCPFILENAME openoffice.pcp UPDATEURL http://update.libreoffice.org/check.php diff --git a/officecfg/registry/data/org/openoffice/Setup.xcu b/officecfg/registry/data/org/openoffice/Setup.xcu index fc7affa..c446099 100644 --- a/officecfg/registry/data/org/openoffice/Setup.xcu +++ b/officecfg/registry/data/org/openoffice/Setup.xcu @@ -37,6 +37,9 @@ <prop oor:name="ooSetupVersionAboutBox"> <value>${ABOUTBOXPRODUCTVERSION}</value> </prop> + <prop oor:name="ooSetupVersionAboutBoxSuffix"> + <value>${ABOUTBOXPRODUCTVERSIONSUFFIX}</value> + </prop> <prop oor:name="ooVendor"> <value>${OOOVENDOR}</value> </prop> diff --git a/officecfg/registry/schema/org/openoffice/Setup.xcs b/officecfg/registry/schema/org/openoffice/Setup.xcs index 62d3fdc..f6ac667 100644 --- a/officecfg/registry/schema/org/openoffice/Setup.xcs +++ b/officecfg/registry/schema/org/openoffice/Setup.xcs @@ -267,6 +267,13 @@ </info> <value/> </prop> + <prop oor:name="ooSetupVersionAboutBoxSuffix" oor:type="xs:string"> + <info> + <author>PMLADEK</author> + <desc>Specifies the version suffix (beta1, rc2) of the product that appears only on the about box.</desc> + </info> + <value/> + </prop> <prop oor:name="ooVendor" oor:type="xs:string"> <info> <author>IHI</author> diff --git a/solenv/bin/modules/installer/download.pm b/solenv/bin/modules/installer/download.pm index 5f186b7..bc6ac27 100644 --- a/solenv/bin/modules/installer/download.pm +++ b/solenv/bin/modules/installer/download.pm @@ -425,6 +425,7 @@ sub get_download_version $version = $allvariables->{'PRODUCTVERSION'}; if (( $allvariables->{'ABOUTBOXPRODUCTVERSION'} ) && ( $allvariables->{'ABOUTBOXPRODUCTVERSION'} ne "" )) { $version = $allvariables->{'ABOUTBOXPRODUCTVERSION'}; } + if (( $allvariables->{'ABOUTBOXPRODUCTVERSIONSUFFIX'} ) && ( $allvariables->{'ABOUTBOXPRODUCTVERSIONSUFFIX'} ne "" )) { $version = $allvariables->{'ABOUTBOXPRODUCTVERSIONSUFFIX'}; } if (( $allvariables->{'SHORT_PRODUCTEXTENSION'} ) && ( $allvariables->{'SHORT_PRODUCTEXTENSION'} ne "" )) { $version = $version . $allvariables->{'SHORT_PRODUCTEXTENSION'}; } return $version; diff --git a/unotools/inc/unotools/configmgr.hxx b/unotools/inc/unotools/configmgr.hxx index 1ac1868..56a216a 100644 --- a/unotools/inc/unotools/configmgr.hxx +++ b/unotools/inc/unotools/configmgr.hxx @@ -50,6 +50,8 @@ class UNOTOOLS_DLLPUBLIC ConfigManager: private boost::noncopyable { public: static rtl::OUString getAboutBoxProductVersion(); + static rtl::OUString getAboutBoxProductVersionSuffix(); + static rtl::OUString getDefaultCurrency(); static rtl::OUString getLocale(); diff --git a/unotools/source/config/configmgr.cxx b/unotools/source/config/configmgr.cxx index 553e15a..f761c5f 100644 --- a/unotools/source/config/configmgr.cxx +++ b/unotools/source/config/configmgr.cxx @@ -114,6 +114,13 @@ rtl::OUString utl::ConfigManager::getAboutBoxProductVersion() { RTL_CONSTASCII_USTRINGPARAM("Product/ooSetupVersionAboutBox"))); } +rtl::OUString utl::ConfigManager::getAboutBoxProductVersionSuffix() { + return getConfigurationString( + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Setup")), + rtl::OUString( + RTL_CONSTASCII_USTRINGPARAM("Product/ooSetupVersionAboutBoxSuffix"))); +} + rtl::OUString utl::ConfigManager::getDefaultCurrency() { return getConfigurationString( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Setup")), _______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits