Return-Path: X-Original-To: apmail-incubator-ooo-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-ooo-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id DBAE9D192 for ; Thu, 9 Aug 2012 07:50:58 +0000 (UTC) Received: (qmail 78413 invoked by uid 500); 9 Aug 2012 07:50:58 -0000 Delivered-To: apmail-incubator-ooo-commits-archive@incubator.apache.org Received: (qmail 78306 invoked by uid 500); 9 Aug 2012 07:50:57 -0000 Mailing-List: contact ooo-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ooo-dev@incubator.apache.org Delivered-To: mailing list ooo-commits@incubator.apache.org Received: (qmail 78288 invoked by uid 99); 9 Aug 2012 07:50:57 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 09 Aug 2012 07:50:57 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 09 Aug 2012 07:50:55 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 5E14123888FE; Thu, 9 Aug 2012 07:50:11 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1371068 - /incubator/ooo/branches/AOO34/main/solenv/bin/modules/installer/scriptitems.pm Date: Thu, 09 Aug 2012 07:50:11 -0000 To: ooo-commits@incubator.apache.org From: af@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120809075011.5E14123888FE@eris.apache.org> Author: af Date: Thu Aug 9 07:50:10 2012 New Revision: 1371068 URL: http://svn.apache.org/viewvc?rev=1371068&view=rev Log: #i120476# Install locally built extensions (minimizer,presenter) pre-registered, not bundled. Patch by: Andre Fischer Review by: Herbert Duerr Modified: incubator/ooo/branches/AOO34/main/solenv/bin/modules/installer/scriptitems.pm Modified: incubator/ooo/branches/AOO34/main/solenv/bin/modules/installer/scriptitems.pm URL: http://svn.apache.org/viewvc/incubator/ooo/branches/AOO34/main/solenv/bin/modules/installer/scriptitems.pm?rev=1371068&r1=1371067&r2=1371068&view=diff ============================================================================== --- incubator/ooo/branches/AOO34/main/solenv/bin/modules/installer/scriptitems.pm (original) +++ incubator/ooo/branches/AOO34/main/solenv/bin/modules/installer/scriptitems.pm Thu Aug 9 07:50:10 2012 @@ -538,11 +538,7 @@ sub add_bundled_extension_blobs { 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; - } + # file:// extensions are added as pre-registered in add_bundled_prereg_extension(). } installer::logger::print_message( @@ -606,11 +602,11 @@ sub add_bundled_prereg_extensions } else { - # Add the default rextensions for the current language set. - - # 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); + # Add extensions from file:// URLs. + for my $name (ExtensionsLst::GetExtensionList("file", @installer::globals::languageproducts)) + { + push @bundle_files, $name; + } } installer::logger::print_message(