# HG changeset patch
# User wenzelm
# Date 1626434334 -7200
# Node ID b4e6b82fdb9ed8b4ababcc7ef559bba872e6e6b3
# Parent  027fb21bdd5d686092c41409a7cc5dfa6adc71fb
more direct isabelle_scala_build: always enabled, no "Admin" requirement;

diff -r 027fb21bdd5d -r b4e6b82fdb9e Admin/build
--- a/Admin/build	Fri Jul 16 12:59:10 2021 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,69 +0,0 @@
-#!/usr/bin/env bash
-#
-# Administrative build for Isabelle source distribution.
-
-## directory layout
-
-if [ -z "$ISABELLE_HOME" ]; then
-  unset CDPATH
-  ISABELLE_HOME="$(cd "$(dirname "$0")"; cd "$(pwd -P)"; cd ..; pwd)"
-  ISABELLE_TOOL="$ISABELLE_HOME/bin/isabelle"
-fi
-
-
-## diagnostics
-
-PRG="$(basename "$0")"
-
-function usage()
-{
-  cat <<EOF
-
-Usage: $PRG [MODULES]
-
-  Produce Isabelle distribution modules from current repository sources.
-  The MODULES list may contain any of the following:
-
-    jars            Isabelle/Scala
-    jars_fresh      fresh build of jars
-
-EOF
-  exit 1
-}
-
-function fail()
-{
-  echo "$1" >&2
-  exit 2
-}
-
-
-## process command line
-
-[ "$#" -eq 0 ] && usage
-
-MODULES="$@"; shift "$#"
-
-
-## modules
-
-function build_setup ()
-{
-  rm -rf \
-    "$ISABELLE_HOME/lib/classes/Pure.jar" \
-    "$ISABELLE_HOME/lib/classes/Pure.shasum" \
-    "$ISABELLE_HOME/src/Tools/jEdit/dist"
-  env ISABELLE_SETUP_CLASSPATH_SKIP=true "$ISABELLE_TOOL" java isabelle.setup.Setup "$@"
-}
-
-
-## main
-
-for MODULE in $MODULES
-do
-  case $MODULE in
-    jars) build_setup build;;
-    jars_fresh) build_setup build_fresh;;
-    *) fail "Bad module $MODULE"
-  esac
-done
diff -r 027fb21bdd5d -r b4e6b82fdb9e Admin/build_history
--- a/Admin/build_history	Fri Jul 16 12:59:10 2021 +0200
+++ b/Admin/build_history	Fri Jul 16 13:18:54 2021 +0200
@@ -5,5 +5,5 @@
 unset CDPATH
 THIS="$(cd "$(dirname "$0")"; pwd)"
 
-"$THIS/build" jars > /dev/null || exit $?
+env ISABELLE_SETUP_CLASSPATH_SKIP=true "$THIS/../bin/isabelle" java isabelle.setup.Setup build > /dev/null || exit $?
 exec "$THIS/../bin/isabelle_java" isabelle.Build_History "$@"
diff -r 027fb21bdd5d -r b4e6b82fdb9e Admin/build_release
--- a/Admin/build_release	Fri Jul 16 12:59:10 2021 +0200
+++ b/Admin/build_release	Fri Jul 16 13:18:54 2021 +0200
@@ -5,5 +5,5 @@
 unset CDPATH
 THIS="$(cd "$(dirname "$0")"; pwd)"
 
-"$THIS/build" jars || exit $?
+env ISABELLE_SETUP_CLASSPATH_SKIP=true "$THIS/../bin/isabelle" java isabelle.setup.Setup build > /dev/null || exit $?
 exec "$THIS/../bin/isabelle_java" isabelle.Build_Release "$@"
diff -r 027fb21bdd5d -r b4e6b82fdb9e bin/isabelle
--- a/bin/isabelle	Fri Jul 16 12:59:10 2021 +0200
+++ b/bin/isabelle	Fri Jul 16 13:18:54 2021 +0200
@@ -45,7 +45,7 @@
 
 ## internal tool or usage (Scala)
 
-isabelle_admin_build jars || exit $?
+isabelle_scala_build || exit $?
 
 eval "declare -a JAVA_ARGS=($ISABELLE_TOOL_JAVA_OPTIONS)"
 exec isabelle java "${JAVA_ARGS[@]}" isabelle.Isabelle_Tool "$@"
diff -r 027fb21bdd5d -r b4e6b82fdb9e lib/Tools/components
--- a/lib/Tools/components	Fri Jul 16 12:59:10 2021 +0200
+++ b/lib/Tools/components	Fri Jul 16 13:18:54 2021 +0200
@@ -127,7 +127,7 @@
   echo "Missing components:"
   for NAME in "${MISSING_COMPONENTS[@]}"; do echo "  $NAME"; done
 elif [ "${#UPDATE_COMPONENTS[@]}" -ne 0 ]; then
