From stdcxx-commits-return-806-apmail-incubator-stdcxx-commits-archive=incubator.apache.org@incubator.apache.org Fri Jul 07 22:26:16 2006 Return-Path: Delivered-To: apmail-incubator-stdcxx-commits-archive@www.apache.org Received: (qmail 30337 invoked from network); 7 Jul 2006 22:26:16 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 7 Jul 2006 22:26:16 -0000 Received: (qmail 58290 invoked by uid 500); 7 Jul 2006 22:26:16 -0000 Delivered-To: apmail-incubator-stdcxx-commits-archive@incubator.apache.org Received: (qmail 58275 invoked by uid 500); 7 Jul 2006 22:26:16 -0000 Mailing-List: contact stdcxx-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: stdcxx-dev@incubator.apache.org Delivered-To: mailing list stdcxx-commits@incubator.apache.org Received: (qmail 58264 invoked by uid 99); 7 Jul 2006 22:26:15 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 07 Jul 2006 15:26:15 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 07 Jul 2006 15:26:12 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 3501C1A981A; Fri, 7 Jul 2006 15:25:46 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r420000 - /incubator/stdcxx/trunk/etc/config/run_locale_utils.sh Date: Fri, 07 Jul 2006 22:25:45 -0000 To: stdcxx-commits@incubator.apache.org From: sebor@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060707222546.3501C1A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: sebor Date: Fri Jul 7 15:25:42 2006 New Revision: 420000 URL: http://svn.apache.org/viewvc?rev=420000&view=rev Log: 2006-07-07 Martin Sebor STDCXX-256 * run_locale_utils.sh (check_locale_location, check_locale_help, check_locale_all, ...): Removed non-portable function keyword. (test_locale): Used the export keyword in a portable way. Modified: incubator/stdcxx/trunk/etc/config/run_locale_utils.sh Modified: incubator/stdcxx/trunk/etc/config/run_locale_utils.sh URL: http://svn.apache.org/viewvc/incubator/stdcxx/trunk/etc/config/run_locale_utils.sh?rev=420000&r1=419999&r2=420000&view=diff ============================================================================== --- incubator/stdcxx/trunk/etc/config/run_locale_utils.sh (original) +++ incubator/stdcxx/trunk/etc/config/run_locale_utils.sh Fri Jul 7 15:25:42 2006 @@ -1,5 +1,5 @@ #! /bin/sh -# $Id: //stdlib/dev/etc/stdlib/config/run_locale_utils.sh#4 $ +# $Id$ # ############################################################################## # @@ -27,7 +27,7 @@ ############################################################################## # Function definitions - checking sanity ############################################################################## -function check_locale_location +check_locale_location() { # 1 = location of util directory $echo_n "Checking location of locale utilities..." >$dbgout @@ -45,7 +45,7 @@ echo " correct." >$dbgout } -function check_locale_help +check_locale_help () { $echo_n "Checking \"locale --help\" output..." >$dbgout loc_h_out=`locale --help` @@ -63,7 +63,7 @@ echo " correct." >$dbgout } -function check_locale_all +check_locale_all() { $echo_n "Checking \"locale -a\" output..." >$dbgout loc_a_out=`locale -a` @@ -81,7 +81,7 @@ echo "check completed." >$dbgout } -function check_locale_m +check_locale_m() { $echo_n "Checking \"locale -m\" output..." >$dbgout loc_m_out=`locale -m` @@ -97,7 +97,7 @@ echo " correct." >$dbgout } -function check_locale_k +check_locale_k() { $echo_n "Checking \"locale -k LC_ALL\" output..." >$dbgout loc_k_out=`locale -k LC_ALL` @@ -123,7 +123,7 @@ echo " (seems) correct." >$dbgout } -function check_localedef_help +check_localedef_help() { $echo_n "Checking \"localedef --help\" output..." >$dbgout locdef_h_out=`localedef --help` @@ -149,7 +149,7 @@ # # Generates one specified locale # -function generate_locale +generate_locale() { err="Cannot generate locale database - " @@ -191,7 +191,7 @@ # # Dumps one locale database # -function dump_locale +dump_locale () { err="Cannot dump locale database - " @@ -221,7 +221,7 @@ # # Test one locale # -function test_locale +test_locale() { err="Cannot test locale - " @@ -260,7 +260,8 @@ LANG=$3 ## adjust the locale root - export RWSTD_LOCALE_ROOT=$2 + RWSTD_LOCALE_ROOT=$2 + export RWSTD_LOCALE_ROOT # dump the locale database content to temporary location echo Dump stage one database to file... > $dbgout @@ -383,8 +384,10 @@ [ -d $TMP/locale ] || mkdir $TMP/locale; ## checking locale functionality - export RWSTD_SRC_ROOT=$nlsdir; - export RWSTD_LOCALE_ROOT=$TMP/locale; + RWSTD_SRC_ROOT=$nlsdir + export RWSTD_SRC_ROOT + RWSTD_LOCALE_ROOT=$TMP/locale + export RWSTD_LOCALE_ROOT # test only one locale test_locale $nlsdir $TMP/locale $locale_db;