diff options
| -rwxr-xr-x | bootstrap_scala/bootstrap_scala | 2 | ||||
| -rwxr-xr-x | cbt | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/bootstrap_scala/bootstrap_scala b/bootstrap_scala/bootstrap_scala index 7bc1d31..b004c8d 100755 --- a/bootstrap_scala/bootstrap_scala +++ b/bootstrap_scala/bootstrap_scala @@ -18,7 +18,7 @@ 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 ] || [ $DIR/Dependency.java -nt $CLASSES/Dependency.class ] then - echo "Recompiling CBT BootstrapScala.java" 1>&2 + echo "Compiling cbt/bootstrap_scala" 1>&2 $JAVAC -d $CLASSES $DIR/BootstrapScala.java $DIR/Dependency.java java -cp $CLASSES BootstrapScala $1 $CACHE else @@ -117,7 +117,7 @@ SCALAC="java -Xmx256M -Xms32M\ -feature" stage1 () { - log "Checking for source changes in NailgunLauncher and maybe compiling." $* + log "Checking for changes in cbt/nailgun_launcher" $* NAILGUN_INDICATOR=$NAILGUN$TARGET/cbt/NailgunLauncher.class changed=0 for file in `ls $NAILGUN/*.java`; do @@ -126,7 +126,7 @@ stage1 () { compiles=0 if [ $changed -eq 1 ]; then #rm $NAILGUN$TARGET/cbt/*.class 2>/dev/null - echo "Recompiling NailgunLauncher. Detected source changes." 1>&2 + echo "Compiling cbt/nailgun_launcher" 1>&2 javac -Xlint:deprecation -d $NAILGUN$TARGET `ls $NAILGUN*.java` compiles=$? if [ $compiles -ne 0 ]; then exit 1; fi @@ -138,7 +138,7 @@ stage1 () { fi fi - log "Checking for source changes in Stage1 and maybe compiling." $* + log "Checking for changes in cbt/stage1" $* STAGE1_INDICATOR=$STAGE1$TARGET/cbt/Stage1.class changed2=0 for file in `ls $STAGE1*.scala`; do @@ -147,7 +147,7 @@ stage1 () { compiles2=0 if [ $changed2 -eq 1 ]; then - echo "Recompiling Stage1. Detected source changes." 1>&2 + echo "Compiling cbt/stage1" 1>&2 rm $STAGE1$TARGET/cbt/*.class 2>/dev/null $SCALAC -cp $NAILGUN$TARGET -d $STAGE1$TARGET `ls $STAGE1/*.scala` compiles2=$? |