[Libreoffice-commits] .: Branch 'libreoffice-3-4' - scp2/source solenv/bin

[Tor Lillqvist]

 scp2/source/ooo/common_brand.scp            |   18 ++++++++++++++++++
 solenv/bin/modules/installer/scriptitems.pm |    2 ++
 2 files changed, 20 insertions(+)

New commits:
commit bd88391398f8305faaac7a9e636b33b58b3fd374
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Tue Apr 5 17:41:07 2011 +0300

    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.

diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 3bf0366..5f34ebc 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -1197,6 +1197,24 @@ ProfileItem gid_Brand_Profileitem_Version_Useragent
     Value = "<PRODUCT> (${buildid}; ${_OS}; ${_ARCH}; BundledLanguages=${AllLanguages})";
 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
     ProfileID = gid_Brand_Profile_Version_Ini;
     ModuleID = gid_Module_Root_Brand;
diff --git a/solenv/bin/modules/installer/scriptitems.pm b/solenv/bin/modules/installer/scriptitems.pm
index 81b94ed..346a039 100644
--- a/solenv/bin/modules/installer/scriptitems.pm
+++ b/solenv/bin/modules/installer/scriptitems.pm
@@ -829,6 +829,8 @@ sub replace_setup_variables
         $value =~ s/\<sourceid\>/$installer::globals::build/;
         $value =~ s/\<updateid\>/$updateid/;
         $value =~ s/\<pkgformat\>/$installer::globals::packageformat/;
+        $value =~ s/\<vendor\>/$ENV{'OOO_VENDOR'}/;
+        $value =~ s/\<buildversion\>/$ENV{'BUILD_VER_STRING'}/;
 
         $oneitem->{'Value'} = $value;
     }