updated for polyml-5.4.0;
authorwenzelm
Mon Jan 10 17:22:48 2011 +0100 (2011-01-10)
changeset 41495f8c11067e124
parent 41494 364f672d8827
child 41496 b2c1cd0bbcb9
updated for polyml-5.4.0;
discontinued old-fashioned POLY_HOME via path;
more robust handling of polyml-version, preferably provided by Poly/ML distribution itself;
etc/settings
lib/scripts/polyml-version
     1.1 --- a/etc/settings	Mon Jan 10 16:56:47 2011 +0100
     1.2 +++ b/etc/settings	Mon Jan 10 17:22:48 2011 +0100
     1.3 @@ -16,7 +16,6 @@
     1.4  # Only one of the sections below should be activated.
     1.5  
     1.6  # Poly/ML 5.x (automated settings)
     1.7 -POLY_HOME="$(type -p poly)"; [ -n "$POLY_HOME" ] && POLY_HOME="$(dirname "$POLY_HOME")"
     1.8  ML_PLATFORM="$ISABELLE_PLATFORM"
     1.9  ML_HOME="$(choosefrom \
    1.10    "$ISABELLE_HOME/contrib/polyml/$ML_PLATFORM" \
    1.11 @@ -24,22 +23,22 @@
    1.12    "/usr/local/polyml/$ML_PLATFORM" \
    1.13    "/usr/share/polyml/$ML_PLATFORM" \
    1.14    "/opt/polyml/$ML_PLATFORM" \
    1.15 -  "$POLY_HOME")"
    1.16 +  "")"
    1.17  ML_SYSTEM=$("$ISABELLE_HOME/lib/scripts/polyml-version")
    1.18  ML_OPTIONS="-H 200"
    1.19  ML_SOURCES="$ML_HOME/../src"
    1.20  
    1.21 -# Poly/ML 5.3.0
    1.22 +# Poly/ML 5.4.0
    1.23  #ML_PLATFORM=x86-linux
    1.24  #ML_HOME=/usr/local/polyml/x86-linux
    1.25 -#ML_SYSTEM=polyml-5.3.0
    1.26 +#ML_SYSTEM=polyml-5.4.0
    1.27  #ML_OPTIONS="-H 500"
    1.28  #ML_SOURCES="$ML_HOME/../src"
    1.29  
    1.30 -# Poly/ML 5.3.0 (64 bit)
    1.31 +# Poly/ML 5.4.0 (64 bit)
    1.32  #ML_PLATFORM=x86_64-linux
    1.33  #ML_HOME=/usr/local/polyml/x86_64-linux
    1.34 -#ML_SYSTEM=polyml-5.3.0
    1.35 +#ML_SYSTEM=polyml-5.4.0
    1.36  #ML_OPTIONS="-H 1000"
    1.37  #ML_SOURCES="$ML_HOME/../src"
    1.38  
     2.1 --- a/lib/scripts/polyml-version	Mon Jan 10 16:56:47 2011 +0100
     2.2 +++ b/lib/scripts/polyml-version	Mon Jan 10 17:22:48 2011 +0100
     2.3 @@ -2,7 +2,9 @@
     2.4  #
     2.5  # polyml-version --- determine Poly/ML runtime system version
     2.6  
     2.7 -if [ -x "$ML_HOME/poly" ]; then
     2.8 +if [ -x "$ML_HOME/polyml-version" ]; then
     2.9 +  "$ML_HOME/polyml-version"
    2.10 +elif [ -x "$ML_HOME/poly" ]; then
    2.11    VERSION="$(env \
    2.12      LD_LIBRARY_PATH="$ML_HOME:$ML_HOME/../lib:$LD_LIBRARY_PATH" \
    2.13      DYLD_LIBRARY_PATH="$ML_HOME:$ML_HOME/../lib:$DYLD_LIBRARY_PATH" \