[Libreoffice-commits] core.git: android/Bootstrap instsetoo_native/CustomTarget_setup.mk ios/CustomTarget_LibreOffice_app.mk ios/CustomTarget_MobileLibreOffice_app.mk ios/CustomTarget_TiledLibreOffice_app.mk scp2/source solenv/bin

[Stephan Bergmann]

 android/Bootstrap/Makefile.shared           |    2 --
 instsetoo_native/CustomTarget_setup.mk      |    2 --
 ios/CustomTarget_LibreOffice_app.mk         |    2 --
 ios/CustomTarget_MobileLibreOffice_app.mk   |    4 +---
 ios/CustomTarget_TiledLibreOffice_app.mk    |    4 +---
 scp2/source/ooo/common_brand.scp            |   18 ------------------
 solenv/bin/modules/installer/scriptitems.pm |    2 --
 7 files changed, 2 insertions(+), 32 deletions(-)

New commits:
commit d90d47e513f21b07095722559db997fa41d1645e
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Nov 26 10:51:42 2014 +0100

    version ini-file's ProductMajor/Minor are unused
    
    ...and had started to have different values in instdir (ProductMajor=450, ProductMinor=0)
    vs. installation sets (ProductMajor=50, ProductMinor=)
    
    Change-Id: I4db2c07b5f7b011218833fc355a3097eb13d0cd4

diff --git a/android/Bootstrap/Makefile.shared b/android/Bootstrap/Makefile.shared
index a3b8ade..8169f20 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 f3ecebd..01d2f9c 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 719ff09..555c98b 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 2e4b6db..215fb5a 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 98cc8cc..62f4456 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 e331f6c..a6075e7 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 4c384ce..7fdb654 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/;