strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

DEV300: merge 000330 till r. b727f1beb700

Browse source
This commit is contained in:
Vladimir Glazunov 2010-08-25 15:47:38 +02:00
commit b63a5a9e8e
2 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
scp2/source/ooo/windowscustomaction_ooo.scp
View file

@ -401,6 +401,16 @@ WindowsCustomAction gid_Customaction_MigrateInstallPath
Assignment2 = ("InstallUISequence", "Not REMOVE=\"ALL\" And Not PATCH", "CostInitialize");
End
WindowsCustomAction gid_Customaction_CompleteInstallPath
Name = "CompleteInstallPath";
Typ = "321";
Source = "shlxtmsi.dll";
Target = "CompleteInstallPath";
Inbinarytable = 1;
Assignment1 = ("InstallExecuteSequence", "Not REMOVE=\"ALL\" And Not PATCH", "MigrateInstallPath");
Assignment2 = ("InstallUISequence", "Not REMOVE=\"ALL\" And Not PATCH", "MigrateInstallPath");
End
WindowsCustomAction gid_Customaction_CheckVersions
Name = "CheckVersions";
Typ = "321";

5
solenv/bin/modules/installer/windows/property.pm
View file

@ -316,6 +316,11 @@ sub set_important_properties
{
my $onepropertyline = "OFFICEDIRHOSTNAME" . "\t" . $installer::globals::officedirhostname . "\n";
push(@{$propertyfile}, $onepropertyline);
my $localofficedirhostname = $installer::globals::officedirhostname;
$localofficedirhostname =~ s/\//\\/g;
$onepropertyline = "OFFICEDIRHOSTNAME_" . "\t" . $localofficedirhostname . "\n";
push(@{$propertyfile}, $onepropertyline);
}
if ( $installer::globals::sundirhostname )