Admin/build
changeset 31831 92993da74973
parent 29186 3d25e96ceb98
child 34282 549969a7f582
     1.1 --- a/Admin/build	Sun Jun 28 17:42:22 2009 +0200
     1.2 +++ b/Admin/build	Sun Jun 28 17:55:44 2009 +0200
     1.3 @@ -8,6 +8,9 @@
     1.4  PATH="/usr/local/dist/DIR/j2sdk1.5.0/bin:$PATH"
     1.5  
     1.6  PATH="/home/scala/current/bin:$PATH"
     1.7 +if [ -z "$SCALA_HOME" ]; then
     1.8 +  export SCALA_HOME="$(dirname "$(dirname "$(type -p scalac)")")"
     1.9 +fi
    1.10  
    1.11  
    1.12  ## directory layout
    1.13 @@ -32,7 +35,7 @@
    1.14      all             all modules below
    1.15      browser         graph browser (requires jdk)
    1.16      doc             documentation (requires latex and rail)
    1.17 -    jars            JVM components (requires jdk and scala)
    1.18 +    jars            Scala/JVM components (requires scala)
    1.19  
    1.20  EOF
    1.21    exit 1
    1.22 @@ -93,13 +96,13 @@
    1.23  function build_jars ()
    1.24  {
    1.25    echo "###"
    1.26 -  echo "### Building JVM components ..."
    1.27 +  echo "### Building Scala/JVM components ..."
    1.28    echo "###"
    1.29  
    1.30 -  type -p scalac >/dev/null || fail "Scala compiler unavailable"
    1.31 +  [ -z "$SCALA_HOME" ] && fail "Scala unavailable: unknown SCALA_HOME"
    1.32  
    1.33    pushd "$ISABELLE_HOME/src/Pure" >/dev/null
    1.34 -  "$ISABELLE_TOOL" make jar || fail "Failed to build Pure.jar!"
    1.35 +  "$ISABELLE_TOOL" make jars || fail "Failed to build isabelle-scala.jar"
    1.36    popd >/dev/null
    1.37  }
    1.38