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

Charles Plessy plessy at alioth.debian.org
Wed Aug 24 03:21:17 UTC 2011 

Author: plessy
Date: 2011-08-24 03:21:17 +0000 (Wed, 24 Aug 2011)
New Revision: 147

Modified:
   gwt/trunk/debian/patches/build.patch
Log:
Ported the patch to GWT 2.4.0 and added header in DEP 3 format.


Modified: gwt/trunk/debian/patches/build.patch
===================================================================
--- gwt/trunk/debian/patches/build.patch	2011-08-24 02:36:06 UTC (rev 146)
+++ gwt/trunk/debian/patches/build.patch	2011-08-24 03:21:17 UTC (rev 147)
@@ -1,18 +1,23 @@
-diff -Nur -x '*.orig' -x '*~' gwt-1.6.4/common.ant.xml gwt-1.6.4.new/common.ant.xml
---- gwt-1.6.4/common.ant.xml	2009-07-20 12:09:43.000000000 +0200
-+++ gwt-1.6.4.new/common.ant.xml	2009-07-20 12:09:57.000000000 +0200
-@@ -38,7 +38,7 @@
-   <property name="gwt.build.staging" location="${gwt.build}/staging" />
-   <property name="gwt.build.dist" location="${gwt.build}/dist" />
+Description: Adapts build process to Debian.
+ In particular, makes use of the packaged Java libraries when available, and
+ prevents redistribution of redundant code copies.
+Authors: Thierry Carrez <thierry.carrez at ubuntu.com>, Charles Plessy <plessy at debian.org>
+Forwarded: no
+
+--- a/common.ant.xml
++++ b/common.ant.xml
+@@ -47,7 +47,7 @@
+   <property name="gwt.threadsPerProcessor" value="1" />
+   <property name="gwt.threadCount" value="1" />
    <property name="project.build" location="${gwt.build.out}/${project.tail}" />
 -  <property name="project.lib" location="${gwt.build.lib}/gwt-${ant.project.name}.jar" />
 +  <property name="project.lib" location="${target.dir}/gwt-${ant.project.name}-${artifactVersion}.jar" />
    <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" />
-@@ -50,10 +50,6 @@
-   <property name="javac.nowarn" value="true" />
-   <property name="junit.out" location="${project.build}/test" />
+@@ -62,10 +62,6 @@
+   <property name="emma.dir" value="${gwt.tools.redist}/emma" />
+   <property name="emma.filter.exclude" value="" />
    
 -  <!-- Sanity check -->
 -  <available file="${gwt.tools}" type="dir" property="gwt.tools.exists" />
@@ -21,7 +26,7 @@
    <!-- Platform identification -->
    <condition property="build.host.islinux">
      <and>
-@@ -123,6 +119,7 @@
+@@ -142,6 +138,7 @@
    <presetdef name="gwt.ant">
      <ant inheritall="false" target="${target}">
        <propertyset>
@@ -29,17 +34,101 @@
          <propertyref name="gwt.version" />
          <propertyref name="gwt.junit.port" />
          <propertyref name="gwt.remote.browsers" />
-diff -Nur -x '*.orig' -x '*~' gwt-1.6.4/dev/common.ant.xml gwt-1.6.4.new/dev/common.ant.xml
---- gwt-1.6.4/dev/common.ant.xml	2009-07-20 12:09:43.000000000 +0200
-+++ gwt-1.6.4.new/dev/common.ant.xml	2009-07-20 12:09:57.000000000 +0200
-@@ -8,16 +8,16 @@
+--- a/dev/build.xml
++++ b/dev/build.xml
+@@ -26,8 +26,6 @@
+       <src path="core/test" />
+       <classpath>
+         <pathelement location="${javac.out}" />
+-        <pathelement location="${alldeps.jar}" />
+-        <pathelement location="${gwt.tools.lib}/junit/junit-4.8.2.jar" />
+       </classpath>
+     </gwt.javac>
+     <gwt.javac srcdir="${gwt.root}/user/src" destdir="${javac.junit.out}"
+@@ -117,66 +115,6 @@
+       <targetfiles>
+         <fileset file="${alldeps.jar}"/>
+       </targetfiles>
+-      <sequential>
+-        <gwt.jar destfile="${alldeps.jar}">
+-          <zipfileset src="${gwt.tools.lib}/apache/tapestry-util-text-4.0.2.jar" />
+-          <zipfileset src="${gwt.tools.lib}/apache/ant-1.6.5.jar" />
+-          <zipfileset src="${gwt.tools.lib}/eclipse/jdt-3.4.2.jar" />
+-          <zipfileset src="${gwt.tools.lib}/guava/guava-r06/guava-r06-rebased-2.jar" />
+-          <zipfileset src="${gwt.tools.lib}/jetty/jetty-6.1.11.jar" />
+-          <zipfileset src="${gwt.tools.lib}/icu4j/4.4.2/icu4j.jar" />
+-          <zipfileset src="${gwt.tools.lib}/protobuf/protobuf-2.2.0/protobuf-java-rebased-2.2.0.jar" />
+-          <zipfileset src="${gwt.tools.lib}/streamhtmlparser/streamhtmlparser-jsilver-r10/streamhtmlparser-jsilver-r10-1.5-rebased.jar" />
+-          <zipfileset src="${gwt.tools.lib}/tomcat/ant-launcher-1.6.5.jar" />
+-          <zipfileset src="${gwt.tools.lib}/tomcat/catalina-1.0.jar" />
+-          <zipfileset src="${gwt.tools.lib}/tomcat/catalina-optional-1.0.jar" />
+-          <zipfileset src="${gwt.tools.lib}/tomcat/commons-beanutils-1.6.jar" />
+-          <zipfileset src="${gwt.tools.lib}/tomcat/commons-collections-3.1.jar" />
+-          <zipfileset src="${gwt.tools.lib}/tomcat/commons-digester-1.5.jar" />
+-          <zipfileset src="${gwt.tools.lib}/tomcat/commons-el-1.0.jar" />
+-          <zipfileset src="${gwt.tools.lib}/tomcat/commons-logging-1.0.jar" />
+-          <zipfileset src="${gwt.tools.lib}/tomcat/commons-modeler-1.1.jar" />
+-          <zipfileset src="${gwt.tools.lib}/tomcat/jakarta-regexp-1.3.jar" />
+-          <zipfileset src="${gwt.tools.lib}/tomcat/jasper-compiler-1.0.jar" />
+-          <zipfileset src="${gwt.tools.lib}/tomcat/jasper-runtime-1.0.jar" />
+-          <zipfileset src="${gwt.tools.lib}/tomcat/jsp-api-2.0.jar" />
+-          <zipfileset src="${gwt.tools.lib}/tomcat/mx4j-jmx-1.1.jar" />
+-          <zipfileset src="${gwt.tools.lib}/tomcat/naming-common-1.0.jar" />
+-          <zipfileset src="${gwt.tools.lib}/tomcat/naming-factory-1.0.jar" />
+-          <zipfileset src="${gwt.tools.lib}/tomcat/naming-java-1.0.jar" />
+-          <zipfileset src="${gwt.tools.lib}/tomcat/naming-resources-1.0.jar" />
+-          <zipfileset src="${gwt.tools.lib}/tomcat/servlet-api-2.5.jar" />
+-          <zipfileset src="${gwt.tools.lib}/tomcat/servlet-api-2.4.jar" />
+-          <zipfileset src="${gwt.tools.lib}/tomcat/servlets-common-1.0.jar" />
+-          <zipfileset src="${gwt.tools.lib}/tomcat/servlets-default-1.0.jar" />
+-          <zipfileset src="${gwt.tools.lib}/tomcat/servlets-invoker-1.0.jar" />
+-          <zipfileset src="${gwt.tools.lib}/tomcat/tomcat-coyote-1.0.jar" />
+-          <zipfileset src="${gwt.tools.lib}/tomcat/tomcat-http11-1.0.jar" />
+-          <zipfileset src="${gwt.tools.lib}/tomcat/tomcat-jk2-2.1.jar" />
+-          <zipfileset src="${gwt.tools.lib}/tomcat/tomcat-util-5.1.jar" />
+-          <!-- htmlunit dependencies not already included: BEGIN -->
+-          <zipfileset src="${gwt.tools.lib}/apache/http/httpclient-4.0.1.jar" />
+-          <zipfileset src="${gwt.tools.lib}/apache/http/httpcore-4.0.1.jar" />
+-          <zipfileset src="${gwt.tools.lib}/apache/http/httpmime-4.0.1.jar" />
+-          <zipfileset src="${gwt.tools.lib}/apache/james/apache-mime4j-0.6.jar" />
+-          <zipfileset src="${gwt.tools.lib}/apache/commons/commons-codec-1.3.jar" />
+-          <zipfileset src="${gwt.tools.lib}/apache/commons/commons-io-1.4.jar" />
+-          <zipfileset src="${gwt.tools.lib}/apache/commons/commons-lang-2.4.jar" />
+-          <zipfileset src="${gwt.tools.lib}/cssparser/cssparser-0.9.5.jar" />
+-          <zipfileset src="${gwt.tools.lib}/htmlunit/htmlunit-r5940/htmlunit-r5940.jar" />
+-          <zipfileset src="${gwt.tools.lib}/htmlunit/htmlunit-r5940/htmlunit-core-js-r5940.jar" />
+-          <zipfileset src="${gwt.tools.lib}/nekohtml/nekohtml-1.9.13.jar" />
+-          <zipfileset src="${gwt.tools.lib}/cup/java-cup-11a.jar" />
+-          <zipfileset src="${gwt.tools.lib}/xalan/xalan-2.7.1-nocup.jar" />
+-          <zipfileset src="${gwt.tools.lib}/xerces/xerces-2_9_1/serializer.jar" />
+-          <zipfileset src="${gwt.tools.lib}/xerces/xerces-2_9_1/xercesImpl-NoMetaInf.jar" />
+-          <zipfileset src="${gwt.tools.lib}/xerces/xerces-2_9_1/xml-apis.jar" />
+-          <zipfileset src="${gwt.tools.lib}/w3c/sac/sac-1.3.jar" />
+-          <!-- htmlunit dependencies not already included: END -->
+-          <zipfileset src="${gwt.tools.lib}/sun/swingworker/swing-worker-1.1.jar" />
+-          <zipfileset src="${gwt.tools.lib}/guava/guava-r06/guava-r06-rebased-2.jar" />
+-        </gwt.jar>
+-      </sequential>
+     </outofdate>
+   </target>
+ 
+@@ -232,7 +170,6 @@
+     </copy>
+ 
+     <!-- Files with hardcoded version information must be filtered -->
+-    <gwt.getsvninfo />
+     <condition property="filter.uptodate">
+       <and>
+         <available file="${filter.sentinel}" />
+--- a/dev/common.ant.xml
++++ b/dev/common.ant.xml
+@@ -8,15 +8,16 @@
    <target name="compile" description="Compile all java files">
      <mkdir dir="${javac.out}" />
      <gwt.javac>
 +      <exclude name="com/google/gwt/dev/shell/moz/BrowserWidgetMoz.java" />
 +      <exclude name="org/eclipse/**" />
        <classpath>