-  isabelle_admin_build jars || exit $?
+  isabelle_scala_build || exit $?
   exec isabelle java isabelle.Components "${UPDATE_COMPONENTS[@]}"
 else
   for NAME in "${SELECTED_COMPONENTS[@]}"
diff -r 027fb21bdd5d -r b4e6b82fdb9e lib/Tools/console
--- a/lib/Tools/console	Fri Jul 16 12:59:10 2021 +0200
+++ b/lib/Tools/console	Fri Jul 16 13:18:54 2021 +0200
@@ -4,7 +4,7 @@
 #
 # DESCRIPTION: raw ML process (interactive mode)
 
-isabelle_admin_build jars || exit $?
+isabelle_scala_build || exit $?
 
 eval "declare -a JAVA_ARGS=($ISABELLE_TOOL_JAVA_OPTIONS)"
 
diff -r 027fb21bdd5d -r b4e6b82fdb9e lib/Tools/scala
--- a/lib/Tools/scala	Fri Jul 16 12:59:10 2021 +0200
+++ b/lib/Tools/scala	Fri Jul 16 13:18:54 2021 +0200
@@ -4,7 +4,7 @@
 #
 # DESCRIPTION: invoke Scala within the Isabelle environment
 
-isabelle_admin_build jars || exit $?
+isabelle_scala_build || exit $?
 
 eval "declare -a JAVA_ARGS=($ISABELLE_JAVA_SYSTEM_OPTIONS)"
 declare -a SCALA_ARGS=()
diff -r 027fb21bdd5d -r b4e6b82fdb9e lib/Tools/scalac
--- a/lib/Tools/scalac	Fri Jul 16 12:59:10 2021 +0200
+++ b/lib/Tools/scalac	Fri Jul 16 13:18:54 2021 +0200
@@ -4,7 +4,7 @@
 #
 # DESCRIPTION: invoke Scala compiler within the Isabelle environment
 
-isabelle_admin_build jars || exit $?
+isabelle_scala_build || exit $?
 
 classpath "$ISABELLE_SETUP_CLASSPATH"; unset ISABELLE_SETUP_CLASSPATH
 classpath "$CLASSPATH"; unset CLASSPATH
diff -r 027fb21bdd5d -r b4e6b82fdb9e lib/scripts/getfunctions
--- a/lib/scripts/getfunctions	Fri Jul 16 12:59:10 2021 +0200
+++ b/lib/scripts/getfunctions	Fri Jul 16 13:18:54 2021 +0200
@@ -211,14 +211,21 @@
 }
 export -f isabelle_directory
 
-#administrative build
-function isabelle_admin_build ()
+#Isabelle/Scala/Java build
+function isabelle_scala_build ()
 {
-  if [ -e "$ISABELLE_HOME/Admin/build" ]; then
-    "$ISABELLE_HOME/Admin/build" "$@"
+  rm -rf \
+    "$ISABELLE_HOME/lib/classes/Pure.jar" \
+    "$ISABELLE_HOME/lib/classes/Pure.shasum" \
+    "$ISABELLE_HOME/src/Tools/jEdit/dist"
+  if [ "$1" = "fresh" ]; then
+    CMD="build_fresh"
+  else
+    CMD="build"
   fi
+  env ISABELLE_SETUP_CLASSPATH_SKIP=true isabelle java isabelle.setup.Setup "$CMD"
 }
-export -f isabelle_admin_build
+export -f isabelle_scala_build
 
 #arrays
 function splitarray ()
diff -r 027fb21bdd5d -r b4e6b82fdb9e src/Tools/GraphBrowser/lib/Tools/browser
--- a/src/Tools/GraphBrowser/lib/Tools/browser	Fri Jul 16 12:59:10 2021 +0200
+++ b/src/Tools/GraphBrowser/lib/Tools/browser	Fri Jul 16 13:18:54 2021 +0200
@@ -65,7 +65,7 @@
 
 ## main
 
-isabelle_admin_build jars || exit $?
+isabelle_scala_build || exit $?
 
 if [ -n "$GRAPHFILE" ]; then
   PRIVATE_FILE="${ISABELLE_TMP:-${TMPDIR:-/tmp}}/$$"$(basename "$GRAPHFILE")
diff -r 027fb21bdd5d -r b4e6b82fdb9e src/Tools/jEdit/lib/Tools/jedit
--- a/src/Tools/jEdit/lib/Tools/jedit	Fri Jul 16 12:59:10 2021 +0200
+++ b/src/Tools/jEdit/lib/Tools/jedit	Fri Jul 16 13:18:54 2021 +0200
@@ -155,9 +155,9 @@
 ## main
 
 if [ -n "$FRESH_BUILD" ]; then
-  isabelle_admin_build jars_fresh || exit "$?"
+  isabelle_scala_build fresh || exit "$?"
 else
-  isabelle_admin_build jars || exit "$?"
+  isabelle_scala_build || exit "$?"
 fi
 
 if [ "$BUILD_ONLY" = false ]