openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From arie...@apache.org
Subject svn commit: r1490898 - /openoffice/trunk/main/solenv/bin/modules/installer/control.pm
Date Sat, 08 Jun 2013 01:46:15 GMT
Author: arielch
Date: Sat Jun  8 01:46:14 2013
New Revision: 1490898

URL: http://svn.apache.org/r1490898
Log:
Fix build breaker

The log file is checked for the word "error" at the end of the packaging
process, this breaks the build when the word is part of a file name,
like boost error.hpp/error.ipp headers.

Modified:
    openoffice/trunk/main/solenv/bin/modules/installer/control.pm

Modified: openoffice/trunk/main/solenv/bin/modules/installer/control.pm
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/bin/modules/installer/control.pm?rev=1490898&r1=1490897&r2=1490898&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/bin/modules/installer/control.pm (original)
+++ openoffice/trunk/main/solenv/bin/modules/installer/control.pm Sat Jun  8 01:46:14 2013
@@ -347,6 +347,9 @@ sub check_logfile
 		$compareline =~ s/Error\.ulf//g;	# removing all occurences of "Error.ulf"
 		$compareline =~ s/Error\.idl//g;	# removing all occurences of "Error.idl"
 		$compareline =~ s/Error\.html//g;	# removing all occurences of "Error.html"
+        # Ugly workaround for (boost) headers
+        $compareline =~ s/error\.hpp//g;    # removing all occurences of "error.hpp"
+        $compareline =~ s/error\.ipp//g;    # removing all occurences of "error.ipp"
 		
 		if ( $compareline =~ /\bError\b/i )
 		{



Mime
View raw message