# HG changeset patch # User wenzelm # Date 1246203742 -7200 # Node ID 4c721440ee620dad9447ebc7046e9c12680aa761 # Parent 6906e114c898708429c96ba9b24272bf06c01c07 produce self-contained isabelle-scala.jar; diff -r 6906e114c898 -r 4c721440ee62 src/Pure/IsaMakefile --- a/src/Pure/IsaMakefile Sun Jun 28 16:59:43 2009 +0200 +++ b/src/Pure/IsaMakefile Sun Jun 28 17:42:22 2009 +0200 @@ -128,6 +128,7 @@ SCALA_TARGET = $(ISABELLE_HOME)/lib/classes/Pure.jar +ISABELLE_SCALA = $(ISABELLE_HOME)/lib/classes/isabelle-scala.jar jar: $(SCALA_TARGET) @@ -137,8 +138,11 @@ scaladoc -d classes $(SCALA_FILES) @cp $(SCALA_FILES) classes/isabelle @mkdir -p `dirname $@` - @cd classes; jar cfe `jvmpath $@` isabelle.GUI_Setup isabelle + cd classes; jar cfe `jvmpath $@` isabelle.GUI_Setup isabelle + cd classes; jar xf `jvmpath $(SCALA_HOME)/lib/scala-swing.jar`; \ + cp $(SCALA_HOME)/lib/scala-library.jar $(ISABELLE_SCALA); \ + jar ufe `jvmpath $(ISABELLE_SCALA)` isabelle.GUI_Setup isabelle scala @rm -rf classes clean-jar: - @rm -f $(SCALA_TARGET) + @rm -f $(SCALA_TARGET) $(ISABELLE_SCALA)