merged
authorwenzelm
Wed Apr 25 15:54:36 2012 +0200 (2012-04-25 ago)
changeset 47759af40c7e90c1e
parent 47757 5e6fe71e2390
parent 47758 8c37cb84065f
child 47760 b9840d8fca43
merged
src/HOL/Tools/Nitpick/nitpick.ML
     1.1 --- a/Admin/isatest/settings/at-poly	Wed Apr 25 15:09:18 2012 +0200
     1.2 +++ b/Admin/isatest/settings/at-poly	Wed Apr 25 15:54:36 2012 +0200
     1.3 @@ -24,6 +24,5 @@
     1.4  
     1.5  ISABELLE_USEDIR_OPTIONS="-i true -d pdf -v true -t true"
     1.6  
     1.7 -init_component "$HOME/contrib_devel/jdk-7u3_x86-linux"
     1.8  init_component "$HOME/contrib_devel/kodkodi-1.2.16"
     1.9  
     2.1 --- a/Admin/isatest/settings/at-poly-e	Wed Apr 25 15:09:18 2012 +0200
     2.2 +++ b/Admin/isatest/settings/at-poly-e	Wed Apr 25 15:54:36 2012 +0200
     2.3 @@ -24,5 +24,4 @@
     2.4  
     2.5  ISABELLE_USEDIR_OPTIONS="-i true -d pdf -v true -t true"
     2.6  
     2.7 -init_component "$HOME/contrib_devel/jdk-7u3_x86-linux"
     2.8  init_component "$HOME/contrib_devel/kodkodi-1.2.16"
     3.1 --- a/Admin/isatest/settings/at-poly-test	Wed Apr 25 15:09:18 2012 +0200
     3.2 +++ b/Admin/isatest/settings/at-poly-test	Wed Apr 25 15:54:36 2012 +0200
     3.3 @@ -28,5 +28,4 @@
     3.4  ISABELLE_OCAML="/home/isabelle/contrib_devel/ocaml/x86-linux/ocaml"
     3.5  ISABELLE_SWIPL="/home/isabelle/contrib_devel/swipl/bin/swipl"
     3.6  
     3.7 -init_component "$HOME/contrib_devel/jdk-7u3_x86-linux"
     3.8  init_component "$HOME/contrib_devel/kodkodi-1.2.16"
     4.1 --- a/Admin/isatest/settings/at64-poly	Wed Apr 25 15:09:18 2012 +0200
     4.2 +++ b/Admin/isatest/settings/at64-poly	Wed Apr 25 15:54:36 2012 +0200
     4.3 @@ -24,5 +24,4 @@
     4.4  
     4.5  ISABELLE_USEDIR_OPTIONS="-i true -d pdf -v true"
     4.6  
     4.7 -init_component "$HOME/contrib_devel/jdk-7u3_x86_64-linux"
     4.8  init_component "$HOME/contrib_devel/kodkodi-1.2.16"
     5.1 --- a/Admin/isatest/settings/cygwin-poly-e	Wed Apr 25 15:09:18 2012 +0200
     5.2 +++ b/Admin/isatest/settings/cygwin-poly-e	Wed Apr 25 15:54:36 2012 +0200
     5.3 @@ -24,5 +24,4 @@
     5.4  
     5.5  ISABELLE_USEDIR_OPTIONS="-M 1 -i false -d false"
     5.6  
     5.7 -init_component "$HOME/contrib_devel/jdk-7u3_x86-linux"
     5.8  init_component "$HOME/contrib/kodkodi-1.2.16"
     6.1 --- a/Admin/java/README	Wed Apr 25 15:09:18 2012 +0200
     6.2 +++ b/Admin/java/README	Wed Apr 25 15:54:36 2012 +0200
     6.3 @@ -1,3 +1,3 @@
     6.4 -This is JDK 1.7.0_03 for Linux from
     6.5 +This is JDK 1.6.0_31 for Linux from
     6.6  http://www.oracle.com/technetwork/java/javase/downloads/index.html
     6.7  
     7.1 --- a/Admin/java/etc/settings	Wed Apr 25 15:09:18 2012 +0200
     7.2 +++ b/Admin/java/etc/settings	Wed Apr 25 15:54:36 2012 +0200
     7.3 @@ -1,4 +1,4 @@
     7.4  # -*- shell-script -*- :mode=shellscript:
     7.5  
     7.6 -ISABELLE_JDK_HOME="$COMPONENT/jdk1.7.0_03"
     7.7 +ISABELLE_JDK_HOME="$COMPONENT/jdk1.6.0_31"
     7.8  
     8.1 Binary file Admin/launch4j/Isabelle.exe has changed
     9.1 --- a/Admin/launch4j/README	Wed Apr 25 15:09:18 2012 +0200
     9.2 +++ b/Admin/launch4j/README	Wed Apr 25 15:54:36 2012 +0200
     9.3 @@ -1,5 +1,4 @@
     9.4 -Cross-platform Java executable wrapper
     9.5 -======================================
     9.6 +Java application wrapper for Windows
     9.7 +====================================
     9.8  
     9.9  * http://launch4j.sourceforge.net
    9.10 -
    10.1 --- a/Admin/launch4j/isabelle.xml	Wed Apr 25 15:09:18 2012 +0200
    10.2 +++ b/Admin/launch4j/isabelle.xml	Wed Apr 25 15:54:36 2012 +0200
    10.3 @@ -20,7 +20,7 @@
    10.4      <cp>lib\classes\ext\scala-swing.jar</cp>
    10.5    </classPath>
    10.6    <jre>
    10.7 -    <path>contrib\jdk-7u3_x86-cygwin\jdk1.7.0_03</path>
    10.8 +    <path>contrib\jdk-6u31_x86-cygwin\jdk1.6.0_31</path>
    10.9      <minVersion></minVersion>
   10.10      <maxVersion></maxVersion>
   10.11      <jdkPreference>jdkOnly</jdkPreference>
    11.1 --- a/Admin/mira.py	Wed Apr 25 15:09:18 2012 +0200
    11.2 +++ b/Admin/mira.py	Wed Apr 25 15:54:36 2012 +0200
    11.3 @@ -59,7 +59,6 @@
    11.4  
    11.5  ISABELLE_USEDIR_OPTIONS="%s"
    11.6  
    11.7 -ISABELLE_JDK_HOME="$JAVA_HOME"
    11.8  Z3_NON_COMMERCIAL="yes"
    11.9  
   11.10  %s
    12.1 --- a/README	Wed Apr 25 15:09:18 2012 +0200
    12.2 +++ b/README	Wed Apr 25 15:54:36 2012 +0200
    12.3 @@ -16,7 +16,7 @@
    12.4       * The Poly/ML compiler and runtime system (version 5.2.1 or later).
    12.5       * The GNU bash shell (version 3.x or 2.x).
    12.6       * Perl (version 5.x).
    12.7 -     * Java 1.6.x or 1.7.x from Oracle or Apple -- for Scala and jEdit.
    12.8 +     * Java 1.6.x from Oracle or Apple -- for Scala and jEdit.
    12.9       * GNU Emacs (version 23 or 24) -- for the Proof General 4.x interface.
   12.10       * A complete LaTeX installation -- for document preparation.
   12.11  
    13.1 --- a/etc/settings	Wed Apr 25 15:09:18 2012 +0200
    13.2 +++ b/etc/settings	Wed Apr 25 15:54:36 2012 +0200
    13.3 @@ -140,11 +140,14 @@
    13.4  
    13.5  # The pdf file viewer
    13.6  case "$ISABELLE_PLATFORM" in
    13.7 +  *-linux)
    13.8 +    PDF_VIEWER="xdg-open"
    13.9 +    ;;
   13.10    *-darwin)
   13.11      PDF_VIEWER="open -W -n"
   13.12      ;;
   13.13 -  *)
   13.14 -    PDF_VIEWER=evince
   13.15 +  *-cygwin)
   13.16 +    PDF_VIEWER="cygstart"
   13.17      ;;
   13.18  esac
   13.19  
    14.1 --- a/lib/Tools/scala	Wed Apr 25 15:09:18 2012 +0200
    14.2 +++ b/lib/Tools/scala	Wed Apr 25 15:54:36 2012 +0200
    14.3 @@ -6,8 +6,6 @@
    14.4  
    14.5  [ -e "$ISABELLE_HOME/Admin/build" ] && { "$ISABELLE_HOME/Admin/build" jars || exit $?; }
    14.6  
    14.7 -export JAVA_HOME="$ISABELLE_JDK_HOME"
    14.8 -
    14.9  CLASSPATH="$(jvmpath "$CLASSPATH")"
   14.10  isabelle_scala scala -Dfile.encoding=UTF-8 \
   14.11    "-Djava.ext.dirs=$("$ISABELLE_HOME/src/Tools/JVM/java_ext_dirs")" "$@"
    15.1 --- a/lib/Tools/scalac	Wed Apr 25 15:09:18 2012 +0200
    15.2 +++ b/lib/Tools/scalac	Wed Apr 25 15:54:36 2012 +0200
    15.3 @@ -6,8 +6,6 @@
    15.4  
    15.5  [ -e "$ISABELLE_HOME/Admin/build" ] && { "$ISABELLE_HOME/Admin/build" jars || exit $?; }
    15.6  
    15.7 -export JAVA_HOME="$ISABELLE_JDK_HOME"
    15.8 -
    15.9  CLASSPATH="$(jvmpath "$CLASSPATH")"
   15.10  isabelle_scala scalac -Dfile.encoding=UTF-8 \
   15.11    "-Djava.ext.dirs=$("$ISABELLE_HOME/src/Tools/JVM/java_ext_dirs")" "$@"
    16.1 --- a/lib/scripts/getsettings	Wed Apr 25 15:09:18 2012 +0200
    16.2 +++ b/lib/scripts/getsettings	Wed Apr 25 15:54:36 2012 +0200
    16.3 @@ -203,6 +203,9 @@
    16.4    ML_IDENTIFIER="${ML_SYSTEM}_${ML_PLATFORM}"
    16.5  fi
    16.6  
    16.7 +#enforce JAVA_HOME
    16.8 +export JAVA_HOME="$ISABELLE_JDK_HOME"
    16.9 +
   16.10  ISABELLE_OUTPUT="$ISABELLE_OUTPUT/$ML_IDENTIFIER"
   16.11  
   16.12  set +o allexport
    17.1 --- a/src/HOL/Tools/Nitpick/nitpick.ML	Wed Apr 25 15:09:18 2012 +0200
    17.2 +++ b/src/HOL/Tools/Nitpick/nitpick.ML	Wed Apr 25 15:54:36 2012 +0200
    17.3 @@ -180,7 +180,7 @@
    17.4                 (length ts downto 1) ts))]
    17.5  
    17.6  fun install_java_message () =
    17.7 -  "Nitpick requires Java Development Kit 1.6/1.7 via ISABELLE_JDK_HOME setting."
    17.8 +  "Nitpick requires Java Development Kit 1.6 via ISABELLE_JDK_HOME setting."
    17.9  fun install_kodkodi_message () =
   17.10    "Nitpick requires the external Java program Kodkodi. To install it, download \
   17.11    \the package from \"http://www21.in.tum.de/~blanchet/#software\" and add the \
    18.1 --- a/src/Tools/jEdit/README_BUILD	Wed Apr 25 15:09:18 2012 +0200
    18.2 +++ b/src/Tools/jEdit/README_BUILD	Wed Apr 25 15:54:36 2012 +0200
    18.3 @@ -1,10 +1,10 @@
    18.4  Requirements for instantaneous build from sources
    18.5  =================================================
    18.6  
    18.7 -* Official Java JDK 1.6/1.7 from Sun/Oracle/Apple
    18.8 +* Official Java JDK 1.6 from Sun/Oracle/Apple
    18.9    http://www.oracle.com/technetwork/java/javase/downloads/index.html
   18.10  
   18.11 -  (or OpenJDK 1.7, but not OpenJDK 1.6)
   18.12 +  (experimental support for JDK/OpenJDK 1.7, but not OpenJDK 1.6)
   18.13  
   18.14  * Scala 2.9.2 (or 2.8.2.final)
   18.15    http://www.scala-lang.org
    19.1 --- a/src/Tools/jEdit/src/isabelle_sidekick.scala	Wed Apr 25 15:09:18 2012 +0200
    19.2 +++ b/src/Tools/jEdit/src/isabelle_sidekick.scala	Wed Apr 25 15:54:36 2012 +0200
    19.3 @@ -105,14 +105,12 @@
    19.4                if (ds.isEmpty) null
    19.5                else
    19.6                  new SideKickCompletion(pane.getView, word, ds.toArray.asInstanceOf[Array[Object]]) {
    19.7 -                  /* FIXME Java 7 only
    19.8                    override def getRenderer() =
    19.9 -                    new ListCellRenderer[Any] {
   19.10 -                      val default_renderer =
   19.11 -                        (new DefaultListCellRenderer).asInstanceOf[ListCellRenderer[Any]]
   19.12 +                    new ListCellRenderer {
   19.13 +                      val default_renderer = new DefaultListCellRenderer
   19.14  
   19.15                        override def getListCellRendererComponent(
   19.16 -                          list: JList[_ <: Any], value: Any, index: Int,
   19.17 +                          list: JList, value: Any, index: Int,
   19.18                            selected: Boolean, focus: Boolean): Component =
   19.19                        {
   19.20                          val renderer: Component =
   19.21 @@ -122,7 +120,6 @@
   19.22                          renderer
   19.23                        }
   19.24                      }
   19.25 -                  */
   19.26                  }
   19.27            }
   19.28        }