Admin/build
changeset 34282 549969a7f582
parent 31831 92993da74973
child 34283 7911e83d06c0
     1.1 --- a/Admin/build	Wed Jan 06 18:22:43 2010 +0100
     1.2 +++ b/Admin/build	Wed Jan 06 20:00:22 2010 +0100
     1.3 @@ -2,21 +2,12 @@
     1.4  #
     1.5  # Administrative build for Isabelle source distribution.
     1.6  
     1.7 -## global environment
     1.8 -
     1.9 -#paranoia setting for sunbroy
    1.10 -PATH="/usr/local/dist/DIR/j2sdk1.5.0/bin:$PATH"
    1.11 -
    1.12 -PATH="/home/scala/current/bin:$PATH"
    1.13 -if [ -z "$SCALA_HOME" ]; then
    1.14 -  export SCALA_HOME="$(dirname "$(dirname "$(type -p scalac)")")"
    1.15 -fi
    1.16 -
    1.17 -
    1.18  ## directory layout
    1.19  
    1.20 -ISABELLE_HOME="$(cd "$(dirname "$0")"; cd "$(pwd -P)"; cd ..; pwd)"
    1.21 -ISABELLE_TOOL="$ISABELLE_HOME/bin/isabelle"
    1.22 +if [ -z "$ISABELLE_HOME" ]; then
    1.23 +  ISABELLE_HOME="$(cd "$(dirname "$0")"; cd "$(pwd -P)"; cd ..; pwd)"
    1.24 +  ISABELLE_TOOL="$ISABELLE_HOME/bin/isabelle"
    1.25 +fi
    1.26  
    1.27  
    1.28  ## diagnostics
    1.29 @@ -35,7 +26,7 @@
    1.30      all             all modules below
    1.31      browser         graph browser (requires jdk)
    1.32      doc             documentation (requires latex and rail)
    1.33 -    jars            Scala/JVM components (requires scala)
    1.34 +    jars            Scala/JVM components (requires scala in SCALA_HOME)
    1.35  
    1.36  EOF
    1.37    exit 1
    1.38 @@ -95,14 +86,8 @@
    1.39  
    1.40  function build_jars ()
    1.41  {
    1.42 -  echo "###"
    1.43 -  echo "### Building Scala/JVM components ..."
    1.44 -  echo "###"
    1.45 -
    1.46 -  [ -z "$SCALA_HOME" ] && fail "Scala unavailable: unknown SCALA_HOME"
    1.47 -
    1.48    pushd "$ISABELLE_HOME/src/Pure" >/dev/null
    1.49 -  "$ISABELLE_TOOL" make jars || fail "Failed to build isabelle-scala.jar"
    1.50 +  "$ISABELLE_TOOL" env ./mk-jars || fail "Failed."
    1.51    popd >/dev/null
    1.52  }
    1.53