Commit a76dcc9a authored by Eva Darulova's avatar Eva Darulova

Merge branch 'master' into 'master'

Changing the locale at the system-wide level when running sbt

Closes #28

See merge request !75
parents 6f1eb15a 97e4097e
......@@ -9,8 +9,7 @@ scalaVersion := "2.11.6"
scalacOptions ++= Seq(
"-deprecation",
"-unchecked",
"-feature"
)
"-feature")
resolvers += "Typesafe Repository" at "http://repo.typesafe.com/typesafe/releases/"
resolvers += "Sonatype OSS Snapshots" at "https://oss.sonatype.org/content/repositories/snapshots"
......@@ -22,8 +21,13 @@ libraryDependencies ++= Seq(
"org.fusesource.hawtjni" % "hawtjni-runtime" % "1.9" //for JNI
)
envVars := Map("LC_NUMERIC" -> "en_US.UTF-8")
Keys.fork in run := true
javaOptions in run ++= Seq(
"-Xms256M", "-Xmx2G", "-XX:+UseConcMarkSweepGC")
Keys.fork in Test := true //for native libraries to be on correct path
val scalaMeterFramework = new TestFramework("org.scalameter.ScalaMeterFramework")
......@@ -78,11 +82,16 @@ script := {
|
|SCALACLASSPATH="$paths"
|
|TMP=$$LC_NUMERIC
|LC_NUMERIC=en_US.UTF-8
|
|java -Xmx2G -Xms512M -Xss64M -classpath "$${SCALACLASSPATH}" -Dscala.usejavacp=false scala.tools.nsc.MainGenericRunner -classpath "$${SCALACLASSPATH}" daisy.Main $$@ 2>&1 | tee -i last.log
|
|LC_NUMERIC=$$TMP
|""".stripMargin)
f.setExecutable(true)
} catch {
case e: Throwable =>
s.log.error("There was an error while generating the script file: " + e.getLocalizedMessage)
}
}
\ No newline at end of file
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment