less noisy Isabelle/Scala build process;
authorwenzelm
Sun Mar 18 21:52:50 2012 +0100 (2012-03-18)
changeset 4700997b68d61de2e
parent 47008 8b13ebf3eda4
child 47010 ceba98191816
less noisy Isabelle/Scala build process;
etc/settings
src/Pure/build-jars
src/Tools/jEdit/lib/Tools/jedit
     1.1 --- a/etc/settings	Sun Mar 18 13:59:54 2012 +0100
     1.2 +++ b/etc/settings	Sun Mar 18 21:52:50 2012 +0100
     1.3 @@ -60,6 +60,8 @@
     1.4    ISABELLE_JAVA="java"
     1.5  fi
     1.6  
     1.7 +ISABELLE_SCALA_BUILD_OPTIONS="-nowarn -target:jvm-1.5"
     1.8 +
     1.9  
    1.10  ###
    1.11  ### Interactive sessions (cf. isabelle tty)
     2.1 --- a/src/Pure/build-jars	Sun Mar 18 13:59:54 2012 +0100
     2.2 +++ b/src/Pure/build-jars	Sun Mar 18 21:52:50 2012 +0100
     2.3 @@ -170,7 +170,7 @@
     2.4  
     2.5    rm -rf classes && mkdir classes
     2.6  
     2.7 -  SCALAC_OPTIONS="-unchecked -deprecation -d classes -target:jvm-1.5"
     2.8 +  SCALAC_OPTIONS="$ISABELLE_SCALA_BUILD_OPTIONS -d classes"
     2.9  
    2.10    "$SCALA_HOME/bin/scalac" $SCALAC_OPTIONS "${PIDE_SOURCES[@]}" || \
    2.11      fail "Failed to compile PIDE sources"
     3.1 --- a/src/Tools/jEdit/lib/Tools/jedit	Sun Mar 18 13:59:54 2012 +0100
     3.2 +++ b/src/Tools/jEdit/lib/Tools/jedit	Sun Mar 18 21:52:50 2012 +0100
     3.3 @@ -244,8 +244,7 @@
     3.4        CLASSPATH="$CLASSPATH:$JAR"
     3.5      done
     3.6      CLASSPATH="$(jvmpath "$CLASSPATH")"
     3.7 -    exec "$SCALA_HOME/bin/scalac" -unchecked -deprecation \
     3.8 -      -d dist/classes -target:jvm-1.5 "${SOURCES[@]}"
     3.9 +    exec "$SCALA_HOME/bin/scalac" $ISABELLE_SCALA_BUILD_OPTIONS -d dist/classes "${SOURCES[@]}"
    3.10    ) || fail "Failed to compile sources"
    3.11  
    3.12    cd dist/classes