[vogar] r286 committed - Only include Run.resourceClasspath in jvm and host mode, not target mo...

[vo...@googlecode.com]

Revision: 286
Author: b...@google.com
Date: Mon Jan 7 11:43:07 2013
Log: Only include Run.resourceClasspath in jvm and host mode, not
target mode
http://code.google.com/p/vogar/source/detail?r=286

Modified:
/trunk/src/vogar/JavaVm.java
/trunk/src/vogar/android/DeviceDalvikVm.java
/trunk/src/vogar/android/HostDalvikVm.java
/trunk/src/vogar/tasks/RunActionTask.java

=======================================
--- /trunk/src/vogar/JavaVm.java Tue Dec 6 16:25:31 2011
+++ /trunk/src/vogar/JavaVm.java Mon Jan 7 11:43:07 2013
@@ -81,6 +81,8 @@
* --java-home /usr/lib/jvm/java-6-openjdk
*/
result.addAll(new File("/usr/share/java/bcprov.jar"));
+
+ result.addAll(run.resourceClasspath);
return result;
}

=======================================
--- /trunk/src/vogar/android/DeviceDalvikVm.java Tue Dec 6 16:25:31 2011
+++ /trunk/src/vogar/android/DeviceDalvikVm.java Mon Jan 7 11:43:07 2013
@@ -107,6 +107,8 @@

result.addAll(run.targetDexFile(run.basenameOfJar(classpathElement)));
}
}
+ // Note we intentionally do not add run.resourceClasspath on
+ // the device since it contains host path names.
return result;
}
}
=======================================
--- /trunk/src/vogar/android/HostDalvikVm.java Tue Dec 6 16:25:31 2011
+++ /trunk/src/vogar/android/HostDalvikVm.java Mon Jan 7 11:43:07 2013
@@ -114,6 +114,7 @@
for (File classpathElement : run.classpath.getElements()) {

result.addAll(run.localDexFile(run.basenameOfJar(classpathElement)));
}
+ result.addAll(run.resourceClasspath);
return result;
}
}
=======================================
--- /trunk/src/vogar/tasks/RunActionTask.java Mon Dec 3 16:21:40 2012
+++ /trunk/src/vogar/tasks/RunActionTask.java Mon Jan 7 11:43:07 2013
@@ -19,6 +19,7 @@
import java.io.File;
import java.io.IOException;
import vogar.Action;
+import vogar.Classpath;
import vogar.Outcome;
import vogar.Result;
import vogar.Run;
@@ -138,21 +139,18 @@
public Command createActionCommand(Action action, String skipPast, int
monitorPort) {
File workingDirectory = action.getUserDir();
VmCommandBuilder vmCommandBuilder =
run.mode.newVmCommandBuilder(action, workingDirectory);
+ Classpath runtimeClasspath = run.mode.getRuntimeClasspath(action);
if (run.useBootClasspath) {
-
vmCommandBuilder.bootClasspath(run.mode.getRuntimeClasspath(action));
+ vmCommandBuilder.bootClasspath(runtimeClasspath);
} else {
-
vmCommandBuilder.classpath(run.mode.getRuntimeClasspath(action));
+ vmCommandBuilder.classpath(runtimeClasspath);
}
-
- vmCommandBuilder.classpath(run.resourceClasspath);
-
if (monitorPort != -1) {
vmCommandBuilder.args("--monitorPort",
Integer.toString(monitorPort));
}
if (skipPast != null) {
vmCommandBuilder.args("--skipPast", skipPast);
}
-
return vmCommandBuilder
.temp(workingDirectory)
.debugPort(run.debugPort)