# HG changeset patch
# User wenzelm
# Date 1484491893 -3600
# Node ID 3687036107cd09f7c1eb7ecbb1d6404fb361d36a
# Parent  749d3a86c6a3322cea4fa1c39edeb79184ea3148
clarified settings;

diff -r 749d3a86c6a3 -r 3687036107cd NEWS
--- a/NEWS	Sun Jan 15 15:50:04 2017 +0100
+++ b/NEWS	Sun Jan 15 15:51:33 2017 +0100
@@ -88,6 +88,10 @@
 (the "Marketplace"). It serves as example for further potential IDE
 front-ends.
 
+* ISABELLE_SCALA_BUILD_OPTIONS has been renamed to
+ISABELLE_SCALAC_OPTIONS. Rare INCOMPATIBILITY.
+
+
 
 New in Isabelle2016-1 (December 2016)
 -------------------------------------
diff -r 749d3a86c6a3 -r 3687036107cd etc/settings
--- a/etc/settings	Sun Jan 15 15:50:04 2017 +0100
+++ b/etc/settings	Sun Jan 15 15:51:33 2017 +0100
@@ -12,7 +12,7 @@
 ### Isabelle/Scala
 ###
 
-ISABELLE_SCALA_BUILD_OPTIONS="-encoding UTF-8 -nowarn -target:jvm-1.7 -Xmax-classfile-name 130"
+ISABELLE_SCALAC_OPTIONS="-encoding UTF-8 -nowarn -target:jvm-1.7 -Xmax-classfile-name 130"
 
 ISABELLE_JAVA_SYSTEM_OPTIONS="-server -Dfile.encoding=UTF-8 -Disabelle.threads=0"
 
diff -r 749d3a86c6a3 -r 3687036107cd src/Pure/build-jars
--- a/src/Pure/build-jars	Sun Jan 15 15:50:04 2017 +0100
+++ b/src/Pure/build-jars	Sun Jan 15 15:51:33 2017 +0100
@@ -260,7 +260,7 @@
   rm -f "$TARGET"
   rm -rf classes && mkdir classes
 
-  SCALAC_OPTIONS="$ISABELLE_SCALA_BUILD_OPTIONS -d classes"
+  SCALAC_OPTIONS="$ISABELLE_SCALAC_OPTIONS -d classes"
 
   (
     classpath "$JAVA_HOME/lib/jfxrt.jar"
diff -r 749d3a86c6a3 -r 3687036107cd src/Tools/jEdit/lib/Tools/jedit
--- a/src/Tools/jEdit/lib/Tools/jedit	Sun Jan 15 15:50:04 2017 +0100
+++ b/src/Tools/jEdit/lib/Tools/jedit	Sun Jan 15 15:51:33 2017 +0100
@@ -344,7 +344,7 @@
       classpath "$JAR"
     done
     export CLASSPATH="$(platform_path "$ISABELLE_CLASSPATH")"
-    exec "$SCALA_HOME/bin/scalac" $ISABELLE_SCALA_BUILD_OPTIONS -d dist/classes "${SOURCES[@]}"
+    exec "$SCALA_HOME/bin/scalac" $ISABELLE_SCALAC_OPTIONS -d dist/classes "${SOURCES[@]}"
   ) || fail "Failed to compile sources"
 
   cd dist/classes