diff options
| -rw-r--r-- | android/Bootstrap/Makefile.shared | 2 | ||||
| -rw-r--r-- | instsetoo_native/CustomTarget_setup.mk | 2 | ||||
| -rw-r--r-- | ios/CustomTarget_LibreOffice_app.mk | 2 | ||||
| -rw-r--r-- | ios/CustomTarget_MobileLibreOffice_app.mk | 4 | ||||
| -rw-r--r-- | ios/CustomTarget_TiledLibreOffice_app.mk | 4 | ||||
| -rw-r--r-- | scp2/source/ooo/common_brand.scp | 18 | ||||
| -rw-r--r-- | solenv/bin/modules/installer/scriptitems.pm | 2 |
7 files changed, 2 insertions, 32 deletions
diff --git a/android/Bootstrap/Makefile.shared b/android/Bootstrap/Makefile.shared index a3b8ade2c9a2..8169f209bef0 100644 --- a/android/Bootstrap/Makefile.shared +++ b/android/Bootstrap/Makefile.shared @@ -178,8 +178,6 @@ copy-stuff: echo 'AllLanguages=en-US' >> assets/program/versionrc echo 'BuildVersion=' >> assets/program/versionrc echo 'buildid=dead-beef' >> assets/program/versionrc - echo 'ProductMajor=$(LIBO_VERSION_MAJOR)$(LIBO_VERSION_MINOR)0' >> assets/program/versionrc - echo 'ProductMinor=1' >> assets/program/versionrc echo 'ReferenceOOoMajorMinor=4.1' >> assets/program/versionrc # # .res files diff --git a/instsetoo_native/CustomTarget_setup.mk b/instsetoo_native/CustomTarget_setup.mk index f3ecebd5634d..01d2f9c2c6e7 100644 --- a/instsetoo_native/CustomTarget_setup.mk +++ b/instsetoo_native/CustomTarget_setup.mk @@ -170,8 +170,6 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_ && echo 'BuildVersion=$(BUILD_VER_STRING)' \ && echo 'buildid=$(shell cd $(SRCDIR) && git log -1 --format=%H)' \ && echo 'ExtensionUpdateURL=http://updateexte.libreoffice.org/ExtensionUpdateService/check.Update' \ - && echo 'ProductMajor=$(LIBO_VERSION_MAJOR)$(LIBO_VERSION_MINOR)$(LIBO_VERSION_MICRO)' \ - && echo 'ProductMinor=$(LIBO_VERSION_PATCH)' \ && echo 'ReferenceOOoMajorMinor=4.1' \ && echo 'UpdateID=$(PRODUCTNAME)_$(LIBO_VERSION_MAJOR)_en-US' \ && echo 'UpdateURL=$(if $(ENABLE_ONLINE_UPDATE),http://update.libreoffice.org/check.php$(if $(filter-out WNT,$(OS)),?pkgfmt=$(PKGFORMAT)))' \ diff --git a/ios/CustomTarget_LibreOffice_app.mk b/ios/CustomTarget_LibreOffice_app.mk index 719ff0905bb7..555c98b5873c 100644 --- a/ios/CustomTarget_LibreOffice_app.mk +++ b/ios/CustomTarget_LibreOffice_app.mk @@ -123,8 +123,6 @@ $(SCRIPT_OUTPUT_FILE_0) : $(call gb_Executable_get_target,LibreOffice) echo 'AllLanguages=en-US' && \ echo 'BuildVersion=' && \ echo 'buildid=$(buildid)' && \ - echo 'ProductMajor=360' && \ - echo 'ProductMinor=1' && \ : ) > $(appdir)/program/versionrc # # Copy a sample document... good old test1.odt... diff --git a/ios/CustomTarget_MobileLibreOffice_app.mk b/ios/CustomTarget_MobileLibreOffice_app.mk index 2e4b6db484d5..215fb5a9e3e0 100644 --- a/ios/CustomTarget_MobileLibreOffice_app.mk +++ b/ios/CustomTarget_MobileLibreOffice_app.mk @@ -98,9 +98,7 @@ MobileLibreOffice_setup: echo '[Version]' > $$file; \ echo 'AllLanguages=en-US' >> $$file; \ echo 'BuildVersion=' >> $$file; \ - echo "buildid=$(BUILDID)" >> $$file; \ - echo 'ProductMajor=360' >> $$file; \ - echo 'ProductMinor=1' >> $$file; + echo "buildid=$(BUILDID)" >> $$file; #============================================================================== # Clean diff --git a/ios/CustomTarget_TiledLibreOffice_app.mk b/ios/CustomTarget_TiledLibreOffice_app.mk index 98cc8cca6d80..62f44567a964 100644 --- a/ios/CustomTarget_TiledLibreOffice_app.mk +++ b/ios/CustomTarget_TiledLibreOffice_app.mk @@ -111,9 +111,7 @@ TiledLibreOffice_setup: echo '[Version]' > $$file; \ echo 'AllLanguages=en-US' >> $$file; \ echo 'BuildVersion=' >> $$file; \ - echo "buildid=$(BUILDID)" >> $$file; \ - echo 'ProductMajor=360' >> $$file; \ - echo 'ProductMinor=1' >> $$file; + echo "buildid=$(BUILDID)" >> $$file; # Clean $(call gb_CustomTarget_get_clean_target,ios/TiledLibreOffice): diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp index e331f6c6ca2a..a6075e739082 100644 --- a/scp2/source/ooo/common_brand.scp +++ b/scp2/source/ooo/common_brand.scp @@ -882,24 +882,6 @@ End #endif -ProfileItem gid_Brand_Profileitem_Version_Productmajor - ProfileID = gid_Brand_Profile_Version_Ini; - ModuleID = gid_Module_Root_Brand; - Section = "Version"; - Order = 10; - Key = "ProductMajor"; - Value = "<productmajor>"; -End - -ProfileItem gid_Brand_Profileitem_Version_Productminor - ProfileID = gid_Brand_Profile_Version_Ini; - ModuleID = gid_Module_Root_Brand; - Section = "Version"; - Order = 11; - Key = "ProductMinor"; - Value = "<productminor>"; -End - ProfileItem gid_Brand_Profileitem_Version_Alllanguages 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 4c384ce53e3d..7fdb6540c34b 100644 --- a/solenv/bin/modules/installer/scriptitems.pm +++ b/solenv/bin/modules/installer/scriptitems.pm @@ -667,8 +667,6 @@ sub replace_setup_variables $value =~ s/\<productcode\>/$installer::globals::productcode/; $value =~ s/\<upgradecode\>/$installer::globals::upgradecode/; $value =~ s/\<alllanguages\>/$languagesstring/; - $value =~ s/\<productmajor\>/$localbuild/; - $value =~ s/\<productminor\>/$localminor/; $value =~ s/\<sourceid\>/$installer::globals::build/; $value =~ s/\<updateid\>/$updateid/; $value =~ s/\<pkgformat\>/$installer::globals::packageformat/; |