# HG changeset patch # User wenzelm # Date 1332103970 -3600 # Node ID 97b68d61de2e62b7a0ef4247b63e9ae34efa8421 # Parent 8b13ebf3eda4ecb73df4eda3f7fd888c053b0f75 less noisy Isabelle/Scala build process; diff -r 8b13ebf3eda4 -r 97b68d61de2e etc/settings --- a/etc/settings Sun Mar 18 13:59:54 2012 +0100 +++ b/etc/settings Sun Mar 18 21:52:50 2012 +0100 @@ -60,6 +60,8 @@ ISABELLE_JAVA="java" fi +ISABELLE_SCALA_BUILD_OPTIONS="-nowarn -target:jvm-1.5" + ### ### Interactive sessions (cf. isabelle tty) diff -r 8b13ebf3eda4 -r 97b68d61de2e src/Pure/build-jars --- a/src/Pure/build-jars Sun Mar 18 13:59:54 2012 +0100 +++ b/src/Pure/build-jars Sun Mar 18 21:52:50 2012 +0100 @@ -170,7 +170,7 @@ rm -rf classes && mkdir classes - SCALAC_OPTIONS="-unchecked -deprecation -d classes -target:jvm-1.5" + SCALAC_OPTIONS="$ISABELLE_SCALA_BUILD_OPTIONS -d classes" "$SCALA_HOME/bin/scalac" $SCALAC_OPTIONS "${PIDE_SOURCES[@]}" || \ fail "Failed to compile PIDE sources" diff -r 8b13ebf3eda4 -r 97b68d61de2e src/Tools/jEdit/lib/Tools/jedit --- a/src/Tools/jEdit/lib/Tools/jedit Sun Mar 18 13:59:54 2012 +0100 +++ b/src/Tools/jEdit/lib/Tools/jedit Sun Mar 18 21:52:50 2012 +0100 @@ -244,8 +244,7 @@ CLASSPATH="$CLASSPATH:$JAR" done CLASSPATH="$(jvmpath "$CLASSPATH")" - exec "$SCALA_HOME/bin/scalac" -unchecked -deprecation \ - -d dist/classes -target:jvm-1.5 "${SOURCES[@]}" + exec "$SCALA_HOME/bin/scalac" $ISABELLE_SCALA_BUILD_OPTIONS -d dist/classes "${SOURCES[@]}" ) || fail "Failed to compile sources" cd dist/classes