unconditional jedit_build;
authorwenzelm
Wed, 09 Jan 2013 22:28:28 +0100
changeset 50797 6b45a1568637
parent 50796 2d68df7ed89d
child 50798 0ddc85dae1d5
unconditional jedit_build; less intrusive build_doc;
Admin/lib/Tools/makedist
--- a/Admin/lib/Tools/makedist	Wed Jan 09 22:24:31 2013 +0100
+++ b/Admin/lib/Tools/makedist	Wed Jan 09 22:28:28 2013 +0100
@@ -170,17 +170,14 @@
 ./bin/isabelle env ISABELLE_SCALA_BUILD_OPTIONS="$ISABELLE_SCALA_BUILD_OPTIONS -optimise" \
   ./Admin/build all || fail "Failed to build distribution"
 
-if [ -n "$ISABELLE_JEDIT_BUILD_HOME" ]; then
-  ./bin/isabelle env ISABELLE_SCALA_BUILD_OPTIONS="$ISABELLE_SCALA_BUILD_OPTIONS -optimise" \
-    ./bin/isabelle jedit -b || fail "Failed to build Isabelle/jEdit"
-else
-  echo "### Missing jEdit build component"
-fi
+./bin/isabelle env ISABELLE_SCALA_BUILD_OPTIONS="$ISABELLE_SCALA_BUILD_OPTIONS -optimise" \
+  ./bin/isabelle jedit -b || fail "Failed to build Isabelle/jEdit"
 
-cp -a src/Doc src/Doc.orig
-./bin/isabelle env ./bin/isabelle build_doc $JOBS -a || fail "Failed to build documentation"
-rm -rf src/Doc
-mv src/Doc.orig src/Doc
+cp -a src src.orig
+env ISABELLE_IDENTIFIER="${DISTNAME}-build" \
+  ./bin/isabelle build_doc $JOBS -a || fail "Failed to build documentation"
+rm -rf src
+mv src.orig src
 
 rm -rf Admin