Skip to content
Snippets Groups Projects
Commit 9301c8ac authored by Etienne Kneuss's avatar Etienne Kneuss
Browse files

Obtain inner classpath from SCALA_HOME, so make sure it is SET

parent b3431645
No related branches found
No related tags found
No related merge requests found
......@@ -12,7 +12,16 @@ object ExtractionPhase extends LeonPhase[List[String], Program] {
def run(ctx: LeonContext)(args: List[String]): Program = {
val settings = new NSCSettings
settings.extdirs.value = ctx.settings.classPath
val scalaHome = System.getenv("SCALA_HOME")
val fullClassPath = if (scalaHome != "") {
scalaHome+"/lib:"+ctx.settings.classPath
} else {
ctx.settings.classPath
}
settings.extdirs.value = fullClassPath
val compilerOpts = args.filterNot(_.startsWith("--"))
......@@ -22,11 +31,12 @@ object ExtractionPhase extends LeonPhase[List[String], Program] {
if(command.ok) {
// Debugging code for classpath crap
//new scala.tools.util.PathResolver(settings).Calculated.basis.foreach { cp =>
// cp.foreach( p =>
// ctx.reporter.info(" => "+p.toString)
// )
//}
// new scala.tools.util.PathResolver(settings).Calculated.basis.foreach { cp =>
// cp.foreach( p =>
// ctx.reporter.info(" => "+p.toString)
// )
// }
val runner = new PluginRunner(settings, ctx, None)
val run = new runner.Run
run.compile(command.files)
......
......@@ -13,8 +13,5 @@ $ play "start -Dconfig.file=conf/laraserver.conf"
$ cd path/to/leon-2.0
$ sbt package
$ cd web
edit conf/local.conf to match your class-path!
$ export LD_LIBRARY_PATH=../lib-bin/64/
$ play "start -Dconfig.file=conf/local.conf"
$ play start
......@@ -49,4 +49,4 @@ logger.application=DEBUG
app.prefix=""
# Specifies the classpath used by the Scala compiler within Leon
app.classpath="."
app.classpath="../library/target/scala-2.9.2/"
# This is the main configuration file for the application.
# ~~~~~
# Secret key
# ~~~~~
# The secret key is used to secure cryptographics functions.
# If you deploy your application to several instances be sure to use the same key!
application.secret="_JKq[m=o8OG;]F8xD:bGMs^/?KXXb2Huq^KLM=obhIQvsPIwPNJq@sgLWTRCLr4]"
# The application languages
# ~~~~~
application.langs="en"
# Global object class
# ~~~~~
# Define the Global object class for this application.
# Default to Global in the root package.
# global=Global
# Database configuration
# ~~~~~
# You can declare as many datasources as you want.
# By convention, the default datasource is named `default`
#
# db.default.driver=org.h2.Driver
# db.default.url="jdbc:h2:mem:play"
# db.default.user=sa
# db.default.password=
# Evolutions
# ~~~~~
# You can disable evolutions if needed
# evolutionplugin=disabled
# Logger
# ~~~~~
# You can also configure logback (http://logback.qos.ch/), by providing a logger.xml file in the conf directory .
# Root logger:
logger.root=ERROR
# Logger used by the framework:
logger.play=INFO
# Logger provided to your application:
logger.application=DEBUG
# This specifies the prefix under which the web page lies, used almost exclusively for the laraserver setup
app.prefix=""
# Specifies the classpath used by the Scala compiler within Leon
app.classpath="/home/ekneuss/.sbt/0.12.1/boot/scala-2.9.2/lib/:../library/target/scala-2.9.2/"
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment