Corrected a classpath problem in the generated scripts in 'build/'.
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@5666 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
This commit is contained in:
parent
3da88766aa
commit
a1e46fe89d
|
@ -377,7 +377,7 @@ BUILD LOCAL REFERENCE (LOCKER) LAYER
|
||||||
class="scala.tools.nsc.Main"
|
class="scala.tools.nsc.Main"
|
||||||
version="${version.number}"
|
version="${version.number}"
|
||||||
copyright="${copyright}"
|
copyright="${copyright}"
|
||||||
classpath="#PREFIX#/${lib.dir.name}:#PREFIX#/${comp.dir.name}:#PREFIX#/${fjbg.name}:#PREFIX#/${msil.name}"
|
classpath="#SCALA_HOME#/${lib.dir.name}:#SCALA_HOME#/${comp.dir.name}:#SCALA_HOME#/${fjbg.name}:#SCALA_HOME#/${msil.name}"
|
||||||
properties="scala.boot.class.path=#CLASSPATH#"
|
properties="scala.boot.class.path=#CLASSPATH#"
|
||||||
javaFlags="-Xmx256M -Xms16M"/>
|
javaFlags="-Xmx256M -Xms16M"/>
|
||||||
<chmod file="${locker.dir}/${exec.dir.name}/${scalac.exec.name}"
|
<chmod file="${locker.dir}/${exec.dir.name}/${scalac.exec.name}"
|
||||||
|
@ -460,7 +460,7 @@ BUILD QUICK-TEST LAYER
|
||||||
class="scala.tools.nsc.Main"
|
class="scala.tools.nsc.Main"
|
||||||
version="${version.number}"
|
version="${version.number}"
|
||||||
copyright="${copyright}"
|
copyright="${copyright}"
|
||||||
classpath="#PREFIX#/${lib.dir.name}:#PREFIX#/${comp.dir.name}:#PREFIX#/${fjbg.name}:#PREFIX#/${msil.name}"
|
classpath="#SCALA_HOME#/${lib.dir.name}:#SCALA_HOME#/${comp.dir.name}:#SCALA_HOME#/${fjbg.name}:#SCALA_HOME#/${msil.name}"
|
||||||
properties="scala.boot.class.path=#CLASSPATH#"
|
properties="scala.boot.class.path=#CLASSPATH#"
|
||||||
javaFlags="-Xmx256M -Xms16M"/>
|
javaFlags="-Xmx256M -Xms16M"/>
|
||||||
<chmod file="${quick.dir}/${exec.dir.name}/${scalac.exec.name}"
|
<chmod file="${quick.dir}/${exec.dir.name}/${scalac.exec.name}"
|
||||||
|
@ -546,7 +546,7 @@ TEST
|
||||||
class="scala.tools.nsc.Main"
|
class="scala.tools.nsc.Main"
|
||||||
version="${version.number}"
|
version="${version.number}"
|
||||||
copyright="${copyright}"
|
copyright="${copyright}"
|
||||||
classpath="#PREFIX#/${lib.dir.name}:#PREFIX#/${comp.dir.name}:#PREFIX#/${fjbg.name}:#PREFIX#/${msil.name}"
|
classpath="#SCALA_HOME#/${lib.dir.name}:#SCALA_HOME#/${comp.dir.name}:#SCALA_HOME#/${fjbg.name}:#SCALA_HOME#/${msil.name}"
|
||||||
properties="scala.boot.class.path=#CLASSPATH#"
|
properties="scala.boot.class.path=#CLASSPATH#"
|
||||||
javaFlags="-Xmx256M -Xms16M"/>
|
javaFlags="-Xmx256M -Xms16M"/>
|
||||||
<chmod file="${strap.dir}/${exec.dir.name}/${scalac.exec.name}"
|
<chmod file="${strap.dir}/${exec.dir.name}/${scalac.exec.name}"
|
||||||
|
|
Loading…
Reference in New Issue