merged
authorwenzelm
Wed May 14 13:36:35 2014 +0200 (2014-05-14)
changeset 56963d0e04fdf4276
parent 56957 23a9cb098ccb
parent 56962 9c2ca698690e
child 56964 5bee93b2020d
merged
Admin/polyml/polyml
     1.1 --- a/Admin/components/components.sha1	Wed May 14 11:37:48 2014 +0200
     1.2 +++ b/Admin/components/components.sha1	Wed May 14 13:36:35 2014 +0200
     1.3 @@ -58,6 +58,7 @@
     1.4  1812e9fa6d163f63edb93e37d1217640a166cf3e  polyml-5.5.0.tar.gz
     1.5  36f5b8224f484721749682a3655c796a55a2718d  polyml-5.5.1-1.tar.gz
     1.6  36f78f27291a9ceb13bf1120b62a45625afd44a6  polyml-5.5.1.tar.gz
     1.7 +532f6e8814752aeb406c62fabcfd2cc05f8a7ca8  polyml-5.5.2.tar.gz
     1.8  8ee375cfc38972f080dbc78f07b68dac03efe968  ProofGeneral-3.7.1.1.tar.gz
     1.9  847b52c0676b5eb0fbf0476f64fc08c2d72afd0c  ProofGeneral-4.1.tar.gz
    1.10  8e0b2b432755ef11d964e20637d1bc567d1c0477  ProofGeneral-4.2-1.tar.gz
     2.1 --- a/Admin/components/main	Wed May 14 11:37:48 2014 +0200
     2.2 +++ b/Admin/components/main	Wed May 14 13:36:35 2014 +0200
     2.3 @@ -8,7 +8,7 @@
     2.4  jfreechart-1.0.14-1
     2.5  jortho-1.0-2
     2.6  kodkodi-1.5.2
     2.7 -polyml-5.5.1-1
     2.8 +polyml-5.5.2
     2.9  scala-2.11.0
    2.10  spass-3.8ds
    2.11  z3-3.2-1
     3.1 --- a/Admin/isatest/settings/mac-poly-M4	Wed May 14 11:37:48 2014 +0200
     3.2 +++ b/Admin/isatest/settings/mac-poly-M4	Wed May 14 13:36:35 2014 +0200
     3.3 @@ -2,8 +2,8 @@
     3.4  
     3.5  init_components /home/isabelle/contrib "$HOME/admin/components/main"
     3.6  
     3.7 -  POLYML_HOME="/home/polyml/polyml-5.5.1"
     3.8 -  ML_SYSTEM="polyml-5.5.1"
     3.9 +  POLYML_HOME="/home/polyml/polyml-5.5.2"
    3.10 +  ML_SYSTEM="polyml-5.5.2"
    3.11    ML_PLATFORM="x86-darwin"
    3.12    ML_HOME="$POLYML_HOME/$ML_PLATFORM"
    3.13    ML_OPTIONS="-H 500 --gcthreads 4"
     4.1 --- a/Admin/isatest/settings/mac-poly-M8	Wed May 14 11:37:48 2014 +0200
     4.2 +++ b/Admin/isatest/settings/mac-poly-M8	Wed May 14 13:36:35 2014 +0200
     4.3 @@ -2,8 +2,8 @@
     4.4  
     4.5  init_components /home/isabelle/contrib "$HOME/admin/components/main"
     4.6  
     4.7 -  POLYML_HOME="/home/polyml/polyml-5.5.1"
     4.8 -  ML_SYSTEM="polyml-5.5.1"
     4.9 +  POLYML_HOME="/home/polyml/polyml-5.5.2"
    4.10 +  ML_SYSTEM="polyml-5.5.2"
    4.11    ML_PLATFORM="x86-darwin"
    4.12    ML_HOME="$POLYML_HOME/$ML_PLATFORM"
    4.13    ML_OPTIONS="-H 500 --gcthreads 8"
     5.1 --- a/Admin/polyml/CHECKLIST	Wed May 14 11:37:48 2014 +0200
     5.2 +++ b/Admin/polyml/CHECKLIST	Wed May 14 13:36:35 2014 +0200
     5.3 @@ -11,7 +11,5 @@
     5.4  
     5.5  * include sha1 source and binary for each platform
     5.6  
     5.7 -* copy polyml script for each platform
     5.8 -
     5.9  * linux: include copy of libgmp.so with symlinks from build host
    5.10  
     6.1 --- a/Admin/polyml/README	Wed May 14 11:37:48 2014 +0200
     6.2 +++ b/Admin/polyml/README	Wed May 14 13:36:35 2014 +0200
     6.3 @@ -1,8 +1,8 @@
     6.4  Poly/ML for Isabelle
     6.5  ====================
     6.6  
     6.7 -This compilation of Poly/ML 5.5.1 (http://www.polyml.org) is based on the
     6.8 -official source distribution polyml.5.5.1.tar.gz from
     6.9 +This compilation of Poly/ML 5.5.2 (http://www.polyml.org) is based on the
    6.10 +official source distribution polyml.5.5.2.tar.gz from
    6.11  http://sourceforge.net/projects/polyml/.
    6.12  
    6.13  The included build script is used like this:
    6.14 @@ -18,4 +18,4 @@
    6.15  
    6.16  
    6.17  	Makarius
    6.18 -	17-Sep-2013
    6.19 +	14-May-2014
     7.1 --- a/Admin/polyml/build	Wed May 14 11:37:48 2014 +0200
     7.2 +++ b/Admin/polyml/build	Wed May 14 13:36:35 2014 +0200
     7.3 @@ -69,9 +69,6 @@
     7.4    x86_64-windows)
     7.5      OPTIONS=()
     7.6      ;;
     7.7 -  ppc-darwin | sparc-solaris | x86-solaris | x86-bsd)
     7.8 -    OPTIONS=()
     7.9 -    ;;
    7.10    *)
    7.11      fail "Bad platform identifier: \"$TARGET\""
    7.12      ;;
     8.1 --- a/Admin/polyml/polyml	Wed May 14 11:37:48 2014 +0200
     8.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     8.3 @@ -1,11 +0,0 @@
     8.4 -#!/usr/bin/env bash
     8.5 -#
     8.6 -# Minimal Poly/ML startup script
     8.7 -
     8.8 -THIS="$(cd "$(dirname "$0")"; pwd)"
     8.9 -
    8.10 -export LD_LIBRARY_PATH="$THIS:$LD_LIBRARY_PATH"
    8.11 -export DYLD_LIBRARY_PATH="$THIS:$DYLD_LIBRARY_PATH"
    8.12 -
    8.13 -exec "$THIS/poly" "$@"
    8.14 -
     9.1 --- a/Admin/polyml/settings	Wed May 14 11:37:48 2014 +0200
     9.2 +++ b/Admin/polyml/settings	Wed May 14 13:36:35 2014 +0200
     9.3 @@ -5,7 +5,7 @@
     9.4  
     9.5  # basic settings
     9.6  
     9.7 -#ML_SYSTEM=polyml-5.5.1
     9.8 +#ML_SYSTEM=polyml-5.5.2
     9.9  #ML_PLATFORM="$ISABELLE_PLATFORM32"
    9.10  #ML_HOME="$POLYML_HOME/$ML_PLATFORM"
    9.11  #ML_OPTIONS="-H 500"
    9.12 @@ -14,7 +14,7 @@
    9.13  
    9.14  # smart settings
    9.15  
    9.16 -ML_SYSTEM=polyml-5.5.1
    9.17 +ML_SYSTEM=polyml-5.5.2
    9.18  
    9.19  case "$ISABELLE_PLATFORM" in
    9.20    *-linux)
    10.1 --- a/src/Tools/jEdit/src/jEdit.props	Wed May 14 11:37:48 2014 +0200
    10.2 +++ b/src/Tools/jEdit/src/jEdit.props	Wed May 14 13:36:35 2014 +0200
    10.3 @@ -189,7 +189,6 @@
    10.4  isabelle-output.width=412
    10.5  isabelle-query.dock-position=bottom
    10.6  isabelle-simplifier-trace.dock-position=bottom
    10.7 -isabelle-sledgehammer.dock-position=bottom
    10.8  isabelle-symbols.dock-position=bottom
    10.9  isabelle-theories.dock-position=right
   10.10  isabelle.complete.label=Complete Isabelle text