provide explicit ISABELLE_PLATFORM32 as well;
authorwenzelm
Mon, 23 Jul 2012 21:01:16 +0200
changeset 48455 a509f19d4cc6
parent 48454 808a5ba61991
child 48456 d8ff14f44a40
provide explicit ISABELLE_PLATFORM32 as well; discontinued some obsolete platforms; explicit error for unknown platform;
lib/scripts/getsettings
lib/scripts/isabelle-platform
--- a/lib/scripts/getsettings	Mon Jul 23 19:07:01 2012 +0200
+++ b/lib/scripts/getsettings	Mon Jul 23 21:01:16 2012 +0200
@@ -51,6 +51,10 @@
 
 #platform
 source "$ISABELLE_HOME/lib/scripts/isabelle-platform"
+if [ -z "$ISABELLE_PLATFORM" ]; then
+  echo 1>&2 "Failed to determine hardware and operating system type!"
+  exit 2
+fi
 
 #Isabelle distribution identifier -- filled in automatically!
 ISABELLE_ID=""
--- a/lib/scripts/isabelle-platform	Mon Jul 23 19:07:01 2012 +0200
+++ b/lib/scripts/isabelle-platform	Mon Jul 23 21:01:16 2012 +0200
@@ -4,17 +4,17 @@
 #
 # NOTE: The ML system or JVM may have their own idea about the platform!
 
-ISABELLE_PLATFORM="unknown-platform"
+ISABELLE_PLATFORM32=""
 ISABELLE_PLATFORM64=""
 
 case $(uname -s) in
   Linux)
     case $(uname -m) in
       i?86)
-        ISABELLE_PLATFORM=x86-linux
+        ISABELLE_PLATFORM32=x86-linux
         ;;
       x86_64)
-        ISABELLE_PLATFORM=x86-linux
+        ISABELLE_PLATFORM32=x86-linux
         ISABELLE_PLATFORM64=x86_64-linux
         ;;
     esac
@@ -22,47 +22,32 @@
   Darwin)
     case $(uname -m) in
       i?86)
-        ISABELLE_PLATFORM=x86-darwin
+        ISABELLE_PLATFORM32=x86-darwin
         if [ "$(sysctl -n hw.optional.x86_64 2>/dev/null)" = 1 ]; then
           ISABELLE_PLATFORM64=x86_64-darwin
         fi
         ;;
       x86_64)
-        ISABELLE_PLATFORM=x86-darwin
+        ISABELLE_PLATFORM32=x86-darwin
         ISABELLE_PLATFORM64=x86_64-darwin
         ;;
-      Power* | power* | ppc)
-        ISABELLE_PLATFORM=ppc-darwin
-        ;;
     esac
     ;;
   CYGWIN_NT*)
     case $(uname -m) in
       i?86 | x86_64)
-        ISABELLE_PLATFORM=x86-cygwin
-        ;;
-    esac
-    ;;
-  SunOS)
-    case $(uname -r) in
-      5.*)
-        case $(uname -p) in
-          sparc)
-            ISABELLE_PLATFORM=sparc-solaris
-            ;;
-          i?86 | x86_64)
-            ISABELLE_PLATFORM=x86-solaris
-            ;;
-        esac
+        ISABELLE_PLATFORM32=x86-cygwin
         ;;
     esac
     ;;
   *BSD)
     case $(uname -m) in
       i?86 | x86_64)
-        ISABELLE_PLATFORM=x86-linux
+        ISABELLE_PLATFORM32=x86-linux  #cf. BSD Linux Binary Compatibility
         ;;
     esac
     ;;
 esac
 
+ISABELLE_PLATFORM="$ISABELLE_PLATFORM32"
+