[pkg-eucalyptus-commits] r288 - gwt/trunk/debian/patches
Charles Plessy
plessy at alioth.debian.org
Sat Nov 3 09:11:08 UTC 2012
Author: plessy
Date: 2012-11-03 09:11:07 +0000 (Sat, 03 Nov 2012)
New Revision: 288
Modified:
gwt/trunk/debian/patches/build.patch
Log:
Refreshed patch to dev/build.xml.
Modified: gwt/trunk/debian/patches/build.patch
===================================================================
--- gwt/trunk/debian/patches/build.patch 2012-11-03 08:33:41 UTC (rev 287)
+++ gwt/trunk/debian/patches/build.patch 2012-11-03 09:11:07 UTC (rev 288)
@@ -119,9 +119,9 @@
- <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" />
- <pathelement location="${gwt.tools.lib}/hibernate/validator/hibernate-validator-4.1.0.Final.jar" />
- <pathelement location="${gwt.tools.lib}/javax/validation/validation-api-1.0.0.GA.jar" />
+- <pathelement location="${gwt.tools.lib}/streamhtmlparser/streamhtmlparser-jsilver-r10/streamhtmlparser-jsilver-r10-1.5-rebased.jar" />
- <pathelement location="${gwt.build.lib}/gwt-dev-${build.host.platform}.jar" />
- <pathelement location="${alldeps.jar}" />
+ <pathelement location="${servlet-api.jar}" />
@@ -144,7 +144,7 @@
</classpath>
</gwt.javac>
-@@ -117,66 +141,6 @@
+@@ -121,68 +145,6 @@
<targetfiles>
<fileset file="${alldeps.jar}"/>
</targetfiles>
@@ -152,12 +152,12 @@
- <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}/eclipse/jdt-3.4.2_r894.jar" />
+- <zipfileset src="${gwt.tools.lib}/guava/guava-10.0.1/guava-10.0.1-rebased.jar" />
+- <zipfileset src="${gwt.tools.lib}/jscomp/r1649/compiler-rebased.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" />
@@ -186,17 +186,17 @@
- <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/http/httpclient-4.1.2.jar" />
+- <zipfileset src="${gwt.tools.lib}/apache/http/httpcore-4.1.2.jar" />
+- <zipfileset src="${gwt.tools.lib}/apache/http/httpmime-4.1.2.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}/apache/commons/commons-lang-2.6.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}/htmlunit/htmlunit-2.9/htmlunit-2.9.jar" />
+- <zipfileset src="${gwt.tools.lib}/htmlunit/htmlunit-2.9/htmlunit-core-js-2.9.jar" />
+- <zipfileset src="${gwt.tools.lib}/nekohtml/nekohtml-1.9.15.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" />
@@ -205,27 +205,29 @@
- <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" />
+- <zipfileset src="${gwt.tools.lib}/guava/guava-10.0.1/guava-10.0.1-rebased.jar" />
+- <zipfileset src="${gwt.tools.lib}/jscomp/r1649/compiler-rebased.jar" />
+- <zipfileset src="${gwt.tools.redist}/json/r2_20080312/json-1.5.jar" />
- </gwt.jar>
- </sequential>
</outofdate>
</target>
-@@ -212,37 +176,21 @@
+@@ -218,38 +180,21 @@
<include name="com/google/gwt/util/**"/>
<include name="org/eclipse/jdt/**"/>
<classpath>
- <pathelement location="${gwt.tools.lib}/apache/ant-1.6.5.jar" />
-- <pathelement location="${gwt.tools.lib}/eclipse/jdt-3.4.2.jar" />
+- <pathelement location="${gwt.tools.lib}/eclipse/jdt-3.4.2_r894.jar" />
- <pathelement location="${gwt.tools.lib}/tomcat/commons-collections-3.1.jar" />
-- <pathelement location="${gwt.tools.lib}/guava/guava-r06/guava-r06-rebased-2.jar" />
+- <pathelement location="${gwt.tools.lib}/guava/guava-10.0.1/guava-10.0.1-rebased.jar" />
+- <pathelement location="${gwt.tools.lib}/jscomp/r1649/compiler-rebased.jar" />
+ <path refid="gwt.dev.build.classpath" />
</classpath>
</gwt.javac>
</target>
--
+
- <target name="compile" depends="compiler.standalone, build.alldeps.jar" description="Compiles this project">
-+
+ <target name="compile" depends="compiler.standalone" description="Compiles this project">
<gwt.javac srcdir="" excludes="${filter.pattern}">
<src path="core/src" />
@@ -253,31 +255,16 @@
</target>
<target name="generate.remotemessageproto.java">
-@@ -251,13 +199,13 @@
- <arg value="--java_out=core/src"/>
- <arg value="./core/src/com/google/gwt/dev/shell/remoteui/remotemessage.proto"/>
- </exec>
--
-+
- <!-- Rebase the java code to match the rebased protobuf library -->
- <replace file="./core/src/com/google/gwt/dev/shell/remoteui/RemoteMessageProto.java">
- <replacefilter token="com.google.protobuf" value="com.google.gwt.dev.protobuf"/>
- </replace>
- </target>
--
-+
- <target name="checkstyle" description="Static analysis of source">
- <gwt.checkstyle>
- <fileset dir="core/src">
-@@ -302,6 +250,7 @@
+@@ -308,7 +253,7 @@
+
<property.ensure name="gwt.tools.soyc" location="${gwt.root}/tools/soyc-vis" />
<target name="build" depends="compile" description="Build and package this project">
- <mkdir dir="${gwt.build.lib}" />
+- <mkdir dir="${gwt.build.lib}" />
+ <mkdir dir="${target.dir}" />
<outofdate>
<sourcefiles>
<fileset dir="core/src">
-@@ -311,7 +260,6 @@
+@@ -318,7 +263,6 @@
<fileset dir="core/super" excludes="**/package.html" />
<fileset dir="${javac.out}" />
<fileset dir="${project.build}/bin" />
@@ -285,7 +272,7 @@
<fileset file="${gwt.tools.soyc}/classLevel.css"/>
<fileset file="${gwt.tools.soyc}/roundedCorners.css"/>
</sourcefiles>
-@@ -319,22 +267,25 @@
+@@ -326,22 +270,24 @@
<fileset file="${project.lib}"/>
</targetfiles>
<sequential>
@@ -306,7 +293,7 @@
<zipfileset file="${gwt.tools.soyc}/roundedCorners.css" prefix="com/google/gwt/soyc/resources/"/>
<manifest>
- <attribute name="Main-Class" value="com.google.gwt.dev.GWTMain" />
+- <attribute name="Main-Class" value="com.google.gwt.dev.GWTMain" />
+ <attribute name="Class-Path" value="${manifest.class.path}"/>
</manifest>
- </gwt.jar>
More information about the pkg-eucalyptus-commits
mailing list