--        <pathelement location="${gwt.tools.lib}/eclipse/${gwt.dev.swt.jar}" />
          <pathelement location="${gwt.core.build}/bin" />
 -        <pathelement location="${gwt.core.build}/alldeps.jar" />
        </classpath>
@@ -49,129 +138,58 @@
    <target name="build" depends="compile" description="Build and package this project">
 -    <mkdir dir="${gwt.build.lib}" />
 +    <mkdir dir="${target.dir}" />
-     <gwt.jar>
-       <fileset dir="src" excludes="**/package.html"/>
-       <fileset dir="${gwt.core.root}/src">
-@@ -27,8 +27,6 @@
-       <fileset dir="${gwt.core.root}/super" excludes="**/package.html" />
-       <fileset dir="${javac.out}" />
-       <fileset dir="${gwt.core.build}/bin" />
--      <zipfileset src="${gwt.tools.lib}/eclipse/${gwt.dev.swt.jar}" />
--      <zipfileset src="${gwt.core.build}/alldeps.jar" />
-       <manifest>
-         <attribute name="Main-Class" value="com.google.gwt.dev.GWTMain" />
-       </manifest>
-diff -Nur -x '*.orig' -x '*~' gwt-1.6.4/dev/core/build.xml gwt-1.6.4.new/dev/core/build.xml
---- gwt-1.6.4/dev/core/build.xml	2009-07-20 12:09:43.000000000 +0200
-+++ gwt-1.6.4.new/dev/core/build.xml	2009-07-20 12:09:57.000000000 +0200
-@@ -22,39 +22,6 @@
+     <outofdate>
+       <sourcefiles>
+         <fileset dir="src" excludes="**/package.html"/>
+@@ -42,7 +43,6 @@
+           <fileset dir="${gwt.core.root}/super" excludes="**/package.html" />
+           <fileset dir="${javac.out}" />
+           <fileset dir="${gwt.core.build}/bin" />
+-          <zipfileset src="${gwt.core.build}/alldeps.jar" />
  
