diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2017-03-16 23:22:36 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2017-03-20 13:07:53 +0000 |
| commit | 545ad8320643fa3d000f7eab3938d0576304630b (patch) | |
| tree | 5bf6184569ae7386401aa63384d3a7182df9f118 | |
| parent | e503a69e962bf1b39104e3df91b452702a62aa0e (diff) | |
Fix version number in scp2-generated version ini-file UpdateID variable
USERDIRPRODUCTVERSION is stuck at 4 now (as its main use is for the version
number of the UserInstallation directory), so use LIBO_VERSION_MAJOR instead
(like generation of the version ini-file counterpart for instdir/ does in
instsetoo_native/CustomTarget_setup.mk).
Change-Id: Ib87536d335487383940cff2f69c864a33f05bbee
Reviewed-on: https://gerrit.libreoffice.org/35301
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
| -rw-r--r-- | instsetoo_native/util/openoffice.lst.in | 1 | ||||
| -rw-r--r-- | solenv/bin/modules/installer/scriptitems.pm | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/instsetoo_native/util/openoffice.lst.in b/instsetoo_native/util/openoffice.lst.in index 6673b5d53ad7..06bd10a2004e 100644 --- a/instsetoo_native/util/openoffice.lst.in +++ b/instsetoo_native/util/openoffice.lst.in @@ -4,6 +4,7 @@ Globals { variables { + LIBO_VERSION_MAJOR @LIBO_VERSION_MAJOR@ UREPACKAGEVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@.@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@ URELAYERVERSION 1 REFERENCEOOOMAJORMINOR 4.1 diff --git a/solenv/bin/modules/installer/scriptitems.pm b/solenv/bin/modules/installer/scriptitems.pm index 1b8922dfa21c..58ca3fe7c5af 100644 --- a/solenv/bin/modules/installer/scriptitems.pm +++ b/solenv/bin/modules/installer/scriptitems.pm @@ -632,8 +632,8 @@ sub replace_setup_variables my $productname = $hashref->{'PRODUCTNAME'}; my $productversion = $hashref->{'PRODUCTVERSION'}; - my $userdirproductversion = ""; - if ( $hashref->{'USERDIRPRODUCTVERSION'} ) { $userdirproductversion = $hashref->{'USERDIRPRODUCTVERSION'}; } + my $libo_version_major = ""; + if ( $hashref->{'LIBO_VERSION_MAJOR'} ) { $libo_version_major = $hashref->{'LIBO_VERSION_MAJOR'}; } my $productkey = $productname . " " . $productversion; # string $buildid, which is used to replace the setup variable <buildid> @@ -653,7 +653,7 @@ sub replace_setup_variables if ( $localminor =~ /^\s*\w(\d+)\w*\s*$/ ) { $localminor = $1; } - my $updateid = $productname . "_" . $userdirproductversion . "_" . $$languagestringref; + my $updateid = $productname . "_" . $libo_version_major . "_" . $$languagestringref; $updateid =~ s/ /_/g; for ( my $i = 0; $i <= $#{$itemsarrayref}; $i++ ) |