diff options
| author | Lars Langhans <lla@openoffice.org> | 2010-07-12 13:38:01 +0200 |
|---|---|---|
| committer | Lars Langhans <lla@openoffice.org> | 2010-07-12 13:38:01 +0200 |
| commit | edeaa54d94506191e9babc46b09540458949c4c4 (patch) | |
| tree | 5ea81bdde580675faebaff36abd095844467d791 /solenv/bin/modules/installer/simplepackage.pm | |
| parent | c6e2228a5f22f0ee9df3e25916a52b58682dc659 (diff) | |
| parent | 9345119d4da6dea75c3aa0bfa167f2c16b544864 (diff) | |
sb123:merge
Diffstat (limited to 'solenv/bin/modules/installer/simplepackage.pm')
| -rw-r--r-- | solenv/bin/modules/installer/simplepackage.pm | 28 |
1 files changed, 25 insertions, 3 deletions
diff --git a/solenv/bin/modules/installer/simplepackage.pm b/solenv/bin/modules/installer/simplepackage.pm index 80bbf3e45e15..f1223e112934 100644 --- a/solenv/bin/modules/installer/simplepackage.pm +++ b/solenv/bin/modules/installer/simplepackage.pm @@ -62,6 +62,21 @@ sub check_simple_packager_project } #################################################### +# Detecting the directory with extensions +#################################################### + +sub get_extensions_dir +{ + my ( $subfolderdir ) = @_; + + my $extensiondir = $subfolderdir . $installer::globals::separator; + if ( $installer::globals::officedirhostname ne "" ) { $extensiondir = $extensiondir . $installer::globals::officedirhostname . $installer::globals::separator; } + $extensiondir = $extensiondir . "share" . $installer::globals::separator . "extensions"; + + return $extensiondir; +} + +#################################################### # Registering extensions #################################################### @@ -774,9 +789,16 @@ sub create_simple_package # Registering the extensions - installer::logger::print_message( "... registering extensions ...\n" ); - installer::logger::include_header_into_logfile("Registering extensions:"); - register_extensions($subfolderdir, $languagestringref); + # installer::logger::print_message( "... registering extensions ...\n" ); + # installer::logger::include_header_into_logfile("Registering extensions:"); + # register_extensions($subfolderdir, $languagestringref); + + installer::logger::print_message( "... removing superfluous directories ...\n" ); + installer::logger::include_header_into_logfile("Removing superfluous directories:"); + + my $extensionfolder = get_extensions_dir($subfolderdir); + + installer::systemactions::remove_empty_dirs_in_folder($extensionfolder); if ( $installer::globals::compiler =~ /^unxmacx/ ) { |