diff options
| author | Jan Christopher Vogt <oss.nsp@cvogt.org> | 2016-03-06 13:09:49 -0500 |
|---|---|---|
| committer | Jan Christopher Vogt <oss.nsp@cvogt.org> | 2016-03-06 13:09:49 -0500 |
| commit | 510f2a18d1f6f66ef066095b15d98b81c5a3a130 (patch) | |
| tree | 3eae69bbad4aa52919a0ff9334b07c353a432315 | |
| parent | 7f36e2fcb9e5d5f80f0fd1135f35db61e0763541 (diff) | |
| parent | 9b1a1bcd45bf30d4e7139c3691f585940bfeed86 (diff) | |
| download | cbt-510f2a18d1f6f66ef066095b15d98b81c5a3a130.tar.gz cbt-510f2a18d1f6f66ef066095b15d98b81c5a3a130.tar.bz2 cbt-510f2a18d1f6f66ef066095b15d98b81c5a3a130.zip | |
Merge pull request #48 from cvogt/hotfix-bootstrap_scala
Adds Dependency.java to compiled files. Bug introduced in #41
| -rwxr-xr-x | bootstrap_scala/bootstrap_scala | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bootstrap_scala/bootstrap_scala b/bootstrap_scala/bootstrap_scala index 051f429..7bc1d31 100755 --- a/bootstrap_scala/bootstrap_scala +++ b/bootstrap_scala/bootstrap_scala @@ -16,10 +16,10 @@ XML_JAR=scala-xml_2.11-1.0.5.jar # this is a bit fishy, because it doesn't take mkdir -p $CLASSES if [ ! -f $CACHE$COMPILER_JAR ] || [ ! -f $CACHE$LIBRARY_JAR ] || [ ! -f $CACHE$REFLECT_JAR ]\ - || [ ! -f $CACHE$XML_JAR ] || [ $DIR/BootstrapScala.java -nt $CLASSES/BootstrapScala.class ] + || [ ! -f $CACHE$XML_JAR ] || [ $DIR/BootstrapScala.java -nt $CLASSES/BootstrapScala.class ] || [ $DIR/Dependency.java -nt $CLASSES/Dependency.class ] then echo "Recompiling CBT BootstrapScala.java" 1>&2 - $JAVAC -d $CLASSES $DIR/BootstrapScala.java + $JAVAC -d $CLASSES $DIR/BootstrapScala.java $DIR/Dependency.java java -cp $CLASSES BootstrapScala $1 $CACHE else # for speedup |