Reverted c6310 (which created a temporary directory for updating HtmlUnit,
possibly multiple times, without polluting TOOLS)
svn merge -r6310:6309 .
and (a) updated all references to htmlunit-2.5 to htmlunit-r5070, (b) updated
the nekohtml depedency.
Patch by: amitmanjhi
git-svn-id: https://google-web-toolkit.googlecode.com/svn/branches/farewellSwt@6364 8db76d5a-ed1c-0410-87a9-c151d255dfc7
diff --git a/dev/build.xml b/dev/build.xml
index dfb8ab1..1fb3ecf 100755
--- a/dev/build.xml
+++ b/dev/build.xml
@@ -7,7 +7,6 @@
<property name="alldeps.jar" location="${project.build}/alldeps.jar" />
<property name="gwt.junit.testcase.dev.core.includes" value="**/com/google/**/*Test.class" />
<property name="gwt.junit.testcase.dev.core.excludes" value="" />
- <property name="htmlunit.libs.temp" location="${gwt.root}/tools/do-not-commit-to-trunk" />
<target name="clean" description="Cleans this project's intermediate and output files">
<delete dir="${project.build}" failonerror="false" />
@@ -75,6 +74,9 @@
<include name="apache/commons/commons-io-1.4.jar" />
<include name="apache/commons/commons-lang-2.4.jar" />
<include name="cssparser/cssparser-0.9.5.jar" />
+ <include name="htmlunit/htmlunit-r5070.jar" />
+ <include name="htmlunit/htmlunit-core-js-r5070.jar" />
+ <include name="nekohtml/nekohtml-1.9.13.jar" />
<include name="xalan/xalan-2.7.1.jar" />
<include name="xerces/xerces-2_9_1/serializer.jar" />
<include name="xerces/xerces-2_9_1/xercesImpl-NoMetaInf.jar" />
@@ -84,11 +86,6 @@
<include name="sun/swingworker/swing-worker-1.1.jar" />
</fileset>
<fileset file="build.xml"/>
- <fileset dir="${htmlunit.libs.temp}">
- <include name="htmlunit.jar" />
- <include name="htmlunit-core-js.jar" />
- <include name="nekohtml-1.9.13.jar" />
- </fileset>
</sourcefiles>
<targetfiles>
<fileset file="${alldeps.jar}"/>
@@ -132,9 +129,9 @@
<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="${htmlunit.libs.temp}/htmlunit.jar" />
- <zipfileset src="${htmlunit.libs.temp}/htmlunit-core-js.jar" />
- <zipfileset src="${htmlunit.libs.temp}/nekohtml-1.9.13.jar" />
+ <zipfileset src="${gwt.tools.lib}/htmlunit/htmlunit-r5070.jar" />
+ <zipfileset src="${gwt.tools.lib}/htmlunit/htmlunit-core-js-r5070.jar" />
+ <zipfileset src="${gwt.tools.lib}/nekohtml/nekohtml-1.9.13.jar" />
<zipfileset src="${gwt.tools.lib}/xalan/xalan-2.7.1.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" />
