more formal isabelle_admin_build;
authorwenzelm
Tue Jun 25 11:41:16 2013 +0200 (2013-06-25)
changeset 52443725916b7dee5
parent 52442 d3c5195b7399
child 52444 2cfe6656d6d6
more formal isabelle_admin_build;
tuned;
Admin/lib/Tools/update_keywords
lib/Tools/browser
lib/Tools/build
lib/Tools/build_dialog
lib/Tools/keywords
lib/Tools/options
lib/Tools/scala
lib/Tools/scalac
lib/scripts/getsettings
src/Tools/Graphview/lib/Tools/graphview
     1.1 --- a/Admin/lib/Tools/update_keywords	Tue Jun 25 11:26:15 2013 +0200
     1.2 +++ b/Admin/lib/Tools/update_keywords	Tue Jun 25 11:41:16 2013 +0200
     1.3 @@ -4,7 +4,7 @@
     1.4  #
     1.5  # DESCRIPTION: update standard keyword files for Emacs Proof General
     1.6  
     1.7 -[ -e "$ISABELLE_HOME/Admin/build" ] && { "$ISABELLE_HOME/Admin/build" jars || exit $?; }
     1.8 +isabelle_admin_build jars || exit $?
     1.9  
    1.10  declare -a JAVA_ARGS; eval "JAVA_ARGS=($ISABELLE_BUILD_JAVA_OPTIONS)"
    1.11  
     2.1 --- a/lib/Tools/browser	Tue Jun 25 11:26:15 2013 +0200
     2.2 +++ b/lib/Tools/browser	Tue Jun 25 11:41:16 2013 +0200
     2.3 @@ -65,7 +65,7 @@
     2.4  
     2.5  ## main
     2.6  
     2.7 -[ -e "$ISABELLE_HOME/Admin/build" ] && { "$ISABELLE_HOME/Admin/build" browser || exit $?; }
     2.8 +isabelle_admin_build browser || exit $?
     2.9  
    2.10  classpath "$ISABELLE_HOME/lib/browser/GraphBrowser.jar"
    2.11  
     3.1 --- a/lib/Tools/build	Tue Jun 25 11:26:15 2013 +0200
     3.2 +++ b/lib/Tools/build	Tue Jun 25 11:41:16 2013 +0200
     3.3 @@ -128,7 +128,7 @@
     3.4  
     3.5  ## main
     3.6  
     3.7 -[ -e "$ISABELLE_HOME/Admin/build" ] && { "$ISABELLE_HOME/Admin/build" jars || exit $?; }
     3.8 +isabelle_admin_build jars || exit $?
     3.9  
    3.10  if [ "$NO_BUILD" = false -a "$VERBOSE" = true ]; then
    3.11    echo "Started at $(date) ($ML_IDENTIFIER on $(hostname))"
     4.1 --- a/lib/Tools/build_dialog	Tue Jun 25 11:26:15 2013 +0200
     4.2 +++ b/lib/Tools/build_dialog	Tue Jun 25 11:41:16 2013 +0200
     4.3 @@ -70,7 +70,7 @@
     4.4  
     4.5  ## main
     4.6  
     4.7 -[ -e "$ISABELLE_HOME/Admin/build" ] && { "$ISABELLE_HOME/Admin/build" jars || exit $?; }
     4.8 +isabelle_admin_build jars || exit $?
     4.9  
    4.10  "$ISABELLE_TOOL" java isabelle.Build_Dialog \
    4.11    "$LOGIC_OPTION" "$LOGIC" "$SYSTEM_MODE" "${INCLUDE_DIRS[@]}"
     5.1 --- a/lib/Tools/keywords	Tue Jun 25 11:26:15 2013 +0200
     5.2 +++ b/lib/Tools/keywords	Tue Jun 25 11:41:16 2013 +0200
     5.3 @@ -51,7 +51,7 @@
     5.4  
     5.5  ## main
     5.6  
     5.7 -[ -e "$ISABELLE_HOME/Admin/build" ] && { "$ISABELLE_HOME/Admin/build" jars || exit $?; }
     5.8 +isabelle_admin_build jars || exit $?
     5.9  
    5.10  declare -a JAVA_ARGS; eval "JAVA_ARGS=($ISABELLE_BUILD_JAVA_OPTIONS)"
    5.11  
     6.1 --- a/lib/Tools/options	Tue Jun 25 11:26:15 2013 +0200
     6.2 +++ b/lib/Tools/options	Tue Jun 25 11:41:16 2013 +0200
     6.3 @@ -63,7 +63,7 @@
     6.4  
     6.5  ## main
     6.6  
     6.7 -[ -e "$ISABELLE_HOME/Admin/build" ] && { "$ISABELLE_HOME/Admin/build" jars || exit $?; }
     6.8 +isabelle_admin_build jars || exit $?
     6.9  
    6.10  exec "$ISABELLE_TOOL" java isabelle.Options "$EXPORT_FILE" "${BUILD_OPTIONS[@]}" "$@"
    6.11  
     7.1 --- a/lib/Tools/scala	Tue Jun 25 11:26:15 2013 +0200
     7.2 +++ b/lib/Tools/scala	Tue Jun 25 11:41:16 2013 +0200
     7.3 @@ -4,7 +4,7 @@
     7.4  #
     7.5  # DESCRIPTION: invoke Scala within the Isabelle environment
     7.6  
     7.7 -[ -e "$ISABELLE_HOME/Admin/build" ] && { "$ISABELLE_HOME/Admin/build" jars || exit $?; }
     7.8 +isabelle_admin_build jars || exit $?
     7.9  
    7.10  CLASSPATH="$(jvmpath "$CLASSPATH")"
    7.11  isabelle_scala scala -Dfile.encoding=UTF-8 \
     8.1 --- a/lib/Tools/scalac	Tue Jun 25 11:26:15 2013 +0200
     8.2 +++ b/lib/Tools/scalac	Tue Jun 25 11:41:16 2013 +0200
     8.3 @@ -4,7 +4,7 @@
     8.4  #
     8.5  # DESCRIPTION: invoke Scala compiler within the Isabelle environment
     8.6  
     8.7 -[ -e "$ISABELLE_HOME/Admin/build" ] && { "$ISABELLE_HOME/Admin/build" jars || exit $?; }
     8.8 +isabelle_admin_build jars || exit $?
     8.9  
    8.10  CLASSPATH="$(jvmpath "$CLASSPATH")"
    8.11  isabelle_scala scalac -Dfile.encoding=UTF-8 \
     9.1 --- a/lib/scripts/getsettings	Tue Jun 25 11:26:15 2013 +0200
     9.2 +++ b/lib/scripts/getsettings	Tue Jun 25 11:41:16 2013 +0200
     9.3 @@ -60,7 +60,8 @@
     9.4  unset BASH_ENV
     9.5  
     9.6  #shared library convenience
     9.7 -function librarypath () {
     9.8 +function librarypath ()
     9.9 +{
    9.10    for X in "$@"
    9.11    do
    9.12      case "$ISABELLE_PLATFORM" in
    9.13 @@ -85,7 +86,8 @@
    9.14  }
    9.15  
    9.16  #robust invocation via ISABELLE_JDK_HOME
    9.17 -function isabelle_jdk () {
    9.18 +function isabelle_jdk ()
    9.19 +{
    9.20    if [ -z "$ISABELLE_JDK_HOME" ]; then
    9.21      echo "Unknown ISABELLE_JDK_HOME -- Java tools unavailable" >&2
    9.22      return 127
    9.23 @@ -96,7 +98,8 @@
    9.24  }
    9.25  
    9.26  #robust invocation via SCALA_HOME
    9.27 -function isabelle_scala () {
    9.28 +function isabelle_scala ()
    9.29 +{
    9.30    if [ -z "$ISABELLE_JDK_HOME" ]; then
    9.31      echo "Unknown ISABELLE_JDK_HOME -- Java tools unavailable" >&2
    9.32      return 127
    9.33 @@ -109,8 +112,19 @@
    9.34    fi
    9.35  }
    9.36  
    9.37 +#administrative build
    9.38 +if [ -e "$ISABELLE_HOME/Admin/build" ]; then
    9.39 +  function isabelle_admin_build ()
    9.40 +  {
    9.41 +    "$ISABELLE_HOME/Admin/build" "$@"
    9.42 +  }
    9.43 +else
    9.44 +  function isabelle_admin_build () { return 0; }
    9.45 +fi
    9.46 +
    9.47  #CLASSPATH convenience
    9.48 -function classpath () {
    9.49 +function classpath ()
    9.50 +{
    9.51    for X in "$@"
    9.52    do
    9.53      if [ -z "$CLASSPATH" ]; then
    10.1 --- a/src/Tools/Graphview/lib/Tools/graphview	Tue Jun 25 11:26:15 2013 +0200
    10.2 +++ b/src/Tools/Graphview/lib/Tools/graphview	Tue Jun 25 11:41:16 2013 +0200
    10.3 @@ -90,8 +90,7 @@
    10.4  
    10.5  ## build
    10.6  
    10.7 -[ -e "$ISABELLE_HOME/Admin/build" ] && \
    10.8 -  { "$ISABELLE_HOME/Admin/build" "$BUILD_JARS" || exit $?; }
    10.9 +isabelle_admin_build "$BUILD_JARS" || exit $?
   10.10  
   10.11  pushd "$GRAPHVIEW_HOME" >/dev/null || failed
   10.12