Kaydet (Commit) 272907ca authored tarafından Andre Fischer's avatar Andre Fischer

Found a way to include local extensions (like presentation minimizer) via extensions.lst

üst 61e0e73d
...@@ -34,10 +34,10 @@ ...@@ -34,10 +34,10 @@
# Some extensions that are installed indepently of the language. # Some extensions that are installed indepently of the language.
#[ language=all && ENABLE_PRESENTER_SCREEN=YES ] #[ language=all && ENABLE_PRESENTER_SCREEN=YES ]
# file://presenter/presenter-screen.oxt file://presenter/presenter-screen.oxt
#[ language=all && ENABLE_MINIMIZER=YES ] #[ language=all && ENABLE_MINIMIZER=YES ]
# file://minimizer/presentation-minimizer.oxt file://minimizer/presentation-minimizer.oxt
......
...@@ -591,6 +591,8 @@ sub GetExtensionList ($@) ...@@ -591,6 +591,8 @@ sub GetExtensionList ($@)
{ {
# Bundling of dictionaires is disabled. # Bundling of dictionaires is disabled.
} }
return ();
} }
......
...@@ -491,7 +491,8 @@ sub remove_not_required_spellcheckerlanguage_files ...@@ -491,7 +491,8 @@ sub remove_not_required_spellcheckerlanguage_files
return \@filesarray; return \@filesarray;
} }
=head3 add_bundled_extension_blobs =head3 add_bundled_extension_blobs(@filelist)
Add entries for extension blobs to the global file list. Add entries for extension blobs to the global file list.
Extension blobs, unlike preregistered extensions, are not Extension blobs, unlike preregistered extensions, are not
extracted before included into a pack set. extracted before included into a pack set.
...@@ -503,6 +504,7 @@ sub remove_not_required_spellcheckerlanguage_files ...@@ -503,6 +504,7 @@ sub remove_not_required_spellcheckerlanguage_files
the default set. the default set.
Extension blobs are placed in gid_Brand_Dir_Share_Extensions_Install. Extension blobs are placed in gid_Brand_Dir_Share_Extensions_Install.
=cut =cut
sub add_bundled_extension_blobs sub add_bundled_extension_blobs
{ {
...@@ -510,7 +512,11 @@ sub add_bundled_extension_blobs ...@@ -510,7 +512,11 @@ sub add_bundled_extension_blobs
my @bundle_files = (); my @bundle_files = ();
my $bundleenv = $ENV{'BUNDLED_EXTENSION_BLOBS'}; my $bundleenv = $ENV{'BUNDLED_EXTENSION_BLOBS'};
my $bundlesrc = $ENV{'TARFILE_LOCATION'}; my $bundlehttpsrc = $ENV{'TARFILE_LOCATION'} . $installer::globals::separator;
my $bundlefilesrc = $ENV{SOLARVERSION}
. $installer::globals::separator . $ENV{INPATH}
. $installer::globals::separator . "bin"
. $installer::globals::separator;
if ($installer::globals::product =~ /(SDK|URE)/i ) if ($installer::globals::product =~ /(SDK|URE)/i )
{ {
...@@ -519,16 +525,28 @@ sub add_bundled_extension_blobs ...@@ -519,16 +525,28 @@ sub add_bundled_extension_blobs
elsif (defined $bundleenv) elsif (defined $bundleenv)
{ {
# Use the list of extensions that was explicitly given to configure. # Use the list of extensions that was explicitly given to configure.
@bundle_files = split(/\s+/, $bundleenv, -1); for my $name (split(/\s+/, $bundleenv, -1))
{
push @bundle_files, $bundlehttpsrc . $name;
}
} }
else else
{ {
# Add the default rextensions for the current language set. # Add the default extensions for the current language set.
@bundle_files = ExtensionsLst::GetExtensionList("http|https", @installer::globals::languageproducts); # http:// extensions are taken from ext_sources/.
for my $name (ExtensionsLst::GetExtensionList("http|https", @installer::globals::languageproducts))
{
push @bundle_files, $bundlehttpsrc . $name;
}
# file:// extensions are taken from the solver bin/ directory.
for my $name (ExtensionsLst::GetExtensionList("file", @installer::globals::languageproducts))
{
push @bundle_files, $bundlefilesrc . $name;
}
} }
installer::logger::print_message( installer::logger::print_message(
sprintf("preparing %d extension blob%s for language%s %s:\n %s\n", sprintf("preparing %d extension blob%s for language%s %s:\n",
$#bundle_files + 1, $#bundle_files + 1,
$#bundle_files!=0 ? "s" : "", $#bundle_files!=0 ? "s" : "",
$#installer::globals::languageproducts!=0 ? "s" : "", $#installer::globals::languageproducts!=0 ? "s" : "",
...@@ -543,18 +561,21 @@ sub add_bundled_extension_blobs ...@@ -543,18 +561,21 @@ sub add_bundled_extension_blobs
'Name' => $basename, 'Name' => $basename,
'Styles' => '(PACKED)', 'Styles' => '(PACKED)',
'UnixRights' => '444', 'UnixRights' => '444',
'sourcepath' => $bundlesrc . $installer::globals::separator . $filename, 'sourcepath' => $filename,
'modules' => "gid_Module_Dictionaries", 'modules' => "gid_Module_Dictionaries",
'gid' => "gid_File_Extension_".$basename 'gid' => "gid_File_Extension_".$basename
}; };
push( @filelist, $onefile); push( @filelist, $onefile);
push( @installer::globals::logfileinfo, "\tbundling \"$filename\" extension\n"); push( @installer::globals::logfileinfo, "\tbundling \"$filename\" extension\n");
installer::logger::print_message(" " . $basename . "\n");
} }
return \@filelist; return \@filelist;
} }
=head3 add_bundled_prereg_extensions =head3 add_bundled_prereg_extensions(@filelist)
Add entries for preregistered extensions to the global file list. Add entries for preregistered extensions to the global file list.
The set of extensions to include is taken from the BUNDLED_PREREG_EXTENSIONS The set of extensions to include is taken from the BUNDLED_PREREG_EXTENSIONS
...@@ -564,6 +585,7 @@ sub add_bundled_extension_blobs ...@@ -564,6 +585,7 @@ sub add_bundled_extension_blobs
the default set. the default set.
Preregistered extensions are placed in subdirectories of gid_Brand_Dir_Share_Prereg_Bundled. Preregistered extensions are placed in subdirectories of gid_Brand_Dir_Share_Prereg_Bundled.
=cut =cut
sub add_bundled_prereg_extensions sub add_bundled_prereg_extensions
{ {
...@@ -585,7 +607,10 @@ sub add_bundled_prereg_extensions ...@@ -585,7 +607,10 @@ sub add_bundled_prereg_extensions
else else
{ {
# Add the default rextensions for the current language set. # Add the default rextensions for the current language set.
@bundle_files = ExtensionsLst::GetExtensionList("file", @installer::globals::languageproducts);
# file:// URLs are currently handled by add_bundled_extension_blobs(@), therefore
# we may not their handling here anmore.
# @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