basic support for x86_64-cygwin;
authorwenzelm
Mon Sep 25 20:43:21 2017 +0200 (19 months ago)
changeset 66691a8703e8ee1d3
parent 66690 6953b1a29e19
child 66692 00b54799bd29
basic support for x86_64-cygwin;
Admin/PLATFORMS
Admin/bash_process/build
Admin/components/components.sha1
Admin/components/main
Admin/polyml/settings
lib/scripts/isabelle-platform
     1.1 --- a/Admin/PLATFORMS	Mon Sep 25 15:49:27 2017 +0100
     1.2 +++ b/Admin/PLATFORMS	Mon Sep 25 20:43:21 2017 +0200
     1.3 @@ -41,6 +41,7 @@
     1.4    x86-windows       Windows 7
     1.5    x86_64-windows    Windows 7
     1.6    x86-cygwin        Cygwin 2.8 http://isabelle.in.tum.de/cygwin_2017 (x86/release)
     1.7 +  x86_64-cygwin     Cygwin 2.8 http://isabelle.in.tum.de/cygwin_2017 (x86_64/release)
     1.8  
     1.9  All of the above platforms are 100% supported by Isabelle -- end-users
    1.10  should not have to care about the differences (at least in theory).
    1.11 @@ -67,7 +68,7 @@
    1.12  help configuring platform-dependent tools:
    1.13  
    1.14    ISABELLE_PLATFORM64  (potentially empty)
    1.15 -  ISABELLE_PLATFORM32
    1.16 +  ISABELLE_PLATFORM32  (potentially empty)
    1.17    ISABELLE_PLATFORM
    1.18  
    1.19  The ISABELLE_PLATFORM setting variable refers to the 32 bit version of
     2.1 --- a/Admin/bash_process/build	Mon Sep 25 15:49:27 2017 +0100
     2.2 +++ b/Admin/bash_process/build	Mon Sep 25 20:43:21 2017 +0200
     2.3 @@ -42,7 +42,7 @@
     2.4    x86-linux | x86-darwin)
     2.5      cc -Wall -m32 bash_process.c -o "$TARGET/bash_process"
     2.6      ;;
     2.7 -  x86-cygwin)
     2.8 +  x86_64-cygwin | x86-cygwin)
     2.9      cc -Wall bash_process.c -o "$TARGET/bash_process.exe"
    2.10      ;;
    2.11    *)
     3.1 --- a/Admin/components/components.sha1	Mon Sep 25 15:49:27 2017 +0100
     3.2 +++ b/Admin/components/components.sha1	Mon Sep 25 20:43:21 2017 +0200
     3.3 @@ -1,6 +1,7 @@
     3.4  fbe83b522cb37748ac1b3c943ad71704fdde2f82  bash_process-1.1.1.tar.gz
     3.5  bb9ef498cd594b4289221b96146d529c899da209  bash_process-1.1.tar.gz
     3.6  81250148f8b89ac3587908fb20645081d7f53207  bash_process-1.2.1.tar.gz
     3.7 +97b2491382130a841b3bbaebdcf8720c4d4fb227  bash_process-1.2.2.tar.gz
     3.8  9e21f447bfa0431ae5097301d553dd6df3c58218  bash_process-1.2.tar.gz
     3.9  e7ffe4238b61a3c1ee87aca4421e7a612e09b836  ci-extras-1.tar.gz
    3.10  70105fd6fbfd1a868383fc510772b95234325d31  csdp-6.x.tar.gz
    3.11 @@ -144,6 +145,7 @@
    3.12  b668e1f43a41608a8eb365c5e19db6c54c72748a  polyml-5.5.3-20150911.tar.gz
    3.13  1f5cd9b1390dab13861f90dfc06d4180cc107587  polyml-5.5.3-20150916.tar.gz
    3.14  f78896e588e8ebb4da57bf0c95210b0f0fa9e551  polyml-5.6-1.tar.gz
    3.15 +21fa0592b7dfd23269063f42604438165630c0f0  polyml-5.6-2.tar.gz
    3.16  03ba81e595fa6d6df069532d67ad3195c37d9046  polyml-5.6-20151123.tar.gz
    3.17  822f489c18e38ce5ef979ec21dccce4473e09be6  polyml-5.6-20151206.tar.gz
    3.18  bd6a448f0e0d5787747f4f30ca661f9c1868e4a7  polyml-5.6-20151223.tar.gz
     4.1 --- a/Admin/components/main	Mon Sep 25 15:49:27 2017 +0100
     4.2 +++ b/Admin/components/main	Mon Sep 25 20:43:21 2017 +0200
     4.3 @@ -1,5 +1,5 @@
     4.4  #main components for everyday use, without big impact on overall build time
     4.5 -bash_process-1.2.1
     4.6 +bash_process-1.2.2
     4.7  csdp-6.x
     4.8  cvc4-1.5-3
     4.9  e-2.0-1
    4.10 @@ -10,7 +10,7 @@
    4.11  jortho-1.0-2
    4.12  kodkodi-1.5.2
    4.13  nunchaku-0.5
    4.14 -polyml-5.6-1
    4.15 +polyml-5.6-2
    4.16  postgresql-42.1.4
    4.17  scala-2.12.3
    4.18  smbc-0.4.1
     5.1 --- a/Admin/polyml/settings	Mon Sep 25 15:49:27 2017 +0100
     5.2 +++ b/Admin/polyml/settings	Mon Sep 25 20:43:21 2017 +0200
     5.3 @@ -13,10 +13,10 @@
     5.4  fi
     5.5  
     5.6  case "${ISABELLE_PLATFORM}:${ML_SYSTEM_64}" in
     5.7 -  x86-cygwin:true)
     5.8 +  *-cygwin:true)
     5.9      PLATFORMS="x86_64-windows x86-windows"
    5.10      ;;
    5.11 -  x86-cygwin:*)
    5.12 +  *-cygwin:*)
    5.13      PLATFORMS="x86-windows x86_64-windows"
    5.14      ;;
    5.15    *:true)
     6.1 --- a/lib/scripts/isabelle-platform	Mon Sep 25 15:49:27 2017 +0100
     6.2 +++ b/lib/scripts/isabelle-platform	Mon Sep 25 20:43:21 2017 +0200
     6.3 @@ -40,15 +40,18 @@
     6.4      ;;
     6.5    CYGWIN_NT*)
     6.6      ISABELLE_PLATFORM_FAMILY="windows"
     6.7 +    if [ "$PROCESSOR_ARCHITECTURE" = "AMD64" -o "$PROCESSOR_ARCHITEW6432" = "AMD64" ]; then
     6.8 +      ISABELLE_WINDOWS_PLATFORM32="x86-windows"
     6.9 +      ISABELLE_WINDOWS_PLATFORM64="x86_64-windows"
    6.10 +    else
    6.11 +      ISABELLE_WINDOWS_PLATFORM32="x86-windows"
    6.12 +    fi
    6.13      case $(uname -m) in
    6.14 -      i?86 | x86_64)
    6.15 +      x86_64)
    6.16 +        ISABELLE_PLATFORM64=x86_64-cygwin
    6.17 +        ;;
    6.18 +      i?86)
    6.19          ISABELLE_PLATFORM32=x86-cygwin
    6.20 -        if [ "$PROCESSOR_ARCHITECTURE" = "AMD64" -o "$PROCESSOR_ARCHITEW6432" = "AMD64" ]; then
    6.21 -          ISABELLE_WINDOWS_PLATFORM32="x86-windows"
    6.22 -          ISABELLE_WINDOWS_PLATFORM64="x86_64-windows"
    6.23 -        else
    6.24 -          ISABELLE_WINDOWS_PLATFORM32="x86-windows"
    6.25 -        fi
    6.26          ;;
    6.27      esac
    6.28      ;;
    6.29 @@ -62,5 +65,5 @@
    6.30      ;;
    6.31  esac
    6.32  
    6.33 -ISABELLE_PLATFORM="$ISABELLE_PLATFORM32"
    6.34 -ISABELLE_WINDOWS_PLATFORM="$ISABELLE_WINDOWS_PLATFORM32"
    6.35 +ISABELLE_PLATFORM="${ISABELLE_PLATFORM32:-$ISABELLE_PLATFORM64}"
    6.36 +ISABELLE_WINDOWS_PLATFORM="${ISABELLE_WINDOWS_PLATFORM32:-$ISABELLE_WINDOWS_PLATFORM64}"