less noisy Isabelle/Scala build process;
authorwenzelm
Sun, 18 Mar 2012 21:52:50 +0100
changeset 47009 97b68d61de2e
parent 47008 8b13ebf3eda4
child 47010 ceba98191816
less noisy Isabelle/Scala build process;
etc/settings
src/Pure/build-jars
src/Tools/jEdit/lib/Tools/jedit
--- 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)
--- 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"
--- 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