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=<absolute path to stlport home>
- 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 "" )
