installer: remove SHORT_PRODUCTEXTENSION

Currently PRODUCTEXTENSION does not have a value, which is unfortunate
because some places such as the soffice --help output and
utl::DocInfoHelper::GetGeneratorString() which creates the
meta:generator for ODF files (via Setup.xcu Product/ooSetupExtension)
write an incomplete version number.

Since there doesn't appear to be a point in having 2 variables here,
remove SHORT_ one and use PRODUCTEXTENSION consistently.

(cherry picked from commit e024a8d88dbca3a2d178ad88c069721a92156ddf)

Conflicts:
	instsetoo_native/util/openoffice.lst

Change-Id: I5aac25bcedd785a098cba612643ea68fe19c77f0
Reviewed-on: https://gerrit.libreoffice.org/1762
Reviewed-by: Miklos Vajna <vmiklos@suse.cz>
Tested-by: Miklos Vajna <vmiklos@suse.cz>

3 files changed, 12 insertions, 28 deletions

diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst
index 81eb4dc77b7c..632ae200ef55 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -48,9 +48,7 @@ LibreOffice
         {
             PRODUCTNAME LibreOffice
             PRODUCTVERSION 4.0
-            PRODUCTEXTENSION
-            LONG_PRODUCTEXTENSION
-            SHORT_PRODUCTEXTENSION .0.1
+            PRODUCTEXTENSION .0.1
             POSTVERSIONEXTENSION
             POSTVERSIONEXTENSIONUNIX
             BRANDPACKAGEVERSION 4.0
@@ -100,9 +98,7 @@ LibreOffice_Dev
         {
             PRODUCTNAME LOdev
             PRODUCTVERSION 4.0
-            PRODUCTEXTENSION
-            LONG_PRODUCTEXTENSION
-            SHORT_PRODUCTEXTENSION .0.1
+            PRODUCTEXTENSION .0.1
             UNIXBASISROOTNAME lodev4.0
             POSTVERSIONEXTENSION
             POSTVERSIONEXTENSIONUNIX
@@ -163,10 +159,8 @@ URE
             PRODUCTVERSION 4.0
             PACKAGEVERSION 4.0.0.1
             PACKAGEREVISION 1
-            PRODUCTEXTENSION
+            PRODUCTEXTENSION .0.1
             BRANDPACKAGEVERSION 4.0
-            LONG_PRODUCTEXTENSION
-            SHORT_PRODUCTEXTENSION .0.1
             LICENSENAME LGPL
             NOVERSIONINDIRNAME 1
             PCPFILENAME ure.pcp
@@ -196,9 +190,7 @@ LibreOffice_SDK
         {
             PRODUCTNAME LibreOffice
             PRODUCTVERSION 4.0
-            PRODUCTEXTENSION
-            LONG_PRODUCTEXTENSION
-            SHORT_PRODUCTEXTENSION .0.1
+            PRODUCTEXTENSION .0.1
             POSTVERSIONEXTENSION SDK
             POSTVERSIONEXTENSIONUNIX sdk
             BRANDPACKAGEVERSION 4.0
@@ -237,9 +229,7 @@ LibreOffice_Dev_SDK
         {
             PRODUCTNAME LOdev
             PRODUCTVERSION 4.0
-            PRODUCTEXTENSION
-            LONG_PRODUCTEXTENSION
-            SHORT_PRODUCTEXTENSION .0.1
+            PRODUCTEXTENSION .0.1
             UNIXBASISROOTNAME lodev4.0
             POSTVERSIONEXTENSION SDK
             POSTVERSIONEXTENSIONUNIX sdk
@@ -284,9 +274,7 @@ LibreOffice_Test
         {
             PRODUCTNAME LibreOffice
             PRODUCTVERSION 4.0
-            PRODUCTEXTENSION
-            LONG_PRODUCTEXTENSION
-            SHORT_PRODUCTEXTENSION .0.1
+            PRODUCTEXTENSION .0.1
             POSTVERSIONEXTENSION TEST
             POSTVERSIONEXTENSIONUNIX test
             BRANDPACKAGEVERSION 4.0
@@ -325,9 +313,7 @@ LibreOffice_Dev_Test
         {
             PRODUCTNAME LOdev
             PRODUCTVERSION 4.0
-            PRODUCTEXTENSION
-            LONG_PRODUCTEXTENSION
-            SHORT_PRODUCTEXTENSION .0.1
+            PRODUCTEXTENSION .0.1
             UNIXBASISROOTNAME lodev4.0
             POSTVERSIONEXTENSION TEST
             POSTVERSIONEXTENSIONUNIX test
@@ -371,9 +357,7 @@ OxygenOffice
         {
             PRODUCTNAME OxygenOffice
             PRODUCTVERSION 4.0
-            PRODUCTEXTENSION
-            LONG_PRODUCTEXTENSION
-            SHORT_PRODUCTEXTENSION .0.1
+            PRODUCTEXTENSION .0.1
             POSTVERSIONEXTENSION
             POSTVERSIONEXTENSIONUNIX
             BRANDPACKAGEVERSION 4.0
diff --git a/solenv/bin/modules/installer/download.pm b/solenv/bin/modules/installer/download.pm
index 21bd62ff0b75..6d370ae6e81a 100644
--- a/solenv/bin/modules/installer/download.pm
+++ b/solenv/bin/modules/installer/download.pm
@@ -345,7 +345,7 @@ sub get_download_version
     my $version = "";
 
     $version = $allvariables->{'PRODUCTVERSION'};
-    if (( $allvariables->{'SHORT_PRODUCTEXTENSION'} ) && ( $allvariables->{'SHORT_PRODUCTEXTENSION'} ne "" )) { $version = $version . $allvariables->{'SHORT_PRODUCTEXTENSION'}; }
+    if (( $allvariables->{'PRODUCTEXTENSION'} ) && ( $allvariables->{'PRODUCTEXTENSION'} ne "" )) { $version = $version . $allvariables->{'PRODUCTEXTENSION'}; }
 
     return $version;
 }
@@ -586,7 +586,7 @@ sub resolve_variables_in_downloadname
     $downloadname =~ s/\{packageversion\}/$packageversion/;
 
     my $extension = "";
-    if ( $allvariables->{'SHORT_PRODUCTEXTENSION'} ) { $extension = $allvariables->{'SHORT_PRODUCTEXTENSION'}; }
+    if ( $allvariables->{'PRODUCTEXTENSION'} ) { $extension = $allvariables->{'PRODUCTEXTENSION'}; }
     $extension = lc($extension);
     $downloadname =~ s/\{extension\}/$extension/;
 
diff --git a/solenv/bin/modules/installer/ziplist.pm b/solenv/bin/modules/installer/ziplist.pm
index c9ba2388ae92..c052e722f8bb 100644
--- a/solenv/bin/modules/installer/ziplist.pm
+++ b/solenv/bin/modules/installer/ziplist.pm
@@ -843,9 +843,9 @@ sub add_variables_to_allvariableshashref
     my $lcvariable = lc($variableshashref->{'PRODUCTNAME'});
     $variableshashref->{'LCPRODUCTNAME'} = $lcvariable;
 
-    if ($variableshashref->{'SHORT_PRODUCTEXTENSION'})
+    if ($variableshashref->{'PRODUCTEXTENSION'})
     {
-        $variableshashref->{'LCPRODUCTEXTENSION'} = "\-" . lc($variableshashref->{'SHORT_PRODUCTEXTENSION'}); # including the "-" !
+        $variableshashref->{'LCPRODUCTEXTENSION'} = "\-" . lc($variableshashref->{'PRODUCTEXTENSION'}); # including the "-" !
     }
     else
     {