# HG changeset patch # User wenzelm # Date 1700927388 -3600 # Node ID ae682b2aab03a35160aee75aedb01c69656ae3c1 # Parent f13390b2c1ee10d01d8ba247ba1a0fe6c483d135 removed obsolete/broken isabelle_scala_script wrapper (see also abf9fcfa65cf); diff -r f13390b2c1ee -r ae682b2aab03 Admin/Release/CHECKLIST --- a/Admin/Release/CHECKLIST Sat Nov 25 16:13:08 2023 +0100 +++ b/Admin/Release/CHECKLIST Sat Nov 25 16:49:48 2023 +0100 @@ -22,8 +22,6 @@ - test Isabelle/jEdit: deactivate main plugin; -- test "#!/usr/bin/env isabelle_scala_script"; - - test "isabelle java_monitor -P pid" with "isabelle jedit"; - test Windows 10 subsystem for Linux: diff -r f13390b2c1ee -r ae682b2aab03 NEWS --- a/NEWS Sat Nov 25 16:13:08 2023 +0100 +++ b/NEWS Sat Nov 25 16:49:48 2023 +0100 @@ -77,6 +77,10 @@ command-line tool that is implemented in Isabelle/Scala. It serves as demonstration for user-defined tools. +* Old $ISABELLE_HOME/bin/isabelle_scala_script has been removed. +Command-line tools in Isabelle/Scala should be provided by a proper +system component with etc/build.props, e.g. see src/Tools/Demo/. + * The Isabelle/Scala module isabelle.Registry provides hierarchic system configuration, based on a collection of TOML files (see also https://toml.io/en/v1.0.0). The settings variable ISABELLE_REGISTRY diff -r f13390b2c1ee -r ae682b2aab03 lib/Tools/install --- a/lib/Tools/install Sat Nov 25 16:13:08 2023 +0100 +++ b/lib/Tools/install Sat Nov 25 16:49:48 2023 +0100 @@ -63,7 +63,7 @@ mkdir -p "$BINDIR" || fail "Bad directory: \"$BINDIR\"" -for NAME in isabelle isabelle_java isabelle_scala_script +for NAME in isabelle isabelle_java do BIN="$BINDIR/$NAME" DIST="$DISTDIR/bin/$NAME" diff -r f13390b2c1ee -r ae682b2aab03 lib/scripts/getsettings --- a/lib/scripts/getsettings Sat Nov 25 16:13:08 2023 +0100 +++ b/lib/scripts/getsettings Sat Nov 25 16:49:48 2023 +0100 @@ -59,7 +59,6 @@ #main executables ISABELLE_TOOL="$ISABELLE_HOME/bin/isabelle" -ISABELLE_SCALA_SCRIPT="$ISABELLE_HOME/bin/isabelle_scala_script" PATH="$ISABELLE_HOME/bin:$PATH" #platform diff -r f13390b2c1ee -r ae682b2aab03 src/Doc/System/Misc.thy --- a/src/Doc/System/Misc.thy Sat Nov 25 16:13:08 2023 +0100 +++ b/src/Doc/System/Misc.thy Sat Nov 25 16:49:48 2023 +0100 @@ -399,7 +399,7 @@ determined by @{setting ISABELLE_HOME}. The \BINDIR\ argument tells where executable wrapper scripts for - @{executable "isabelle"} and @{executable isabelle_scala_script} should be + @{executable "isabelle"} and @{executable isabelle_java} should be placed, which is typically a directory in the shell's @{setting PATH}, such as \<^verbatim>\$HOME/bin\. diff -r f13390b2c1ee -r ae682b2aab03 src/Doc/System/Scala.thy --- a/src/Doc/System/Scala.thy Sat Nov 25 16:13:08 2023 +0100 +++ b/src/Doc/System/Scala.thy Sat Nov 25 16:49:48 2023 +0100 @@ -96,27 +96,6 @@ \ -subsection \Scala script wrapper\ - -text \ - The executable @{executable "$ISABELLE_HOME/bin/isabelle_scala_script"} - allows to run Isabelle/Scala source files stand-alone programs, by using a - suitable ``hash-bang'' line and executable file permissions. For example: - @{verbatim [display, indent = 2] \#!/usr/bin/env isabelle_scala_script\} - @{scala [display, indent = 2] -\val options = isabelle.Options.init() -Console.println("browser_info = " + options.bool("browser_info")) -Console.println("document = " + options.string("document"))\} - - This assumes that the executable may be found via the @{setting PATH} from - the process environment: this is the case when Isabelle settings are active, - e.g.\ in the context of the main Isabelle tool wrapper - \secref{sec:isabelle-tool}. Alternatively, the full - \<^file>\$ISABELLE_HOME/bin/isabelle_scala_script\ may be specified in expanded - form. -\ - - subsection \Scala compiler \label{sec:tool-scalac}\ text \