-   <target name="build.alldeps.jar" description="Merges all dependency jars into a single jar">
-     <mkdir dir="${project.build}" />
--    <gwt.jar destfile="${alldeps.jar}">
--      <zipfileset src="${gwt.tools.lib}/apache/tapestry-util-text-4.0.2.jar" />
--      <zipfileset src="${gwt.tools.lib}/apache/ant-1.6.5.jar" />
--      <zipfileset src="${gwt.tools.lib}/eclipse/jdt-3.4.2.jar" />
--      <zipfileset src="${gwt.tools.lib}/jetty/jetty-6.1.11.jar" />
--      <zipfileset src="${gwt.tools.lib}/tomcat/ant-launcher-1.6.5.jar" />
--      <zipfileset src="${gwt.tools.lib}/tomcat/catalina-1.0.jar" />
--      <zipfileset src="${gwt.tools.lib}/tomcat/catalina-optional-1.0.jar" />
--      <zipfileset src="${gwt.tools.lib}/tomcat/commons-beanutils-1.6.jar" />
--      <zipfileset src="${gwt.tools.lib}/tomcat/commons-collections-3.1.jar" />
--      <zipfileset src="${gwt.tools.lib}/tomcat/commons-digester-1.5.jar" />
--      <zipfileset src="${gwt.tools.lib}/tomcat/commons-el-1.0.jar" />
--      <zipfileset src="${gwt.tools.lib}/tomcat/commons-logging-1.0.jar" />
--      <zipfileset src="${gwt.tools.lib}/tomcat/commons-modeler-1.1.jar" />
--      <zipfileset src="${gwt.tools.lib}/tomcat/jakarta-regexp-1.3.jar" />
--      <zipfileset src="${gwt.tools.lib}/tomcat/jasper-compiler-1.0.jar" />
--      <zipfileset src="${gwt.tools.lib}/tomcat/jasper-runtime-1.0.jar" />
--      <zipfileset src="${gwt.tools.lib}/tomcat/jsp-api-2.0.jar" />
--      <zipfileset src="${gwt.tools.lib}/tomcat/mx4j-jmx-1.1.jar" />
--      <zipfileset src="${gwt.tools.lib}/tomcat/naming-common-1.0.jar" />
--      <zipfileset src="${gwt.tools.lib}/tomcat/naming-factory-1.0.jar" />
--      <zipfileset src="${gwt.tools.lib}/tomcat/naming-java-1.0.jar" />
--      <zipfileset src="${gwt.tools.lib}/tomcat/naming-resources-1.0.jar" />
--      <zipfileset src="${gwt.tools.lib}/tomcat/servlet-api-2.5.jar" />
--      <zipfileset src="${gwt.tools.lib}/tomcat/servlet-api-2.4.jar" />
--      <zipfileset src="${gwt.tools.lib}/tomcat/servlets-common-1.0.jar" />
--      <zipfileset src="${gwt.tools.lib}/tomcat/servlets-default-1.0.jar" />
--      <zipfileset src="${gwt.tools.lib}/tomcat/servlets-invoker-1.0.jar" />
--      <zipfileset src="${gwt.tools.lib}/tomcat/tomcat-coyote-1.0.jar" />
--      <zipfileset src="${gwt.tools.lib}/tomcat/tomcat-http11-1.0.jar" />
--      <zipfileset src="${gwt.tools.lib}/tomcat/tomcat-jk2-2.1.jar" />
--      <zipfileset src="${gwt.tools.lib}/tomcat/tomcat-util-5.1.jar" />
--    </gwt.jar>
-   </target>
+           <manifest>
+             <attribute name="Main-Class" value="com.google.gwt.dev.GWTMain" />
+--- a/user/build.xml
++++ b/user/build.xml
+@@ -53,7 +53,7 @@
+   <property name="gwt.i18n.test.InnerClassChar" value="dollar"/>
  
