CWS-TOOLING: integrate CWS native206_DEV300

instsetoo_native/inc_ooolangpack/windows/msi_templates/InstallE.idt

@@ -54,7 +54,7 @@ SameProductFound	SAMEPRODUCTS	120
 ScheduleReboot	ISSCHEDULEREBOOT	3125
 SelfRegModules		2850
 SelfUnregModules		1100
-SetARPInstallLocation	Not Installed	990
+SetARPInstallLocation		990
 SetOfficeInstallLocation	Not Installed	575
 SetBasisInstallLocation	Not Installed	576
 SetUreInstallLocation	Not Installed	577

instsetoo_native/inc_openoffice/windows/msi_templates/AppSearc.idt

@@ -7,3 +7,11 @@ BASISUNINSTALLLOCATION	basisuninstalluser
 BASISUNINSTALLLOCATION	basisuninstallmachine
 OFFICEUNINSTALLLOCATION	officeuninstalluser
 OFFICEUNINSTALLLOCATION	officeuninstallmachine
+UREINSTALLLOCATION	ureuninstalluser
+UREINSTALLLOCATION	ureuninstallmachine
+BASISINSTALLLOCATION	basisuninstalluser
+BASISINSTALLLOCATION	basisuninstallmachine
+OFFICEINSTALLLOCATION	officeuninstalluser
+OFFICEINSTALLLOCATION	officeuninstallmachine
+INSTALLLOCATION	installuser
+INSTALLLOCATION	installmachine

instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt

@@ -86,7 +86,7 @@ SameProductFound	SAMEPRODUCTS	120
 ScheduleReboot	ISSCHEDULEREBOOT	3125
 SelfRegModules		2850
 SelfUnregModules		1100
-SetARPInstallLocation	Not Installed	990
+SetARPInstallLocation		990
 SetOfficeInstallLocation	Not Installed	575
 SetBasisInstallLocation	Not Installed	576
 SetUreInstallLocation	Not Installed	577

instsetoo_native/inc_openoffice/windows/msi_templates/RegLocat.idt

@@ -7,3 +7,5 @@ basisuninstalluser	1	Software\OpenOffice.org\LAYERNAMETEMPLATE\[DEFINEDPRODUCT]\
 basisuninstallmachine	2	Software\OpenOffice.org\LAYERNAMETEMPLATE\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION]	BASISINSTALLLOCATION	2
 officeuninstalluser	1	Software\OpenOffice.org\LAYERNAMETEMPLATE\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION]	OFFICEINSTALLLOCATION	2
 officeuninstallmachine	2	Software\OpenOffice.org\LAYERNAMETEMPLATE\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION]	OFFICEINSTALLLOCATION	2
+installuser	1	Software\OpenOffice.org\LAYERNAMETEMPLATE\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION]	INSTALLLOCATION	2
+installmachine	2	Software\OpenOffice.org\LAYERNAMETEMPLATE\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION]	INSTALLLOCATION	2

instsetoo_native/inc_sdkoo/windows/msi_templates/InstallE.idt

@@ -53,7 +53,7 @@ RMCCPSearch	Not CCP_SUCCESS And CCP_TEST	250
 ScheduleReboot	ISSCHEDULEREBOOT	3125
 SelfRegModules		2850
 SelfUnregModules		1100
-SetARPInstallLocation	Not Installed	990
+SetARPInstallLocation		990
 SetODBCFolders		550
 StartServices	VersionNT	2800
 StopServices	VersionNT	950

solenv/bin/modules/installer/windows/msp.pm

@@ -533,6 +533,9 @@ sub change_patchmetadata_table
     my $windowspatchlevel = 0;
     if ( $allvariables->{'WINDOWSPATCHLEVEL'} ) { $windowspatchlevel = $allvariables->{'WINDOWSPATCHLEVEL'}; }
 
+    my $displayaddon = "";
+    if ( $allvariables->{'PATCHDISPLAYADDON'} ) { $displayaddon = $allvariables->{'PATCHDISPLAYADDON'}; }
+
     if (( $allvariables->{'SERVICEPACK'} ) && ( $allvariables->{'SERVICEPACK'} == 1 ))
     {
         $displaynamevalue = $base . " Product Update " . $windowspatchlevel;
@@ -540,8 +543,8 @@ sub change_patchmetadata_table
     }
     else
     {
-        $displaynamevalue = $base . " Hotfix " . " Build: " . $installer::globals::buildid;
-        $descriptionvalue = $base . " Hotfix " . " Build: " . $installer::globals::buildid;
+        $displaynamevalue = $base . " Hotfix " . $displayaddon . " Build: " . $installer::globals::buildid;
+        $descriptionvalue = $base . " Hotfix " . $displayaddon . " Build: " . $installer::globals::buildid;
     }
 
     for ( my $i = 0; $i <= $#{$filecontent}; $i++ )
@@ -718,6 +721,8 @@ sub get_patchsequence
     if ( $allvariables->{'VENDORPATCHVERSION'} ) { $vendornumber = $allvariables->{'VENDORPATCHVERSION'}; }
     $patchsequence = $packageversion . "\." . $installer::globals::buildid . "\." . $vendornumber;
 
+    if ( $allvariables->{'PATCHSEQUENCE'} ) { $patchsequence = $allvariables->{'PATCHSEQUENCE'}; }
+
     return $patchsequence;
 }