kill VERSION_INDEPENDENT_COMP_ID

Version independent ComponentID in Component table of MSI means
that the GUID is calculated from the Component name only, the
PRODUCTVERSION is not concatenated to the name. Providing that
name is constant in all versions, the resulting GUID would be
the same e.g. for 4.0, 4.1, 4.2 etc. But what is it good for?
Faster upgrades maybe? But name can also change, we did not
pay attention to keep it constant. So in order to help scp2
cleanup, VERSION_INDEPENDENT_COMP_ID flag was obsoleted and
removed.

Change-Id: I8e1ee450524b02f07d0b0553f6b82d0321dbddcf

7 files changed, 37 insertions, 51 deletions

diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc
index 10805403c586..deb4c3111427 100755
--- a/scp2/inc/macros.inc
+++ b/scp2/inc/macros.inc
@@ -494,7 +494,7 @@ End
         LIB_FILE_BODY; \
         Dir = SCP2_URE_DL_DIR; \
         Name = name; \
-        Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); \
+        Styles = (PACKED); \
     End
 
 #define URE_EXECUTABLE(id,name) \
@@ -502,7 +502,7 @@ End
         BIN_FILE_BODY; \
         Dir = GID_DIR_URE_BIN; \
         Name = name; \
-        Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); \
+        Styles = (PACKED); \
     End
 
 #define LIBO_EXECUTABLE(id,name) \
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index b5ff16688086..45d23513bc67 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -436,13 +436,13 @@ File gid_File_Moz_Msvcp80
     LIB_FILE_BODY;
     Dir = SCP2_OOO_BIN_DIR;
     Name = SCP2_URE_DL_NORMAL("msvcp80");
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
+    Styles = (PACKED);
 End
 File gid_File_Moz_Msvcr80
     LIB_FILE_BODY;
     Dir = SCP2_OOO_BIN_DIR;
     Name = SCP2_URE_DL_NORMAL("msvcr80");
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
+    Styles = (PACKED);
 End
 File gid_File_Moz_Msvc80crt_Manifest
     BIN_FILE_BODY;
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index 9fc674ba0226..928cd0cc6b68 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -26,7 +26,7 @@ Unixlink gid_Unixlink_File_Lib_Curl
     BIN_FILE_BODY;
     Dir = SCP2_OOO_BIN_DIR;
     Name = STRING(CONCAT2(libcurl,UNXSUFFIX));
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
+    Styles = (PACKED);
     Target = STRING(CONCAT3(libcurl,UNXSUFFIX,.3));
 End
 #endif
@@ -35,7 +35,7 @@ Unixlink gid_Unixlink_File_Lib_Raptor
     BIN_FILE_BODY;
     Dir = SCP2_OOO_BIN_DIR;
     Name = STRING(CONCAT2(libraptor,UNXSUFFIX));
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
+    Styles = (PACKED);
     Target = STRING(CONCAT3(libraptor,UNXSUFFIX,.1));
 End
 
@@ -43,7 +43,7 @@ Unixlink gid_Unixlink_File_Lib_Rasqal
     BIN_FILE_BODY;
     Dir = SCP2_OOO_BIN_DIR;
     Name = STRING(CONCAT2(librasqal,UNXSUFFIX));
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
+    Styles = (PACKED);
     Target = STRING(CONCAT3(librasqal,UNXSUFFIX,.1));
 End
 
@@ -51,7 +51,7 @@ Unixlink gid_Unixlink_File_Lib_Rdf
     BIN_FILE_BODY;
     Dir = SCP2_OOO_BIN_DIR;
     Name = STRING(CONCAT2(librdf,UNXSUFFIX));
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
+    Styles = (PACKED);
     Target = STRING(CONCAT3(librdf,UNXSUFFIX,.0));
 End
 #endif
@@ -60,14 +60,14 @@ Unixlink gid_Unixlink_File_Lib_Xslt
     BIN_FILE_BODY;
     Dir = SCP2_OOO_BIN_DIR;
     Name = STRING(CONCAT2(libxslt,UNXSUFFIX));
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
+    Styles = (PACKED);
     Target = STRING(CONCAT3(libxslt,UNXSUFFIX,.1));
 End
 Unixlink gid_Unixlink_File_Lib_eXslt
     BIN_FILE_BODY;
     Dir = SCP2_OOO_BIN_DIR;
     Name = STRING(CONCAT2(libexslt,UNXSUFFIX));
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
+    Styles = (PACKED);
     Target = STRING(CONCAT3(libexslt,UNXSUFFIX,.0));
 End
 #endif
diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp
index 425b4874e354..67dab4ef51c5 100644
--- a/scp2/source/ooo/ure.scp
+++ b/scp2/source/ooo/ure.scp
@@ -98,7 +98,7 @@ File gid_File_Dl_Cppu
     LIB_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
     Name = SCP2_URE_DL_UNO_VER("cppu", "3");
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
+    Styles = (PACKED);
 End
 
 #ifdef AIX
@@ -106,7 +106,7 @@ Unixlink gid_Unixlink_File_Dl_Cppu
     BIN_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
     Name = SCP2_URE_DL_UNO_NORMAL("cppu");
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
+    Styles = (PACKED);
     Target = SCP2_URE_DL_UNO_VER("cppu", "3");
 End
 #endif
@@ -115,7 +115,7 @@ File gid_File_Dl_Cppuhelper
     LIB_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
     Name = SCP2_URE_DL_UNO_COMID_VER("cppuhelper", "3");
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
+    Styles = (PACKED);
 End
 
 #ifdef AIX
@@ -123,7 +123,7 @@ Unixlink gid_Unixlink_File_Dl_Cppuhelper
     BIN_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
     Name = SCP2_URE_DL_UNO_COMID_NORMAL("cppuhelper");
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
+    Styles = (PACKED);
     Target = SCP2_URE_DL_UNO_COMID_VER("cppuhelper", "3");
 End
 #endif
@@ -132,7 +132,7 @@ File gid_File_Dl_PurpEnvHelper
     LIB_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
     Name = SCP2_URE_DL_UNO_COMID_VER("purpenvhelper", "3");
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
+    Styles = (PACKED);
 End
 
 #ifdef AIX
@@ -140,7 +140,7 @@ Unixlink gid_Unixlink_File_Dl_PurpEnvHelper
     BIN_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
     Name = SCP2_URE_DL_UNO_COMID_NORMAL("purpenvhelper");
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
+    Styles = (PACKED);
     Target = SCP2_URE_DL_UNO_COMID_VER("purpenvhelper", "3");
 End
 #endif
@@ -149,7 +149,7 @@ File gid_File_Dl_Sal
     LIB_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
     Name = SCP2_URE_DL_UNO_VER("sal", "3");
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
+    Styles = (PACKED);
 End
 
 #ifdef AIX
@@ -157,7 +157,7 @@ Unixlink gid_Unixlink_File_Dl_Sal
     BIN_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
     Name = SCP2_URE_DL_UNO_NORMAL("sal");
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
+    Styles = (PACKED);
     Target = SCP2_URE_DL_UNO_VER("sal", "3");
 End
 #endif
@@ -166,7 +166,7 @@ File gid_File_Dl_Salhelper
     LIB_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
     Name = SCP2_URE_DL_UNO_COMID_VER("salhelper", "3");
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
+    Styles = (PACKED);
 End
 
 #ifdef AIX
@@ -174,7 +174,7 @@ Unixlink gid_Unixlink_File_Dl_Salhelper
     BIN_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
     Name = SCP2_URE_DL_UNO_COMID_NORMAL("salhelper");
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
+    Styles = (PACKED);
     Target = SCP2_URE_DL_UNO_COMID_VER("salhelper", "3");
 End
 #endif
@@ -268,7 +268,7 @@ End
 File gid_File_ure_install
     Dir = FILELIST_DIR;
     Name = "ure_install.filelist";
-    Styles = (FILELIST, USE_INTERNAL_RIGHTS, PACKED, VERSION_INDEPENDENT_COMP_ID);
+    Styles = (FILELIST, USE_INTERNAL_RIGHTS, PACKED);
 End
 
 
@@ -277,7 +277,7 @@ File gid_File_Dl_JrepropertiesClass
     TXT_FILE_BODY;
     Dir = FILELIST_DIR;
     Name = "jvmfwk_jreproperties.filelist";
-    Styles = (FILELIST, PACKED, VERSION_INDEPENDENT_COMP_ID);
+    Styles = (FILELIST, PACKED);
 End
 #endif
 
@@ -297,7 +297,7 @@ File gid_File_Dl_Cli_Uno
     LIB_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
     Name = SCP2_URE_DL_NORMAL("cli_uno");
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
+    Styles = (PACKED);
 
 End
 
@@ -444,7 +444,7 @@ File gid_File_Dl_Jpipe
     LIB_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
     Name = SCP2_URE_JDL_NORMAL("jpipe");
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
+    Styles = (PACKED);
 End
 #endif
 
@@ -472,7 +472,7 @@ File gid_File_Dl_Libxml2
 #else
     Name = SCP2_URE_DL_VER("xml2", "2");
 #endif
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
+    Styles = (PACKED);
 End
 #endif
 
@@ -481,7 +481,7 @@ Unixlink gid_Unixlink_File_Dl_Libxml2
     BIN_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
     Name = SCP2_URE_DL_NORMAL("xml2");
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
+    Styles = (PACKED);
     Target = SCP2_URE_DL_VER("xml2", "2");
 End
 #endif
@@ -494,7 +494,7 @@ File gid_File_Lib_Mingw_GccS_Ure
     LIB_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
     Name = MINGW_GCCDLL;
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
+    Styles = (PACKED);
 End
 
 #endif
@@ -505,7 +505,7 @@ File gid_File_Lib_Mingw_Stdcpp_Ure
     LIB_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
     Name = MINGW_GXXDLL;
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
+    Styles = (PACKED);
 End
 
 #endif
@@ -519,7 +519,7 @@ File gid_File_Java_UnoloaderJar
     TXT_FILE_BODY;
     Dir = GID_DIR_URE_JAVA;
     Name = "unoloader.jar";
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
+    Styles = (PACKED);
 End
 #endif
 
@@ -528,7 +528,7 @@ File gid_File_Java_JuhJar
     TXT_FILE_BODY;
     Dir = GID_DIR_URE_JAVA;
     Name = "juh.jar";
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
+    Styles = (PACKED);
 End
 #endif
 
@@ -537,7 +537,7 @@ File gid_File_Java_JurtJar
     TXT_FILE_BODY;
     Dir = GID_DIR_URE_JAVA;
     Name = "jurt.jar";
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
+    Styles = (PACKED);
 End
 #endif
 
@@ -546,7 +546,7 @@ File gid_File_Java_RidlJar
     TXT_FILE_BODY;
     Dir = GID_DIR_URE_JAVA;
     Name = "ridl.jar";
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
+    Styles = (PACKED);
 End
 #endif
 
@@ -557,7 +557,7 @@ File gid_File_Java_JavaUnoJar
     TXT_FILE_BODY;
     Dir = GID_DIR_URE_JAVA;
     Name = "java_uno.jar";
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
+    Styles = (PACKED);
 End
 #endif
 
@@ -568,7 +568,7 @@ File gid_File_Misc_TypesRdb
     Dir = GID_DIR_URE_SHARE_MISC;
     Name = "udkapi.rdb";
     InstallName = "types.rdb";
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID, SUBST_FILENAME);
+    Styles = (PACKED, SUBST_FILENAME);
 End
 
 File gid_File_Misc_ServicesRdb
@@ -585,7 +585,7 @@ File gid_File_Misc_JavavendorsXml
     TXT_FILE_BODY;
     Dir = FILELIST_DIR;
     Name = "jvmfwk_javavendors.filelist";
-    Styles = (FILELIST, PACKED, VERSION_INDEPENDENT_COMP_ID);
+    Styles = (FILELIST, PACKED);
 End
 #endif
 
diff --git a/solenv/bin/modules/installer/globals.pm b/solenv/bin/modules/installer/globals.pm
index 2940407c0b81..f6bc9fcd6ceb 100644
--- a/solenv/bin/modules/installer/globals.pm
+++ b/solenv/bin/modules/installer/globals.pm
@@ -264,7 +264,6 @@ BEGIN
     %dontdeletecomponents = ();
     %allcalculated_guids = ();
     %calculated_component_guids = ();
-    %base_independent_components = ();
     %all_english_languagestrings = ();
     %all_required_english_languagestrings = ();
 
diff --git a/solenv/bin/modules/installer/windows/file.pm b/solenv/bin/modules/installer/windows/file.pm
index 2bf02fc9ba5b..93f7cc52e624 100644
--- a/solenv/bin/modules/installer/windows/file.pm
+++ b/solenv/bin/modules/installer/windows/file.pm
@@ -917,13 +917,6 @@ sub create_files_table
         # Collecting also all tree conditions for multilayer products
         get_tree_condition_for_component($onefile, $file{'Component_'});
 
-        # Collecting all component names, that have flag VERSION_INDEPENDENT_COMP_ID
-        # This should be all components with constant API, for example URE
-        if ( $styles =~ /\bVERSION_INDEPENDENT_COMP_ID\b/ )
-        {
-            $installer::globals::base_independent_components{$onefile->{'componentname'}} = 1;
-        }
-
         unless ( $file{'Version'} )
         {
             my $path = $onefile->{'sourcepath'};
diff --git a/solenv/bin/modules/installer/windows/msiglobal.pm b/solenv/bin/modules/installer/windows/msiglobal.pm
index 7a7a121b8de0..705e5757d090 100644
--- a/solenv/bin/modules/installer/windows/msiglobal.pm
+++ b/solenv/bin/modules/installer/windows/msiglobal.pm
@@ -1014,15 +1014,9 @@ sub set_uuid_into_component_table
             else
             {
                 # Calculating new GUID with the help of the component name.
-                my $useproductversion = 1;
-                if ( exists($installer::globals::base_independent_components{$componentname})) { $useproductversion = 0; }
-                my $sourcestring = $componentname;
 
-                if ( $useproductversion )
-                {
-                    if ( ! exists($allvariables->{'PRODUCTVERSION'}) ) { installer::exiter::exit_program("ERROR: Could not find variable \"PRODUCTVERSION\" (required value for GUID creation)!", "set_uuid_into_component_table"); }
-                    $sourcestring = $sourcestring . "_" . $allvariables->{'PRODUCTVERSION'};
-                }
+                if ( ! exists($allvariables->{'PRODUCTVERSION'}) ) { installer::exiter::exit_program("ERROR: Could not find variable \"PRODUCTVERSION\" (required value for GUID creation)!", "set_uuid_into_component_table"); }
+                my $sourcestring = $componentname . "_" . $allvariables->{'PRODUCTVERSION'};
                 $uuid = calculate_guid($sourcestring);
                 $counter++;