# HG changeset patch
# User wenzelm
# Date 1201127723 -3600
# Node ID 850b4c2d0f178764a2aadda76e5fb67a5a42ccf7
# Parent  aa65ada6f0952f539a173c8fb35e32d4a67d5ccb
reactivated mk of java/scala sources, with paranoia PATH setting for sunbroy;

diff -r aa65ada6f095 -r 850b4c2d0f17 Admin/makedist
--- a/Admin/makedist	Wed Jan 23 22:57:11 2008 +0100
+++ b/Admin/makedist	Wed Jan 23 23:35:23 2008 +0100
@@ -178,19 +178,23 @@
 mv Distribution/* .
 rmdir Distribution
 
+
+#paranoia setting for sunbroy
+PATH=/usr/local/dist/DIR/j2sdk1.5.0/bin:$PATH
+
 ( cd lib/browser; make; ) || fail "Failed to build graph browser!"
 
-# FIXME temporarily disabled, until isatest gets up-to-date java
-#( cd lib/classes; ./mk; )
-#[ -f lib/classes/isabelle.jar ] || fail "Failed to build Isabelle process wrapper!"
-#
-#if type -p scalac >/dev/null
-#then
-#  ( cd lib/jedit/plugin; ./mk; )
-#  [ -f lib/jedit/isabelle.jar ] || fail "Failed to build jEdit plugin!"
-#else
-#  echo "Warning: Scala unavailable -- skipping jEdit plugin"
-#fi
+( cd lib/classes; ./mk; )
+[ -f lib/classes/isabelle.jar ] || fail "Failed to build Isabelle process wrapper!"
+
+if type -p scalac >/dev/null
+then
+  ( cd lib/jedit/plugin; ./mk; )
+  [ -f lib/jedit/isabelle.jar ] || fail "Failed to build jEdit plugin!"
+else
+  echo "Warning: Scala unavailable -- skipping jEdit plugin"
+fi
+
 
 cp doc/isabelle*.eps lib/logo