Kaydet (Commit) 2e705f35 authored tarafından Tor Lillqvist's avatar Tor Lillqvist

Add two new lines to .versionrc (version.ini on Windows)

"Vendor" with the value of OOO_VENDOR, and "BuildVersion" with the
value of BUILD_VER_STRING. These get their values from the
--with-vendor and --with-build-version switches of the configure
script.

From the build-identification.diff patch, has been part of distro
OOo/LO builds for long.
üst 3f05ea61
...@@ -1197,6 +1197,24 @@ ProfileItem gid_Brand_Profileitem_Version_Useragent ...@@ -1197,6 +1197,24 @@ ProfileItem gid_Brand_Profileitem_Version_Useragent
Value = "<PRODUCT> (${buildid}; ${_OS}; ${_ARCH}; BundledLanguages=${AllLanguages})"; Value = "<PRODUCT> (${buildid}; ${_OS}; ${_ARCH}; BundledLanguages=${AllLanguages})";
End End
ProfileItem gid_Brand_Profileitem_Version_Vendor
ProfileID = gid_Brand_Profile_Version_Ini;
ModuleID = gid_Module_Root_Brand;
Section = "Version";
Order = 16;
Key = "Vendor";
Value = "<vendor>";
End
ProfileItem gid_Brand_Profileitem_Version_BuildVersion
ProfileID = gid_Brand_Profile_Version_Ini;
ModuleID = gid_Module_Root_Brand;
Section = "Version";
Order = 17;
Key = "BuildVersion";
Value = "<buildversion>";
End
ProfileItem gid_Brand_Profileitem_Version_Ooobaseversion ProfileItem gid_Brand_Profileitem_Version_Ooobaseversion
ProfileID = gid_Brand_Profile_Version_Ini; ProfileID = gid_Brand_Profile_Version_Ini;
ModuleID = gid_Module_Root_Brand; ModuleID = gid_Module_Root_Brand;
......
...@@ -829,6 +829,8 @@ sub replace_setup_variables ...@@ -829,6 +829,8 @@ sub replace_setup_variables
$value =~ s/\<sourceid\>/$installer::globals::build/; $value =~ s/\<sourceid\>/$installer::globals::build/;
$value =~ s/\<updateid\>/$updateid/; $value =~ s/\<updateid\>/$updateid/;
$value =~ s/\<pkgformat\>/$installer::globals::packageformat/; $value =~ s/\<pkgformat\>/$installer::globals::packageformat/;
$value =~ s/\<vendor\>/$ENV{'OOO_VENDOR'}/;
$value =~ s/\<buildversion\>/$ENV{'BUILD_VER_STRING'}/;
$oneitem->{'Value'} = $value; $oneitem->{'Value'} = $value;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment