eliminated traces of old Distribution directory;
authorwenzelm
Wed Dec 03 21:15:46 2008 +0100 (2008-12-03)
changeset 2895664754369cee3
parent 28955 0518f50e3b92
child 28957 da6c224a06e6
eliminated traces of old Distribution directory;
Admin/CHECKLIST
Admin/build
     1.1 --- a/Admin/CHECKLIST	Wed Dec 03 21:02:20 2008 +0100
     1.2 +++ b/Admin/CHECKLIST	Wed Dec 03 21:15:46 2008 +0100
     1.3 @@ -16,18 +16,17 @@
     1.4  - check ANNOUNCE, README, INSTALL, NEWS, COPYRIGHT, CONTRIBUTORS, ~isabelle/website;
     1.5  
     1.6  - maintain Docs:
     1.7 -    Doc/Dirs
     1.8 -    Distribution/doc/Contents
     1.9 +    doc-src/Dirs
    1.10 +    doc/Contents
    1.11  
    1.12  - maintain Logics:
    1.13      Admin/makedist
    1.14 -    Distribution/build
    1.15 -    Distribution/lib/Tools/makeall
    1.16 -    Distribution/lib/html/index.html
    1.17 -    Doc/Logics/intro.tex
    1.18 -    Doc/Logics/logics.tex
    1.19 +    build
    1.20 +    lib/Tools/makeall
    1.21 +    lib/html/index.html
    1.22 +    doc-src/Logics/intro.tex
    1.23 +    doc-src/Logics/logics.tex
    1.24  
    1.25  - after release: 
    1.26      commit new ~isabelle/website/include/documentationdist.include.html to website SVN
    1.27  
    1.28 -$Id$
     2.1 --- a/Admin/build	Wed Dec 03 21:02:20 2008 +0100
     2.2 +++ b/Admin/build	Wed Dec 03 21:15:46 2008 +0100
     2.3 @@ -1,7 +1,5 @@
     2.4  #!/usr/bin/env bash
     2.5  #
     2.6 -# $Id$
     2.7 -#
     2.8  # Administrative build for Isabelle source distribution.
     2.9  
    2.10  ## global environment
    2.11 @@ -14,19 +12,8 @@
    2.12  
    2.13  ## directory layout
    2.14  
    2.15 -ISABELLE_DIR="$(cd "$(dirname "$0")"; cd "$(pwd -P)"; cd ..; pwd)"
    2.16 -
    2.17 -if [ -d "$ISABELLE_DIR/Distribution" ]; then
    2.18 -  ISABELLE_TOOL="$ISABELLE_DIR/Distribution/bin/isabelle"
    2.19 -  ISABELLE_LIB="$ISABELLE_DIR/Distribution/lib"
    2.20 -  ISABELLE_SRC="$ISABELLE_DIR"
    2.21 -  ISABELLE_DOC_SRC="$ISABELLE_DIR/Doc"
    2.22 -else
    2.23 -  ISABELLE_TOOL="$ISABELLE_DIR/bin/isabelle"
    2.24 -  ISABELLE_LIB="$ISABELLE_DIR/lib"
    2.25 -  ISABELLE_SRC="$ISABELLE_DIR/src"
    2.26 -  ISABELLE_DOC_SRC="$ISABELLE_DIR/doc-src"
    2.27 -fi
    2.28 +ISABELLE_HOME="$(cd "$(dirname "$0")"; cd "$(pwd -P)"; cd ..; pwd)"
    2.29 +ISABELLE_TOOL="$ISABELLE_HOME/bin/isabelle"
    2.30  
    2.31  
    2.32  ## diagnostics
    2.33 @@ -81,7 +68,7 @@
    2.34    echo "### Building graph browser ..."
    2.35    echo "###"
    2.36  
    2.37 -  cd "$ISABELLE_LIB/browser"
    2.38 +  cd "$ISABELLE_HOME/lib/browser"
    2.39    make clean all || fail "Failed to build graph browser!"
    2.40  }
    2.41  
    2.42 @@ -92,7 +79,7 @@
    2.43    echo "### Building documentation ..."
    2.44    echo "###"
    2.45  
    2.46 -  cd "$ISABELLE_DOC_SRC"
    2.47 +  cd "$ISABELLE_HOME/doc-src"
    2.48    for DOC in $(cat Dirs)
    2.49    do
    2.50      pushd "$DOC" >/dev/null
    2.51 @@ -111,12 +98,12 @@
    2.52  
    2.53    type -p scalac >/dev/null || fail "Scala compiler unavailable"
    2.54  
    2.55 -  pushd "$ISABELLE_SRC/Pure" >/dev/null
    2.56 +  pushd "$ISABELLE_HOME/src/Pure" >/dev/null
    2.57    "$ISABELLE_TOOL" make jar || fail "Failed to build Pure.jar!"
    2.58    popd >/dev/null
    2.59  
    2.60    if [ -d "$HOME/lib/jedit/current" ]; then
    2.61 -    pushd "$ISABELLE_LIB/jedit/plugin" >/dev/null
    2.62 +    pushd "$ISABELLE_HOME/lib/jedit/plugin" >/dev/null
    2.63      ./mk
    2.64      [ -f ../isabelle.jar ] || fail "Failed to build jEdit plugin!"
    2.65      popd >/dev/null