Kaydet (Commit) 9cb69760 authored tarafından Andre Fischer's avatar Andre Fischer

#i120476# Install locally built extensions (minimizer,presenter)

pre-registered, not bundled.

Merged from branch AOO34

Patch by: Andre Fischer
Review by: Herbert Duerr
üst a4d00a47
...@@ -538,11 +538,7 @@ sub add_bundled_extension_blobs ...@@ -538,11 +538,7 @@ sub add_bundled_extension_blobs
{ {
push @bundle_files, $bundlehttpsrc . $name; push @bundle_files, $bundlehttpsrc . $name;
} }
# file:// extensions are taken from the solver bin/ directory. # file:// extensions are added as pre-registered in add_bundled_prereg_extension().
for my $name (ExtensionsLst::GetExtensionList("file", @installer::globals::languageproducts))
{
push @bundle_files, $bundlefilesrc . $name;
}
} }
installer::logger::print_message( installer::logger::print_message(
...@@ -606,11 +602,11 @@ sub add_bundled_prereg_extensions ...@@ -606,11 +602,11 @@ sub add_bundled_prereg_extensions
} }
else else
{ {
# Add the default rextensions for the current language set. # Add extensions from file:// URLs.
for my $name (ExtensionsLst::GetExtensionList("file", @installer::globals::languageproducts))
# file:// URLs are currently handled by add_bundled_extension_blobs(@), therefore {
# we may not their handling here anmore. push @bundle_files, $name;
# @bundle_files = ExtensionsLst::GetExtensionList("file", @installer::globals::languageproducts); }
} }
installer::logger::print_message( installer::logger::print_message(
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment