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 4DE2D9301 for ; Tue, 3 Jul 2012 12:45:06 +0000 (UTC) Received: (qmail 74268 invoked by uid 500); 3 Jul 2012 12:45:06 -0000 Delivered-To: apmail-incubator-ooo-commits-archive@incubator.apache.org Received: (qmail 74101 invoked by uid 500); 3 Jul 2012 12:45:03 -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 74078 invoked by uid 99); 3 Jul 2012 12:45:03 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 03 Jul 2012 12:45:03 +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; Tue, 03 Jul 2012 12:45:00 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id BA7A22388860; Tue, 3 Jul 2012 12:44:40 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1356700 - in /incubator/ooo/trunk/main: solenv/bin/build.pl tomcat/tomcat.patch Date: Tue, 03 Jul 2012 12:44:40 -0000 To: ooo-commits@incubator.apache.org From: af@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120703124440.BA7A22388860@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: af Date: Tue Jul 3 12:44:39 2012 New Revision: 1356700 URL: http://svn.apache.org/viewvc?rev=1356700&view=rev Log: #i120174# Do not build tomcat code that is not delivered. Modified: incubator/ooo/trunk/main/solenv/bin/build.pl incubator/ooo/trunk/main/tomcat/tomcat.patch Modified: incubator/ooo/trunk/main/solenv/bin/build.pl URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/solenv/bin/build.pl?rev=1356700&r1=1356699&r2=1356700&view=diff ============================================================================== --- incubator/ooo/trunk/main/solenv/bin/build.pl (original) +++ incubator/ooo/trunk/main/solenv/bin/build.pl Tue Jul 3 12:44:39 2012 @@ -1559,15 +1559,6 @@ sub get_options { print_error("\"--html_path\" switch is used only with \"--html\"") if ($html_path); print_error("\"--dontgraboutput\" switch is used only with \"--html\"") if ($dont_grab_output); } - else - { - # Desperate HACK to get readable output from buildbot when built is terminated by buildbot - # due to timeout. - if (defined $ENV{"BUILD_TYPE"} && ($ENV{"BUILD_TYPE"} =~ /\bSWEXT\b/)) - { - $html = 0; - } - } if ((scalar keys %exclude_branches) && !$build_all_parents) { print_error("\"--exclude_branch_from\" is not applicable for one module builds!!"); }; Modified: incubator/ooo/trunk/main/tomcat/tomcat.patch URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/tomcat/tomcat.patch?rev=1356700&r1=1356699&r2=1356700&view=diff ============================================================================== --- incubator/ooo/trunk/main/tomcat/tomcat.patch (original) +++ incubator/ooo/trunk/main/tomcat/tomcat.patch Tue Jul 3 12:44:39 2012 @@ -1,29 +1,19 @@ --- misc/apache-tomcat-5.5.35-src/servletapi/build.xml Thu Jun 19 16:03:59 2008 +++ misc/build/apache-tomcat-5.5.35-src/servletapi/build.xml Thu Jun 19 15:56:18 2008 -@@ -1,1 +1,31 @@ +@@ -1,1 +1,21 @@ -dummy -+ ++ + + ++ description="Build jsr154 for Apache OpenOffice (Default)"> + + -+ -+ + + + -+ -+ + +