incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a.@apache.org
Subject svn commit: r1356700 - in /incubator/ooo/trunk/main: solenv/bin/build.pl tomcat/tomcat.patch
Date Tue, 03 Jul 2012 12:44:40 GMT
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
-+<project name="jsr152 and jsr154 in Apache OpenOffice" default="debuild" basedir=".">
++<project name="jsr154 in Apache OpenOffice" default="debuild" basedir=".">
 +
 +  <target name="debuild"
-+   description="Build jsr154 and jsr152 for Apache OpenOffice (Default)">
++   description="Build jsr154 for Apache OpenOffice (Default)">
 +    <echo message="Building Servlet 2.4 API"/>
 +    <ant antfile="jsr154/build.xml"
-+         target="dist"
-+         inheritAll="false"
-+    />
-+    <echo message="Building JSP 2.0 API"/>
-+    <ant antfile="jsr152/build.xml"
-+         target="dist"
++         target="jar"
 +         inheritAll="false"
 +    />
 +  </target>
 +
 +  <target name="clean" description="Clean">
-+    <echo message="Cleaning JSP 2.0 API"/>
-+    <ant antfile="jsr152/build.xml"
-+         target="clean"
-+         inheritAll="false"
-+    />
 +    <echo message="Cleaning Servlet 2.4 API"/>
 +    <ant antfile="jsr154/build.xml"
 +         target="clean"



Mime
View raw message