1.1 --- a/etc/settings	Tue Sep 03 15:24:39 2019 +0200
     1.2 +++ b/etc/settings	Tue Sep 03 16:10:31 2019 +0200
     1.3 @@ -12,14 +12,19 @@
     1.4  ### Isabelle/Scala
     1.5  ###
     1.6  
     1.7 -ISABELLE_SCALAC_OPTIONS="-encoding UTF-8 -nowarn -target:jvm-1.8 -Xmax-classfile-name 130 -J-Xms128m -J-Xmx1024m -J-Xss2m"
     1.8 -
     1.9 -ISABELLE_JAVA_SYSTEM_OPTIONS="-server -Dfile.encoding=UTF-8 -Disabelle.threads=0"
    1.10 +ISABELLE_JAVA_SYSTEM_OPTIONS="-server -Dfile.encoding=UTF-8 -Disabelle.threads=0 -Djdk.gtk.version=2.2"
    1.11  
    1.12  ISABELLE_TOOL_JAVA_OPTIONS="-Djava.awt.headless=true -Xms512m -Xmx2560m -Xss16m"
    1.13  
    1.14 +ISABELLE_SCALAC_OPTIONS="-encoding UTF-8 -nowarn -target:jvm-1.8 -Xmax-classfile-name 130 -J-Xms512m -J-Xmx2560m -J-Xss16m"
    1.15 +
    1.16  classpath "$ISABELLE_HOME/lib/classes/Pure.jar"
    1.17  
    1.18 +isabelle_scala_tools 'isabelle.Tools'
    1.19 +[ -d "$ISABELLE_HOME/Admin" ] && isabelle_scala_tools 'isabelle.Admin_Tools'
    1.20 +
    1.21 +isabelle_file_format 'isabelle.Bibtex$File_Format'
    1.22 +
    1.23  #paranoia settings -- avoid intrusion of alien options
    1.24  unset "_JAVA_OPTIONS"
    1.25  unset "JAVA_TOOL_OPTIONS"
    1.26 @@ -63,12 +68,13 @@
    1.27  ###
    1.28  
    1.29  ISABELLE_COMPONENT_REPOSITORY="https://isabelle.in.tum.de/components"
    1.30 +ISABELLE_COMPONENTS_BASE="$USER_HOME/.isabelle/contrib"
    1.31  
    1.32  # The place for user configuration, heap files, etc.
    1.33  if [ -z "$ISABELLE_IDENTIFIER" ]; then
    1.34 -  ISABELLE_HOME_USER="$USER_HOME/.isabelle/isabisac"
    1.35 +  ISABELLE_HOME_USER="$USER_HOME/.isabelle"
    1.36  else
    1.37 -  ISABELLE_HOME_USER="$USER_HOME/.isabelle/isabisac"
    1.38 +  ISABELLE_HOME_USER="$USER_HOME/.isabelle/$ISABELLE_IDENTIFIER"
    1.39  fi
    1.40  
    1.41  # Where to look for isabelle tools (multiple dirs separated by ':').
    1.42 @@ -105,8 +111,8 @@
    1.43  # Where to look for docs (multiple dirs separated by ':').
    1.44  ISABELLE_DOCS="$ISABELLE_HOME/doc"
    1.45  
    1.46 -ISABELLE_DOCS_RELEASE_NOTES="ANNOUNCE:README:NEWS:COPYRIGHT:CONTRIBUTORS:contrib/README:src/Tools/jEdit/README:README_REPOSITORY"
    1.47 -ISABELLE_DOCS_EXAMPLES="src/HOL/ex/Seq.thy:src/HOL/ex/ML.thy:src/HOL/Unix/Unix.thy:src/HOL/Isar_Examples/Drinker.thy:src/Tools/SML/Examples.thy:src/Pure/ROOT.ML"
    1.48 +ISABELLE_DOCS_RELEASE_NOTES="~~/ANNOUNCE:~~/README:~~/NEWS:~~/COPYRIGHT:~~/CONTRIBUTORS:~~/contrib/README:~~/src/Tools/jEdit/README:~~/README_REPOSITORY"
    1.49 +ISABELLE_DOCS_EXAMPLES="~~/src/HOL/ex/Seq.thy:~~/src/HOL/ex/ML.thy:~~/src/HOL/Unix/Unix.thy:~~/src/HOL/Isar_Examples/Drinker.thy:~~/src/Tools/SML/Examples.thy:~~/src/Pure/ROOT.ML"
    1.50  
    1.51  # "open" within desktop environment (potentially asynchronous)
    1.52  case "$ISABELLE_PLATFORM_FAMILY" in
    1.53 @@ -133,14 +139,32 @@
    1.54  
    1.55  
    1.56  ###
    1.57 +### OCaml
    1.58 +###
    1.59 +
    1.60 +ISABELLE_OPAM_ROOT="$USER_HOME/.opam"
    1.61 +
    1.62 +ISABELLE_OCAML_VERSION="ocaml-base-compiler.4.05.0"
    1.63 +
    1.64 +
    1.65 +###
    1.66 +### Haskell
    1.67 +###
    1.68 +
    1.69 +ISABELLE_STACK_ROOT="$USER_HOME/.stack"
    1.70 +
    1.71 +ISABELLE_STACK_RESOLVER="lts-12.26"
    1.72 +
    1.73 +ISABELLE_GHC_VERSION="ghc-8.4.4"
    1.74 +
    1.75 +
    1.76 +###
    1.77  ### Misc settings
    1.78  ###
    1.79  
    1.80  ISABELLE_GNUPLOT="gnuplot"
    1.81 +ISABELLE_FONTFORGE="fontforge"
    1.82  
    1.83 -#ISABELLE_GHC="/usr/bin/ghc"
    1.84  #ISABELLE_MLTON="/usr/bin/mlton"
    1.85 -#ISABELLE_OCAML="/usr/bin/ocaml"
    1.86 -#ISABELLE_OCAMLC="/usr/bin/ocamlc"
    1.87  #ISABELLE_SMLNJ="/usr/bin/sml"
    1.88  #ISABELLE_SWIPL="/usr/bin/swipl"