diff options
| -rw-r--r-- | instsetoo_native/CustomTarget_setup.mk | 2 | ||||
| -rw-r--r-- | instsetoo_native/util/openoffice.lst.in | 4 | ||||
| -rw-r--r-- | solenv/bin/modules/installer/scriptitems.pm | 5 |
3 files changed, 5 insertions, 6 deletions
diff --git a/instsetoo_native/CustomTarget_setup.mk b/instsetoo_native/CustomTarget_setup.mk index 2b9429c3c9f6..c8b975759008 100644 --- a/instsetoo_native/CustomTarget_setup.mk +++ b/instsetoo_native/CustomTarget_setup.mk @@ -41,7 +41,7 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_ && echo 'InstallMode=<installmode>' \ && echo 'ProductKey=$(PRODUCTNAME) $(PRODUCTVERSION)' \ $(if $(ENABLE_RELEASE_BUILD),\ - && echo 'UserInstallation=$$SYSUSERCONFIG/$(if $(filter-out MACOSX WNT,$(OS)),$(shell echo $(PRODUCTNAME) | tr "[:upper:]" "[:lower:]"),$(shell echo $(PRODUCTNAME) | sed -e 's/ /%20/g'))/4', \ + && echo 'UserInstallation=$$SYSUSERCONFIG/$(if $(filter-out MACOSX WNT,$(OS)),$(shell echo $(PRODUCTNAME) | tr "[:upper:]" "[:lower:]"),$(shell echo $(PRODUCTNAME) | sed -e 's/ /%20/g'))/$(LIBO_VERSION_MAJOR)', \ && echo 'UserInstallation=$$ORIGIN/..') \ ) > $@ diff --git a/instsetoo_native/util/openoffice.lst.in b/instsetoo_native/util/openoffice.lst.in index 5b2f4dc54bbb..25ea43ec0443 100644 --- a/instsetoo_native/util/openoffice.lst.in +++ b/instsetoo_native/util/openoffice.lst.in @@ -50,7 +50,7 @@ LibreOffice POSTVERSIONEXTENSION BUNDLEIDENTIFIER @MACOSX_BUNDLE_IDENTIFIER@ BRANDPACKAGEVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@ - USERDIRPRODUCTVERSION 4 + USERDIRPRODUCTVERSION @LIBO_VERSION_MAJOR@ ABOUTBOXPRODUCTVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@.@LIBO_VERSION_MICRO@@LIBO_VERSION_SUFFIX@ ABOUTBOXPRODUCTVERSIONSUFFIX @LIBO_VERSION_SUFFIX_SUFFIX@ BASEPRODUCTVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@ @@ -97,7 +97,7 @@ LibreOfficeDev POSTVERSIONEXTENSION BUNDLEIDENTIFIER @MACOSX_BUNDLE_IDENTIFIER@ BRANDPACKAGEVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@ - USERDIRPRODUCTVERSION 4 + USERDIRPRODUCTVERSION @LIBO_VERSION_MAJOR@ ABOUTBOXPRODUCTVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@.@LIBO_VERSION_MICRO@@LIBO_VERSION_SUFFIX@ ABOUTBOXPRODUCTVERSIONSUFFIX @LIBO_VERSION_SUFFIX_SUFFIX@ BASEPRODUCTVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@ diff --git a/solenv/bin/modules/installer/scriptitems.pm b/solenv/bin/modules/installer/scriptitems.pm index 5f8dfd698d5f..8f484192c77b 100644 --- a/solenv/bin/modules/installer/scriptitems.pm +++ b/solenv/bin/modules/installer/scriptitems.pm @@ -632,8 +632,7 @@ sub replace_setup_variables my $productname = $hashref->{'PRODUCTNAME'}; my $productversion = $hashref->{'PRODUCTVERSION'}; - my $userdirproductversion = ""; - if ( $hashref->{'USERDIRPRODUCTVERSION'} ) { $userdirproductversion = $hashref->{'USERDIRPRODUCTVERSION'}; } + my $productmajorversion = $hashref->{'LIBO_VERSION_MAJOR'}; my $productkey = $productname . " " . $productversion; # string $buildid, which is used to replace the setup variable <buildid> @@ -653,7 +652,7 @@ sub replace_setup_variables if ( $localminor =~ /^\s*\w(\d+)\w*\s*$/ ) { $localminor = $1; } - my $updateid = $productname . "_" . $userdirproductversion . "_" . $$languagestringref; + my $updateid = $productname . "_" . $productmajorversion . "_" . $$languagestringref; $updateid =~ s/ /_/g; for ( my $i = 0; $i <= $#{$itemsarrayref}; $i++ ) |