Revision: 6247
Author: [email protected]
Date: Tue Sep 29 11:05:28 2009
Log: Merged up to 6240 from farewellSwt
svn merge --ignore-ancestry -r6226:6240 \
https://google-web-toolkit.googlecode.com/svn/branches/farewellSwt
http://code.google.com/p/google-web-toolkit/source/detail?r=6247
Modified:
/changes/jat/noswt-merge6200/branch-info.txt
/changes/jat/noswt-merge6200/common.ant.xml
/changes/jat/noswt-merge6200/dev/build.xml
/changes/jat/noswt-merge6200/dev/oophm/src/com/google/gwt/dev/shell/MethodDispatch.java
/changes/jat/noswt-merge6200/user/build.xml
=======================================
--- /changes/jat/noswt-merge6200/branch-info.txt Sun Sep 27 13:09:27 2009
+++ /changes/jat/noswt-merge6200/branch-info.txt Tue Sep 29 11:05:28 2009
@@ -17,3 +17,8 @@
-r6101:6142
svn merge --ignore-ancestry -r6142:6200 \
https://google-web-toolkit.googlecode.com/svn/trunk
+
+Merged from farwellSwt
+======================
+svn merge --ignore-ancestry -r6226:6240 \
+ https://google-web-toolkit.googlecode.com/svn/branches/farewellSwt
=======================================
--- /changes/jat/noswt-merge6200/common.ant.xml Fri Sep 25 20:56:00 2009
+++ /changes/jat/noswt-merge6200/common.ant.xml Tue Sep 29 11:05:28 2009
@@ -150,7 +150,10 @@
</macrodef>
<macrodef name="gwt.junit">
- <!-- TODO: make this more generic / refactor so it can be used from
dev/core -->
+ <!-- TODO: Because dev has core, oophm splits, the "common pattern"
here doesn't work
+ for it (and we use extraclasspaths entries instead). Once we
lose SWT, we can
+ consolidate dev/core and dev/oophm, and that can instead more to
the normal
+ pattern. Note also special casing regarding (dev/) core/test. -->
<attribute name="test.args" default="" />
<attribute name="test.out" default="" />
<attribute name="test.reports" default="@{test.out}/reports" />
@@ -177,7 +180,6 @@
<isset property="emma.enabled" />
</condition>
- <echo message="${javac.out} ${javac.junit.out}" />
<junit dir="@{test.out}" fork="yes" printsummary="yes"
failureproperty="junit.failure" tempdir="@{test.out}">
<jvmarg line="-Xmx768m" />
@@ -189,12 +191,10 @@
<path refid="project.classpath.src" />
<pathelement location="${gwt.root}/${project.tail}/super" />
<pathelement location="${gwt.root}/${project.tail}/test" />
- <pathelement location="${gwt.root}/${project.tail}/core/src" />
- <pathelement location="${gwt.root}/${project.tail}/core/super" />
+ <!-- TODO: this is here because e.g. ClassPathEntryTest
otherwise fails,
+ expecting the src entry (core/test) to be earlier than the
bin entry
+ (${javac.junit.out}). -->
<pathelement location="${gwt.root}/${project.tail}/core/test" />
- <pathelement location="${gwt.root}/${project.tail}/oophm/src" />
- <pathelement
location="${gwt.root}/${project.tail}/oophm/overlay" />
- <pathelement location="${gwt.root}/${project.tail}/oophm/test" />
<pathelement location="${javac.junit.out}" />
<!-- javac.emma.out is empty unless emma is enabled. -->
<pathelement location="${javac.emma.out}" />
@@ -231,7 +231,7 @@
<condition property="junit.stop.build" value="true">
<and>
<istrue value="@{haltonfailure}"/>
- <isset property="${junit.failure}"/>
+ <isset property="junit.failure"/>
</and>
</condition>
<fail message="One or more junit tests failed" if="junit.stop.build"
/>
=======================================
--- /changes/jat/noswt-merge6200/dev/build.xml Sun Sep 20 13:15:01 2009
+++ /changes/jat/noswt-merge6200/dev/build.xml Tue Sep 29 11:05:28 2009
@@ -232,6 +232,16 @@
<gwt.junit test.out="${junit.out}" test.cases="tests.dev.core" >
<extraclasspaths>
<pathelement location="${alldeps.jar}" />
+ <!-- TODO: the following six items are needed because dev (alone)
does
+ not adhere to the .../{src,super,test} convention, having a
split
+ between core, oophm, and (historically) the OS platforms. When
+ that unifies, these should go away. -->
+ <pathelement location="${gwt.root}/${project.tail}/core/src" />
+ <pathelement location="${gwt.root}/${project.tail}/core/super" />
+ <pathelement location="${gwt.root}/${project.tail}/core/test" />
+ <pathelement location="${gwt.root}/${project.tail}/oophm/src" />
+ <pathelement location="${gwt.root}/${project.tail}/oophm/overlay"
/>
+ <pathelement location="${gwt.root}/${project.tail}/oophm/test" />
<!-- Pull in gwt-dev and gwt-user sources for .gwt.xml files -->
<pathelement location="${gwt.root}/user/src/" />
<pathelement location="${gwt.root}/user/super/" />
=======================================
---
/changes/jat/noswt-merge6200/dev/oophm/src/com/google/gwt/dev/shell/MethodDispatch.java
Wed Dec 3 15:31:00 2008
+++
/changes/jat/noswt-merge6200/dev/oophm/src/com/google/gwt/dev/shell/MethodDispatch.java
Tue Sep 29 11:05:28 2009
@@ -56,6 +56,10 @@
if (method.needsThis()) {
jthis = JsValueGlue.get(jsthis, classLoader,
method.getDeclaringClass(),
"invoke this");
+ if (jthis == null) {
+ throw ModuleSpace.createJavaScriptException(classLoader,
+ "Invoking an instance method on a null instance");
+ }
}
for (int i = 0; i < argc; ++i) {
args[i] = JsValueGlue.get(jsargs[i], classLoader, paramTypes[i],
=======================================
--- /changes/jat/noswt-merge6200/user/build.xml Sun Sep 27 13:09:27 2009
+++ /changes/jat/noswt-merge6200/user/build.xml Tue Sep 29 11:05:28 2009
@@ -132,7 +132,7 @@
<target name="test.hosted.emma" depends="compile, compile.tests"
description="Run all hosted-mode tests in emma mode.">
<fileset id="test.hosted.emma.tests" dir="${javac.junit.out}"
includes="${gwt.junit.testcase.hosted.emma.includes}"
excludes="${gwt.junit.testcase.hosted.emma.excludes}" />
- <gwt.junit test.args="${test.args} -batch module"
test.out="${junit.out}/${build.host.platform}-hosted-mode-emma"
test.cases="test.hosted.emma.tests" >
+ <gwt.junit test.args="${test.args}"
test.out="${junit.out}/${build.host.platform}-hosted-mode-emma"
test.cases="test.hosted.emma.tests" >
<extraclasspaths>
<path refid="test.extraclasspath" />
<pathelement location="${gwt.tools.redist}/emma/emma.jar" />
@@ -158,7 +158,7 @@
<target name="test.noserver" depends="compile, compile.tests"
description="Run noserver hosted-mode tests for this project.">
<fileset id="test.noserver.tests" dir="${javac.junit.out}"
includes="${gwt.junit.testcase.noserver.includes}"
excludes="${gwt.junit.testcase.noserver.excludes}" />
- <gwt.junit test.args="${test.args} -web -noserver -batch module"
test.out="${junit.out}/${build.host.platform}-noserver-mode"
test.cases="test.noserver.tests">
+ <gwt.junit test.args="${test.args} -web -noserver"
test.out="${junit.out}/${build.host.platform}-noserver-mode"
test.cases="test.noserver.tests">
<extraclasspaths>
<path refid="test.extraclasspath" />
</extraclasspaths>
@@ -176,7 +176,7 @@
<target name="test.web.disableClassMetadata" depends="compile,
compile.tests" description="Run only web-mode tests for this project.">
<fileset id="test.web.disableClassMetadata.tests"
dir="${javac.junit.out}" includes="${gwt.junit.testcase.web.includes}"
excludes="${gwt.junit.testcase.web.excludes}" />
- <gwt.junit test.args="${test.args} -XdisableClassMetadata -out www
-web -batch module"
test.out="${junit.out}/${build.host.platform}-web-mode-disableClassMetadata"
test.cases="test.web.disableClassMetadata.tests" >
+ <gwt.junit test.args="${test.args} -XdisableClassMetadata -out www
-web"
test.out="${junit.out}/${build.host.platform}-web-mode-disableClassMetadata"
test.cases="test.web.disableClassMetadata.tests" >
<extraclasspaths>
<path refid="test.extraclasspath" />
</extraclasspaths>
@@ -185,7 +185,7 @@
<target name="test.web.draft" depends="compile, compile.tests"
description="Run only web-mode tests for this project, not batching tests
on purpose.">
<fileset id="test.web.draft.tests" dir="${javac.junit.out}"
includes="${gwt.junit.testcase.web.includes}"
excludes="${gwt.junit.testcase.web.excludes}" />
- <gwt.junit test.args="${test.args} -draftCompile -out www -web -batch
module" test.out="${junit.out}/${build.host.platform}-web-mode-draft"
test.cases="test.web.draft.tests" >
+ <gwt.junit test.args="${test.args} -draftCompile -out www -web"
test.out="${junit.out}/${build.host.platform}-web-mode-draft"
test.cases="test.web.draft.tests" >
<extraclasspaths>
<path refid="test.extraclasspath" />
</extraclasspaths>
--~--~---------~--~----~------------~-------~--~----~
http://groups.google.com/group/Google-Web-Toolkit-Contributors
-~----------~----~----~----~------~----~------~--~---
