1.1 --- a/Admin/makedist	Fri Jun 10 15:42:21 2011 +0200
     1.2 +++ b/Admin/makedist	Fri Jun 10 17:30:23 2011 +0200
     1.3 @@ -24,6 +24,7 @@
     1.4  Usage: $PRG [OPTIONS] [VERSION]
     1.5  
     1.6    Options are:
     1.7 +    -j JEDIT_BUILD     build Isabelle/jEdit via given jedit_build component
     1.8      -r RELEASE         proper release with name"
     1.9  
    1.10    Make Isabelle distribution from the main Mercurial repository at TUM.
    1.11 @@ -47,10 +48,14 @@
    1.12  # options
    1.13  
    1.14  RELEASE=""
    1.15 +ISABELLE_JEDIT_BUILD_HOME=""
    1.16  
    1.17 -while getopts "r:" OPT
    1.18 +while getopts "j:r:" OPT
    1.19  do
    1.20    case "$OPT" in
    1.21 +    j)
    1.22 +      ISABELLE_JEDIT_BUILD_HOME="$OPTARG"
    1.23 +      ;;
    1.24      r)
    1.25        RELEASE="$OPTARG"
    1.26        ;;
    1.27 @@ -136,6 +141,15 @@
    1.28  find . -print | xargs chmod -f u+rw
    1.29  
    1.30  ./Admin/build all || fail "Failed to build distribution"
    1.31 +
    1.32 +if [ -n "$ISABELLE_JEDIT_BUILD_HOME" ]; then
    1.33 +  [ -d "$ISABELLE_JEDIT_BUILD_HOME" ] || fail "Bad jedit_build component directory: \"$ISABELLE_JEDIT_BUILD_HOME\""
    1.34 +  eval "$(fgrep ISABELLE_JEDIT_BUILD_VERSION "$ISABELLE_JEDIT_BUILD_HOME/etc/settings")"
    1.35 +  [ -n "$ISABELLE_JEDIT_BUILD_VERSION" ] || fail "Bad ISABELLE_JEDIT_BUILD_VERSION"
    1.36 +  export ISABELLE_JEDIT_BUILD_HOME ISABELLE_JEDIT_BUILD_VERSION
    1.37 +  ./bin/isabelle jedit -b || fail "Failed to build Isabelle/jEdit"
    1.38 +fi
    1.39 +
    1.40  rm -rf Admin
    1.41  
    1.42  MOVE=$(find doc-src \( -type f -a -not -type l -a -not -name isabelle_isar.pdf -a -not -name pghead.pdf -a \( -name \*.dvi -o -name \*.eps -o -name \*.ps -o -name \*.pdf \) -a -print \) | grep -v 'gfx/.*pdf')