# HG changeset patch
# User wenzelm
# Date 1307719823 -7200
# Node ID 07889e32bc58ad2305c5f39ba6dd52185eaf78ec
# Parent  2dee03f192b75f8d4416abeba297b90a2a0aceab
makedist -j: build Isabelle/jEdit via given jedit_build component;

diff -r 2dee03f192b7 -r 07889e32bc58 Admin/makedist
--- a/Admin/makedist	Fri Jun 10 15:42:21 2011 +0200
+++ b/Admin/makedist	Fri Jun 10 17:30:23 2011 +0200
@@ -24,6 +24,7 @@
 Usage: $PRG [OPTIONS] [VERSION]
 
   Options are:
+    -j JEDIT_BUILD     build Isabelle/jEdit via given jedit_build component
     -r RELEASE         proper release with name"
 
   Make Isabelle distribution from the main Mercurial repository at TUM.
@@ -47,10 +48,14 @@
 # options
 
 RELEASE=""
+ISABELLE_JEDIT_BUILD_HOME=""
 
-while getopts "r:" OPT
+while getopts "j:r:" OPT
 do
   case "$OPT" in
+    j)
+      ISABELLE_JEDIT_BUILD_HOME="$OPTARG"
+      ;;
     r)
       RELEASE="$OPTARG"
       ;;
@@ -136,6 +141,15 @@
 find . -print | xargs chmod -f u+rw
 
 ./Admin/build all || fail "Failed to build distribution"
+
+if [ -n "$ISABELLE_JEDIT_BUILD_HOME" ]; then
+  [ -d "$ISABELLE_JEDIT_BUILD_HOME" ] || fail "Bad jedit_build component directory: \"$ISABELLE_JEDIT_BUILD_HOME\""
+  eval "$(fgrep ISABELLE_JEDIT_BUILD_VERSION "$ISABELLE_JEDIT_BUILD_HOME/etc/settings")"
+  [ -n "$ISABELLE_JEDIT_BUILD_VERSION" ] || fail "Bad ISABELLE_JEDIT_BUILD_VERSION"
+  export ISABELLE_JEDIT_BUILD_HOME ISABELLE_JEDIT_BUILD_VERSION
+  ./bin/isabelle jedit -b || fail "Failed to build Isabelle/jEdit"
+fi
+
 rm -rf Admin
 
 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')