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 1AACD99EA for ; Fri, 2 Mar 2012 16:33:06 +0000 (UTC) Received: (qmail 26591 invoked by uid 500); 2 Mar 2012 16:33:06 -0000 Delivered-To: apmail-incubator-ooo-commits-archive@incubator.apache.org Received: (qmail 26554 invoked by uid 500); 2 Mar 2012 16:33:06 -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 26542 invoked by uid 99); 2 Mar 2012 16:33:06 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 02 Mar 2012 16:33:05 +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; Fri, 02 Mar 2012 16:33:04 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 85F1723888E7; Fri, 2 Mar 2012 16:32:44 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1296292 - /incubator/ooo/trunk/main/l10ntools/scripts/localize.pl Date: Fri, 02 Mar 2012 16:32:44 -0000 To: ooo-commits@incubator.apache.org From: af@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120302163244.85F1723888E7@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: af Date: Fri Mar 2 16:32:43 2012 New Revision: 1296292 URL: http://svn.apache.org/viewvc?rev=1296292&view=rev Log: Made localize.pl work again with current directory layout. Modified: incubator/ooo/trunk/main/l10ntools/scripts/localize.pl Modified: incubator/ooo/trunk/main/l10ntools/scripts/localize.pl URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/l10ntools/scripts/localize.pl?rev=1296292&r1=1296291&r2=1296292&view=diff ============================================================================== --- incubator/ooo/trunk/main/l10ntools/scripts/localize.pl (original) +++ incubator/ooo/trunk/main/l10ntools/scripts/localize.pl Fri Mar 2 16:32:43 2012 @@ -280,14 +280,14 @@ sub get_license_header{ "# distributed with this work for additional information\n". "# regarding copyright ownership. The ASF licenses this file\n". "# to you under the Apache License, Version 2.0 (the\n". -"# "License"); you may not use this file except in compliance\n". +"# \"License\"); you may not use this file except in compliance\n". "# with the License. You may obtain a copy of the License at\n". "# \n". "# http://www.apache.org/licenses/LICENSE-2.0\n". "# \n". "# Unless required by applicable law or agreed to in writing,\n". "# software distributed under the License is distributed on an\n". -"# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY\n". +"# \"AS IS\" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY\n". "# KIND, either express or implied. See the License for the\n". "# specific language governing permissions and limitations\n". "# under the License.\n". @@ -336,8 +336,7 @@ sub add_paths { my $langhash_ref = shift; my $root_dir = $ENV{ SRC_ROOT }; - my $ooo_l10n_dir = "$root_dir/l10n/source"; - my $so_l10n_dir = "$root_dir/l10n_so/source"; + my $ooo_l10n_dir = "$root_dir/../extras/l10n/source"; if( -e $ooo_l10n_dir ) { @@ -352,20 +351,6 @@ sub add_paths } } else { die "ERROR: Can not find directory $ooo_l10n_dir!!!" } - if( -e $so_l10n_dir ) - { - foreach my $lang ( keys( %{ $langhash_ref } ) ) - { - my $loc_file = "$so_l10n_dir/$lang/localize.sdf"; - if( -e $loc_file ) - { - push @sdfparticles , "$ooo_l10n_dir/$lang/localize.sdf"; - } - else { #print "WARNING: $loc_file not found ....\n"; - } - } - - } } sub collectfiles{ print STDOUT "### Localize\n";