--- a/Admin/components/components.sha1 Wed May 14 11:37:48 2014 +0200
+++ b/Admin/components/components.sha1 Wed May 14 13:36:35 2014 +0200
@@ -58,6 +58,7 @@
1812e9fa6d163f63edb93e37d1217640a166cf3e polyml-5.5.0.tar.gz
36f5b8224f484721749682a3655c796a55a2718d polyml-5.5.1-1.tar.gz
36f78f27291a9ceb13bf1120b62a45625afd44a6 polyml-5.5.1.tar.gz
+532f6e8814752aeb406c62fabcfd2cc05f8a7ca8 polyml-5.5.2.tar.gz
8ee375cfc38972f080dbc78f07b68dac03efe968 ProofGeneral-3.7.1.1.tar.gz
847b52c0676b5eb0fbf0476f64fc08c2d72afd0c ProofGeneral-4.1.tar.gz
8e0b2b432755ef11d964e20637d1bc567d1c0477 ProofGeneral-4.2-1.tar.gz
--- a/Admin/components/main Wed May 14 11:37:48 2014 +0200
+++ b/Admin/components/main Wed May 14 13:36:35 2014 +0200
@@ -8,7 +8,7 @@
jfreechart-1.0.14-1
jortho-1.0-2
kodkodi-1.5.2
-polyml-5.5.1-1
+polyml-5.5.2
scala-2.11.0
spass-3.8ds
z3-3.2-1
--- a/Admin/isatest/settings/mac-poly-M4 Wed May 14 11:37:48 2014 +0200
+++ b/Admin/isatest/settings/mac-poly-M4 Wed May 14 13:36:35 2014 +0200
@@ -2,8 +2,8 @@
init_components /home/isabelle/contrib "$HOME/admin/components/main"
- POLYML_HOME="/home/polyml/polyml-5.5.1"
- ML_SYSTEM="polyml-5.5.1"
+ POLYML_HOME="/home/polyml/polyml-5.5.2"
+ ML_SYSTEM="polyml-5.5.2"
ML_PLATFORM="x86-darwin"
ML_HOME="$POLYML_HOME/$ML_PLATFORM"
ML_OPTIONS="-H 500 --gcthreads 4"
--- a/Admin/isatest/settings/mac-poly-M8 Wed May 14 11:37:48 2014 +0200
+++ b/Admin/isatest/settings/mac-poly-M8 Wed May 14 13:36:35 2014 +0200
@@ -2,8 +2,8 @@
init_components /home/isabelle/contrib "$HOME/admin/components/main"
- POLYML_HOME="/home/polyml/polyml-5.5.1"
- ML_SYSTEM="polyml-5.5.1"
+ POLYML_HOME="/home/polyml/polyml-5.5.2"
+ ML_SYSTEM="polyml-5.5.2"
ML_PLATFORM="x86-darwin"
ML_HOME="$POLYML_HOME/$ML_PLATFORM"
ML_OPTIONS="-H 500 --gcthreads 8"
--- a/Admin/polyml/CHECKLIST Wed May 14 11:37:48 2014 +0200
+++ b/Admin/polyml/CHECKLIST Wed May 14 13:36:35 2014 +0200
@@ -11,7 +11,5 @@
* include sha1 source and binary for each platform
-* copy polyml script for each platform
-
* linux: include copy of libgmp.so with symlinks from build host
--- a/Admin/polyml/README Wed May 14 11:37:48 2014 +0200
+++ b/Admin/polyml/README Wed May 14 13:36:35 2014 +0200
@@ -1,8 +1,8 @@
Poly/ML for Isabelle
====================
-This compilation of Poly/ML 5.5.1 (http://www.polyml.org) is based on the
-official source distribution polyml.5.5.1.tar.gz from
+This compilation of Poly/ML 5.5.2 (http://www.polyml.org) is based on the
+official source distribution polyml.5.5.2.tar.gz from
http://sourceforge.net/projects/polyml/.
The included build script is used like this:
@@ -18,4 +18,4 @@
Makarius
- 17-Sep-2013
+ 14-May-2014
--- a/Admin/polyml/build Wed May 14 11:37:48 2014 +0200
+++ b/Admin/polyml/build Wed May 14 13:36:35 2014 +0200
@@ -69,9 +69,6 @@
x86_64-windows)
OPTIONS=()
;;
- ppc-darwin | sparc-solaris | x86-solaris | x86-bsd)
- OPTIONS=()
- ;;
*)
fail "Bad platform identifier: \"$TARGET\""
;;
--- a/Admin/polyml/polyml Wed May 14 11:37:48 2014 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-#!/usr/bin/env bash
-#
-# Minimal Poly/ML startup script
-
-THIS="$(cd "$(dirname "$0")"; pwd)"
-
-export LD_LIBRARY_PATH="$THIS:$LD_LIBRARY_PATH"
-export DYLD_LIBRARY_PATH="$THIS:$DYLD_LIBRARY_PATH"
-
-exec "$THIS/poly" "$@"
-
--- a/Admin/polyml/settings Wed May 14 11:37:48 2014 +0200
+++ b/Admin/polyml/settings Wed May 14 13:36:35 2014 +0200
@@ -5,7 +5,7 @@
# basic settings
-#ML_SYSTEM=polyml-5.5.1
+#ML_SYSTEM=polyml-5.5.2
#ML_PLATFORM="$ISABELLE_PLATFORM32"
#ML_HOME="$POLYML_HOME/$ML_PLATFORM"
#ML_OPTIONS="-H 500"
@@ -14,7 +14,7 @@
# smart settings
-ML_SYSTEM=polyml-5.5.1
+ML_SYSTEM=polyml-5.5.2
case "$ISABELLE_PLATFORM" in
*-linux)
--- a/src/Tools/jEdit/src/jEdit.props Wed May 14 11:37:48 2014 +0200
+++ b/src/Tools/jEdit/src/jEdit.props Wed May 14 13:36:35 2014 +0200
@@ -189,7 +189,6 @@
isabelle-output.width=412
isabelle-query.dock-position=bottom
isabelle-simplifier-trace.dock-position=bottom
-isabelle-sledgehammer.dock-position=bottom
isabelle-symbols.dock-position=bottom
isabelle-theories.dock-position=right
isabelle.complete.label=Complete Isabelle text