[pkg-eucalyptus-commits] r287 - gwt/trunk/debian/patches

[Charles Plessy]

Author: plessy
Date: 2012-11-03 08:33:41 +0000 (Sat, 03 Nov 2012)
New Revision: 287

Modified:
   gwt/trunk/debian/patches/build.patch
Log:
Removed part that only change whitespace.


Modified: gwt/trunk/debian/patches/build.patch
===================================================================
--- gwt/trunk/debian/patches/build.patch	2012-11-03 07:50:49 UTC (rev 286)
+++ gwt/trunk/debian/patches/build.patch	2012-11-03 08:33:41 UTC (rev 287)
@@ -16,12 +16,7 @@
    <property name="gwt.tools.antlib" location="${gwt.tools}/antlib" />
    <property name="gwt.tools.redist" location="${gwt.tools}/redist" />
    <property name="gwt.build" location="${gwt.root}/build" />
-@@ -43,11 +44,11 @@
-   <property name="gwt.build.jni" location="${gwt.build}/jni" />
-   <property name="gwt.build.staging" location="${gwt.build}/staging" />
-   <property name="gwt.build.dist" location="${gwt.build}/dist" />
--  <!-- gwt.threadsPerProcessor supercedes gwt.threadCount unless set to 0 --> 
-+  <!-- gwt.threadsPerProcessor supercedes gwt.threadCount unless set to 0 -->
+@@ -47,7 +48,7 @@
    <property name="gwt.threadsPerProcessor" value="1" />
    <property name="gwt.threadCount" value="1" />
    <property name="project.build" location="${gwt.build.out}/${project.tail}" />
@@ -30,12 +25,8 @@
    <property name="project.jni" location="${gwt.build}/${project.tail}" />
    <property name="javac.out" location="${project.build}/bin" />
    <property name="javac.junit.out" location="${project.build}/bin-test" />
-@@ -61,10 +62,21 @@
-   <property name="junit.out" location="${project.build}/test" />
-   <property name="emma.dir" value="${gwt.tools.redist}/emma" />
-   <property name="emma.filter.exclude" value="" />
--  
-+
+@@ -64,7 +65,18 @@
+   
    <!-- Sanity check -->
    <available file="${gwt.tools}" type="dir" property="gwt.tools.exists" />
 -  <fail unless="gwt.tools.exists" message="Cannot find '${gwt.tools}' tools directory; perhaps you should define the GWT_TOOLS environment variable" />
@@ -54,28 +45,7 @@
  
    <!-- Platform identification -->
    <condition property="build.host.islinux">
-@@ -96,16 +108,16 @@
-     <isset property="build.host.iswindows" />
-   </condition>
-   <fail unless="build.host.platform" message="Building on ${os.name} is not supported" />
--  
-+
-   <!-- JVM -->
-   <condition property="build.jvm.is15">
-      <equals arg1="${ant.java.version}" arg2="1.5"/>
--  </condition>  
-+  </condition>
- 
-   <condition property="build.jvm.is16">
-      <equals arg1="${ant.java.version}" arg2="1.6"/>
--  </condition> 
--  
-+  </condition>
-+
-   <!-- JUnit support -->
-   <property name="gwt.dev.staging.jar" location="${gwt.build.staging}/gwt-${gwt.version}/gwt-dev.jar" />
-   <property name="gwt.junit.port" value="8888" />
-@@ -125,23 +137,24 @@
+@@ -125,7 +137,7 @@
    <!-- Pulls in tasks defined in ant-contrib, i.e. foreach -->
    <taskdef resource="net/sf/antcontrib/antlib.xml">
      <classpath>
@@ -83,20 +53,8 @@
 +      <pathelement location="/usr/share/java/ant-contrib.jar" />
      </classpath>
    </taskdef>
--  
--  
-+
-+
-   <!-- Pulls in tasks defined in antcount, i.e. countfilter -->
-   <taskdef resource="net/sf/antcount/antlib.xml">
-     <classpath>
-       <pathelement location="${gwt.tools.antlib}/antcount-1.2.jar" />
-     </classpath>
-   </taskdef>
--  
-+
- 
-   <!-- Global Custom Tasks -->
+   
+@@ -142,6 +154,7 @@
    <presetdef name="gwt.ant">
      <ant inheritall="false" target="${target}">
        <propertyset>
@@ -104,56 +62,6 @@
          <propertyref name="gwt.version" />
          <propertyref name="gwt.junit.port" />
          <propertyref name="gwt.remote.browsers" />
-@@ -260,7 +273,7 @@
-         </report>
-       </emma>
- 
--      <condition property="junit.stop.build" value="true"> 
-+      <condition property="junit.stop.build" value="true">
-         <and>
-           <istrue value="@{haltonfailure}"/>
-           <isset property="junit.failure"/>
-@@ -295,16 +308,16 @@
-          be noticed as invalidating the previously-generated filter output.  This property
-          names where such a sentinel lives; it is tested with <available/> and created
-          with <touch/> -->
--      <mkdir dir="${project.build}/sentinels" /> 
--      <property name="filter.sentinel" 
--          location="${project.build}/sentinels/gwt-${gwt.version}-svn-${gwt.svnrev.filename}" /> 
-+      <mkdir dir="${project.build}/sentinels" />
-+      <property name="filter.sentinel"
-+          location="${project.build}/sentinels/gwt-${gwt.version}-svn-${gwt.svnrev.filename}" />
-     </sequential>
-   </macrodef>
--  
-+
-   <macrodef name="gwt.revfilter" description="Filters files for versioning">
-     <attribute name="todir" description="Destination for the filtered copy"/>
--    
--    <element name="src.fileset" implicit="true" 
-+
-+    <element name="src.fileset" implicit="true"
-       description="Source for the filtered copy"/>
-     <sequential>
-       <!-- These files must be filtered for versioning -->
-@@ -324,7 +337,7 @@
-     <attribute name="name"/>
-     <element name="timer.elements" implicit="true" optional="false"/>
-     <sequential>
--      <taskdef name="timer" 
-+      <taskdef name="timer"
-         classname="com.google.gwt.ant.taskdefs.Timer"
-         classpath="${gwt.build.lib}/ant-gwt.jar" />
-       <timer name="@{name}">
-@@ -380,7 +393,7 @@
-     </sequential>
-   </macrodef>
- 
--  <!-- Targets for emma support.  To run tests with emma enabled, use 
-+  <!-- Targets for emma support.  To run tests with emma enabled, use
-        ant <test-target> -Demma.enabled=true -->
-   <path id="emma.taskdef.lib">
-     <pathelement location="${emma.dir}/emma-2.0.5312-patched.jar" />
 Index: gwt-debian/dev/build.xml
 ===================================================================
 --- gwt-debian.orig/dev/build.xml	2011-12-21 12:06:16.884746052 +0100