diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2007-04-02 11:22:43 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2007-04-02 11:22:43 +0000 |
| commit | 6a619c43f6072f1e20be87fb811442faa4eebfe2 (patch) | |
| tree | 1f1811ae0c8b2898673cd03ca16a24e08a0269b4 /solenv | |
| parent | 2c9b7ad439a4bd2b4ea42ac8488dfd7f252f6e9d (diff) | |
INTEGRATION: CWS native80 (1.8.602); FILE MERGED
2007/03/07 07:27:38 dv 1.8.602.1: #i74342# Added ProcessorArchitecture for builds with new compiler, because MsiAssemblyName table and assembly manifest must match for proper deinstall
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/bin/modules/installer/windows/assembly.pm | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/solenv/bin/modules/installer/windows/assembly.pm b/solenv/bin/modules/installer/windows/assembly.pm index c04c630c9158..24bbb84f39d0 100644 --- a/solenv/bin/modules/installer/windows/assembly.pm +++ b/solenv/bin/modules/installer/windows/assembly.pm @@ -4,9 +4,9 @@ # # $RCSfile: assembly.pm,v $ # -# $Revision: 1.8 $ +# $Revision: 1.9 $ # -# last change: $Author: rt $ $Date: 2005-09-08 09:13:54 $ +# last change: $Author: rt $ $Date: 2007-04-02 12:22:43 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -298,6 +298,12 @@ sub create_msiassemblyname_table $oneline = $component . "\t" . "culture" . "\t" . $onefile->{'Culture'} . "\n"; push(@msiassemblynametable, $oneline); } + + if ( $onefile->{'ProcessorArchitecture'} ) + { + $oneline = $component . "\t" . "processorArchitecture" . "\t" . $onefile->{'ProcessorArchitecture'} . "\n"; + push(@msiassemblynametable, $oneline); + } } # Saving the file |