scriptitems.pm (b274bc22) scriptitems.pm (01a01bd6)
1#**************************************************************
2#
3# Licensed to the Apache Software Foundation (ASF) under one
4# or more contributor license agreements. See the NOTICE file
5# distributed with this work for additional information
6# regarding copyright ownership. The ASF licenses this file
7# to you under the Apache License, Version 2.0 (the
8# "License"); you may not use this file except in compliance

--- 520 unchanged lines hidden (view full) ---

529 {
530 push @bundle_files, $bundlehttpsrc . $name;
531 }
532 }
533 else
534 {
535 # Add the default extensions for the current language set.
536 # http:// extensions are taken from ext_sources/.
1#**************************************************************
2#
3# Licensed to the Apache Software Foundation (ASF) under one
4# or more contributor license agreements. See the NOTICE file
5# distributed with this work for additional information
6# regarding copyright ownership. The ASF licenses this file
7# to you under the Apache License, Version 2.0 (the
8# "License"); you may not use this file except in compliance

--- 520 unchanged lines hidden (view full) ---

529 {
530 push @bundle_files, $bundlehttpsrc . $name;
531 }
532 }
533 else
534 {
535 # Add the default extensions for the current language set.
536 # http:// extensions are taken from ext_sources/.
537 for my $name (ExtensionsLst::GetExtensionList("http|https", @installer::globals::languageproducts))
537 for my $name (ExtensionsLst::GetExtensionList("http|https", ($installer::globals::languageproduct)))
538 {
539 push @bundle_files, $bundlehttpsrc . $name;
540 }
541 # file:// extensions are added as pre-registered in add_bundled_prereg_extension().
542 }
543
544 $installer::logger::Info->printf(
538 {
539 push @bundle_files, $bundlehttpsrc . $name;
540 }
541 # file:// extensions are added as pre-registered in add_bundled_prereg_extension().
542 }
543
544 $installer::logger::Info->printf(
545 "preparing %d extension blob%s for language%s %s:\n",
545 "preparing %d extension blob%s for language %s:\n",
546 $#bundle_files + 1,
547 $#bundle_files!=0 ? "s" : "",
546 $#bundle_files + 1,
547 $#bundle_files!=0 ? "s" : "",
548 $#installer::globals::languageproducts!=0 ? "s" : "",
549 join(" ", @installer::globals::languageproducts));
548 $installer::globals::languageproduct);
550
551 foreach my $filename ( @bundle_files)
552 {
553 my $basename = File::Basename::basename( $filename);
554 my $onefile = {
555 'Dir' => 'gid_Brand_Dir_Share_Extensions_Install',
556 'Name' => $basename,
557 'Styles' => '(PACKED)',

--- 39 unchanged lines hidden (view full) ---

597 elsif (defined $bundleenv)
598 {
599 # Use the list of extensions that was explicitly given to configure.
600 @bundle_files = split(/\s+/, $bundleenv, -1);
601 }
602 else
603 {
604 # Add extensions from file:// URLs.
549
550 foreach my $filename ( @bundle_files)
551 {
552 my $basename = File::Basename::basename( $filename);
553 my $onefile = {
554 'Dir' => 'gid_Brand_Dir_Share_Extensions_Install',
555 'Name' => $basename,
556 'Styles' => '(PACKED)',

--- 39 unchanged lines hidden (view full) ---

596 elsif (defined $bundleenv)
597 {
598 # Use the list of extensions that was explicitly given to configure.
599 @bundle_files = split(/\s+/, $bundleenv, -1);
600 }
601 else
602 {
603 # Add extensions from file:// URLs.
605 for my $name (ExtensionsLst::GetExtensionList("file", @installer::globals::languageproducts))
604 for my $name (ExtensionsLst::GetExtensionList("file", ($installer::globals::languageproduct)))
606 {
607 push @bundle_files, $name;
608 }
609 }
610
611 $installer::logger::Info->printf(
605 {
606 push @bundle_files, $name;
607 }
608 }
609
610 $installer::logger::Info->printf(
612 "preparing %d bundled extension%s for language%s %s:\n",
611 "preparing %d bundled extension%s for language %s:\n",
613 $#bundle_files + 1,
614 $#bundle_files!=0 ? "s" : "",
612 $#bundle_files + 1,
613 $#bundle_files!=0 ? "s" : "",
615 $#installer::globals::languageproducts!=0 ? "s" : "",
616 join(" ", @installer::globals::languageproducts));
614 $installer::globals::languageproduct);
617 foreach my $filename (@bundle_files)
618 {
619 $installer::logger::Info->printf(" %s\n", $filename);
620 }
621
622 # Find the prereg directory entry so that we can create a new sub-directory.
623 my $parentdir_gid = "gid_Brand_Dir_Share_Prereg_Bundled";
624 my $parentdir = undef;

--- 2513 unchanged lines hidden --- 		615 foreach my $filename (@bundle_files)
616 {
617 $installer::logger::Info->printf(" %s\n", $filename);
618 }
619
620 # Find the prereg directory entry so that we can create a new sub-directory.
621 my $parentdir_gid = "gid_Brand_Dir_Share_Prereg_Bundled";
622 my $parentdir = undef;

--- 2513 unchanged lines hidden ---