-   <property name="filter.pattern" value="com/google/gwt/dev/About.properties" />
-@@ -83,10 +50,6 @@
-     <gwt.javac srcdir="src" excludes="${filter.pattern}">
-       <classpath>
-         <pathelement location="${javac.out-dummy}" />
--        <pathelement location="${alldeps.jar}" />
--        <pathelement location="${gwt.tools.lib}/junit/junit-3.8.1.jar" />
--        <!-- Must build against a version of SWT; just pick one -->
--        <pathelement location="${gwt.tools.lib}/eclipse/org.eclipse.swt.gtk-linux-3.2.1.jar" />
-       </classpath>
-     </gwt.javac>
-     <copy todir="${javac.out}">
-@@ -94,7 +57,6 @@
-     </copy>
- 
-     <!-- Files with hardcoded version information must be filtered -->
--    <gwt.getsvninfo />
-     <condition property="filter.uptodate">
-       <and>
-         <available file="${filter.sentinel}" />
-diff -Nur -x '*.orig' -x '*~' gwt-1.6.4/platforms.ant.xml gwt-1.6.4.new/platforms.ant.xml
---- gwt-1.6.4/platforms.ant.xml	2009-07-20 12:09:43.000000000 +0200
-+++ gwt-1.6.4.new/platforms.ant.xml	2009-07-20 12:09:57.000000000 +0200
-@@ -21,7 +21,7 @@
-     <gwt.ant dir="mac" />
-   </target>
- 
--  <target name="-do" depends="linux, windows, mac" description="Run all platforms" />
-+  <target name="-do" depends="linux" description="Run all platforms" />
- 
-   <target name="build" description="Build each platforms">
-     <antcall target="-do">
-diff -Nur -x '*.orig' -x '*~' gwt-1.6.4/user/build.xml gwt-1.6.4.new/user/build.xml
---- gwt-1.6.4/user/build.xml	2009-07-20 12:09:43.000000000 +0200
-+++ gwt-1.6.4.new/user/build.xml	2009-07-20 12:10:56.000000000 +0200
-@@ -25,24 +25,22 @@
-          includes="${gwt.junit.testcase.includes}" />
- 
    <!-- Platform shouldn't matter here, just picking one -->
--  <property.ensure name="gwt.dev.jar" location="${gwt.build.lib}/gwt-dev-linux.jar" />
+-  <property.ensure name="gwt.dev.jar" location="${gwt.build.lib}/gwt-dev.jar" />
 +  <property.ensure name="gwt.dev.jar" location="${target.dir}/gwt-dev-linux-${artifactVersion}.jar" />
  
-   <target name="compile" description="Compile all class files">
+   <!--
+     Classpaths added for test cases
+@@ -92,11 +92,8 @@
+       unless="compile.complete">
      <mkdir dir="${javac.out}" />
-     <gwt.javac>
+     <gwt.javac excludes="**/super/**">
 +      <exclude name="com/google/gwt/junit/**" />
        <classpath>
 -        <pathelement location="${gwt.tools.lib}/tomcat/servlet-api-2.5.jar" />
--        <pathelement location="${gwt.tools.lib}/junit/junit-3.8.1.jar" />
+-        <pathelement location="${gwt.tools.lib}/junit/junit-4.8.2.jar" />
 -        <pathelement location="${gwt.tools.lib}/jfreechart/jfreechart-1.0.3.jar" />
 -        <pathelement location="${gwt.tools.lib}/selenium/selenium-java-client-driver.jar" />
+         <pathelement location="${gwt.tools.lib}/w3c/sac/sac-1.3.jar" />
+         <pathelement location="${gwt.tools.lib}/w3c/flute/flute-1.3-gg2.jar" />
+         <pathelement location="${gwt.tools}/redist/json/r2_20080312/json-1.5.jar" />
+@@ -111,11 +108,6 @@
          <pathelement location="${gwt.dev.jar}" />
        </classpath>
      </gwt.javac>
- 
+-
 -    <!-- Build the BrowserManagerServer_Stub to allow remote browser testing -->
-+    <!-- Build the BrowserManagerServer_Stub to allow remote browser testing
-     <rmic base="${javac.out}"
-                   classname="com.google.gwt.junit.remote.BrowserManagerServer"
-                   stubversion="1.2"/>
-+    -->
+-    <rmic base="${javac.out}"
+-        classname="com.google.gwt.junit.remote.BrowserManagerServer"
+-        stubversion="1.2"/>
    </target>
  
    <!--
-@@ -72,7 +70,6 @@
+@@ -210,7 +202,6 @@
        <fileset dir="src" excludes="**/package.html" />
        <fileset dir="super" excludes="**/package.html" />
        <fileset dir="${javac.out}" />
--      <zipfileset src="${gwt.tools.lib}/tomcat/servlet-api-2.5.jar" />
+-      <zipfileset src="${gwt.tools.lib}/tomcat/servlet-api-2.5.jar" excludes="**/*.java"/>
+       <zipfileset src="${gwt.tools.lib}/w3c/sac/sac-1.3.jar" />
+       <zipfileset src="${gwt.tools.lib}/w3c/flute/flute-1.3-gg2.jar" />
      </gwt.jar>
-   </target>
-

More information about the pkg-eucalyptus-commits mailing list