summaryrefslogtreecommitdiff
path: root/test/files
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2010-03-23 04:17:59 +0000
committerPaul Phillips <paulp@improving.org>2010-03-23 04:17:59 +0000
commitae8c065594aa605734b66c11693e5e584feaeddd (patch)
tree3c93cdc9a3d25ce9260bc7e7322b4f41c0c6e8d2 /test/files
parent88aab1cf8e06f98ccd18437974c09162ee54149f (diff)
downloadscala-ae8c065594aa605734b66c11693e5e584feaeddd.tar.gz
scala-ae8c065594aa605734b66c11693e5e584feaeddd.tar.bz2
scala-ae8c065594aa605734b66c11693e5e584feaeddd.zip
Went ahead and implemented classpaths as descri...
Went ahead and implemented classpaths as described in email to scala-internals on the theory that at this point I must know what I'm doing. ** PUBLIC SERVICE ANNOUNCEMENT ** If your code of whatever kind stopped working with this commit (most likely the error is something like "object scala not found") you can get it working again with either of: passing -usejavacp on the command line set system property "scala.usejavacp" to "true" Either of these will alert scala that you want the java application classpath to be utilized by scala as well. Review by community.
Diffstat (limited to 'test/files')
-rw-r--r--test/files/run/programmatic-main.scala4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/files/run/programmatic-main.scala b/test/files/run/programmatic-main.scala
index c97e4a8f3f..7c5b016f52 100644
--- a/test/files/run/programmatic-main.scala
+++ b/test/files/run/programmatic-main.scala
@@ -4,8 +4,8 @@ import io.Path
object Test
{
val cwd = Option(System.getProperty("partest.cwd")) getOrElse "."
- val basedir = (Path(cwd).parent / "lib").path
- val baseargs = Array("-bootclasspath", basedir + "/scala-library.jar", "-cp", basedir + "/scala-compiler.jar")
+ val basedir = Path(cwd).parent / "lib" path
+ val baseargs = Array("-usejavacp", "-bootclasspath", basedir + "/scala-library.jar", "-cp", basedir + "/scala-compiler.jar")
def main(args: Array[String]): Unit = {
Main process (baseargs ++ Array("-Xshow-phases"))