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 77280D90D for ; Thu, 25 Oct 2012 09:46:56 +0000 (UTC) Received: (qmail 79649 invoked by uid 500); 25 Oct 2012 09:46:56 -0000 Delivered-To: apmail-incubator-ooo-commits-archive@incubator.apache.org Received: (qmail 79531 invoked by uid 500); 25 Oct 2012 09:46:55 -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 79518 invoked by uid 99); 25 Oct 2012 09:46:55 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 25 Oct 2012 09:46:55 +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, 25 Oct 2012 09:46:51 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 5B72E23888CD; Thu, 25 Oct 2012 09:46:07 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1402058 - in /incubator/ooo/trunk/main: configure.in set_soenv.in Date: Thu, 25 Oct 2012 09:46:07 -0000 To: ooo-commits@incubator.apache.org From: hdu@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121025094607.5B72E23888CD@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: hdu Date: Thu Oct 25 09:46:06 2012 New Revision: 1402058 URL: http://svn.apache.org/viewvc?rev=1402058&view=rev Log: reformulate informational mentions of the word "warning" so that it no longer matches the default pattern a buildbot watches out for also fixed mis-spellings of the word "compatibility" Modified: incubator/ooo/trunk/main/configure.in incubator/ooo/trunk/main/set_soenv.in Modified: incubator/ooo/trunk/main/configure.in URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/configure.in?rev=1402058&r1=1402057&r2=1402058&view=diff ============================================================================== --- incubator/ooo/trunk/main/configure.in (original) +++ incubator/ooo/trunk/main/configure.in Thu Oct 25 09:46:06 2012 @@ -681,9 +681,9 @@ AC_ARG_WITH(stlport, Usage: --with-stlport= - Warning!!, disabling using --without-stlport or + Warning: disabling using --without-stlport or enabling using --with-stlport on a platform that - defaults to the opposite will break ABI compatability + defaults to the opposite will break ABI compatibility ], WITH_STLPORT=$withval , WITH_STLPORT=auto) AC_ARG_WITH(jdk-home, [ --with-jdk-home if you have installed JDK 1.3 or later on your system @@ -1004,7 +1004,7 @@ echo "* This process checks all pre-re echo "* containing the necessary environment variables. *" echo "* Source this file after configure has ended successfully. *" echo "* *" -echo "* Any warning that is generated during the configure process *" +echo "* Warnings that are generated during the configure process *" echo "* must be taken into account since it can be a reason for *" echo "* an unsuccessful build of Apache OpenOffice. *" echo "* *" @@ -2774,15 +2774,15 @@ dnl ==================================== if test "$WITH_STLPORT" = "yes"; then AC_MSG_RESULT([using internal stlport.]) if test "$DEFAULT_TO_STLPORT" != "yes"; then - AC_MSG_WARN([using stlport. Warning, breaks your ABI compatability!]) - echo "using stlport. Warning, breaks your ABI compatability!" >>warn + AC_MSG_WARN([using stlport. Warning, breaks your ABI compatibility!]) + echo "using stlport. Warning: breaks your ABI compatibility!" >>warn fi elif test "$WITH_STLPORT" = "no"; then AC_MSG_RESULT([using system STL]) USE_SYSTEM_STL="YES" if test "$DEFAULT_TO_STLPORT" != "no"; then - AC_MSG_WARN([using system STL. Warning, breaks your ABI compatability!]) - echo "using system STL. Warning, breaks your ABI compatability!" >>warn + AC_MSG_WARN([using system STL. Warning, breaks your ABI compatibility!]) + echo "using system STL. Warning: breaks your ABI compatibility!" >>warn fi else STLPORT4=$WITH_STLPORT @@ -2828,8 +2828,8 @@ dnl ==================================== fi fi if test "$DEFAULT_TO_STLPORT" != "yes"; then - AC_MSG_WARN([using stlport. Warning, breaks your ABI compatability!]) - echo "using stlport. Warning, breaks your ABI compatability!" >>warn + AC_MSG_WARN([using stlport. Warning: breaks your ABI compatibility!]) + echo "using stlport. Warning: breaks your ABI compatibility!" >>warn fi fi Modified: incubator/ooo/trunk/main/set_soenv.in URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/set_soenv.in?rev=1402058&r1=1402057&r2=1402058&view=diff ============================================================================== --- incubator/ooo/trunk/main/set_soenv.in (original) +++ incubator/ooo/trunk/main/set_soenv.in Thu Oct 25 09:46:06 2012 @@ -2204,8 +2204,8 @@ for ( $tmp = 0; $tmp < 2; $tmp++ ) { print "* $newline"; } print "* Configuration part of Apache OpenOffice $UPD build is finished. $newline* $newline"; -print "* NB! Be aware that you might not be able to build Apache OpenOffice if you $newline". - "* ignore any warning message that were generated during this configuration $newline". +print "* Note: Be aware that you might not be able to build Apache OpenOffice if $newline". + "* you ignore any warnings that were generated during this configuration $newline". "* process. $newline* $newline"; if ( $Warning ne "" )