--- a/Admin/component_repository/README Fri Dec 14 18:41:45 2012 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,62 +0,0 @@
-Some notes on the Isabelle component repository at TUM
-======================================================
-
-Quick reference
----------------
-
- $ install /home/isabelle/components/screwdriver-3.14.tar.gz
- $ install /home/isabelle/contrib/screwdriver-3.14/
- $ edit Admin/components/main: screwdriver-3.14
- $ run Admin/component_repository/checksum -u
- $ hg diff
- $ hg commit
-
-
-Unique names
-------------
-
-Component names are globally unique over time and space: names of
-published components are never re-used. If some component needs to be
-re-packaged, extra indices may be added to the official version number
-like this:
-
- screwdriver-3.14 #default packaging/publishing, no index
- screwdriver-3.14-1 #another refinement of the same
- screwdriver-3.14-2 #yet another refinement of the same
-
-There is no standard format for the structure of component names: they
-are compared for equality only, without any guess at an ordering.
-
-Components are registered in Admin/components/main (or similar) for
-use of that particular Isabelle repository version, subject to regular
-Mercurial history. This allows to bisect Isabelle versions with full
-record of the required components for testing.
-
-
-Authentic archives
-------------------
-
-Isabelle components are managed as authentic .tar.gz archives in
-/home/isabelle/components from where they are made publicly available
-on http://isabelle.in.tum.de/components/.
-
-Visibility on the HTTP server depends on local Unix file permission:
-nonfree components should omit "read" mode for the Unix group/other;
-regular components should be world-readable.
-
-The file Admin/component_repository/contains SHA1 identifiers within
-the Isabelle repository, for integrity checking of the archives that
-are exposed to the public file-system. The script
-Admin/component_repository/checksum helps to update these hash-keys
-wrt. the information within the Isabelle repository.
-
-
-Unpacked copy
--------------
-
-A second unpacked copy is provided in /home/isabelle/contrib/. This
-allows users within the TUM network to activate arbitrary snapshots of
-the repository with all standard components being available, without
-extra copying or unpacking of the authentic archives. Testing
-services like "isatest" and "mira" do this routinely, and will break
-accordingly if this is omitted.
--- a/Admin/component_repository/checksum Fri Dec 14 18:41:45 2012 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,70 +0,0 @@
-#!/usr/bin/env bash
-#
-# Author: Alexander Krauss
-#
-# Computes and validates checksums for the Isabelle component repository
-
-THIS="$(cd $(dirname "$0"); pwd)"
-
-function usage()
-{
- echo
- echo "Usage: $0 [OPTIONS] [DIR]"
- echo
- echo " Options are:"
- echo " -u update the recorded checksums in the repository"
- echo " -c compare the actual checksums with the recorded ones"
- echo
- echo " Compute the checksums of components in DIR (default '/home/isabelle/components')"
- echo " and synchronize them with the Isabelle repository."
- echo
- exit 1
-}
-
-function fail()
-{
- echo "$1" >&2
- exit 2
-}
-
-
-## process command line
-
-# options
-
-UPDATE=""
-CHECK=""
-COMPONENTS_DIR="/home/isabelle/components"
-
-while getopts "uc" OPT
-do
- case "$OPT" in
- u)
- UPDATE=true
- ;;
- c)
- CHECK=true
- ;;
- esac
-done
-
-shift $(($OPTIND - 1))
-
-[ -n "$UPDATE" ] || [ -n "$CHECK" ] || usage
-
-# args
-
-[ "$#" -ge 1 ] && { COMPONENTS_DIR="$1"; shift; }
-[ "$#" -ne 0 ] && usage
-
-
-## compute checksums
-
-CHECKSUM_FILE="$THIS/components.sha1"
-CHECKSUM_TMP="$THIS/components.sha1.tmp"
-
-cd "$COMPONENTS_DIR"
-sha1sum *.tar.gz > "$CHECKSUM_TMP"
-
-[ -n "$UPDATE" ] && mv "$CHECKSUM_TMP" "$CHECKSUM_FILE"
-[ -n "$CHECK" ] && (diff "$CHECKSUM_FILE" "$CHECKSUM_TMP" || fail "Integrity error")
--- a/Admin/component_repository/components.sha1 Fri Dec 14 18:41:45 2012 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-2f6417b8e96a0e4e8354fe0f1a253c18fb55d9a7 cvc3-2.4.1.tar.gz
-0fe549949a025d65d52d6deca30554de8fca3b6e e-1.5.tar.gz
-b98a98025d1f7e560ca6864a53296137dae736b4 e-1.6.tar.gz
-6d34b18ca0aa1e10bab6413045d079188c0e2dfb exec_process-1.0.1.tar.gz
-8b9bffd10e396d965e815418295f2ee2849bea75 exec_process-1.0.2.tar.gz
-e6aada354da11e533af2dee3dcdd96c06479b053 exec_process-1.0.3.tar.gz
-ae7ee5becb26512f18c609e83b34612918bae5f0 exec_process-1.0.tar.gz
-683acd94761ef460cca1a628f650355370de5afb hol-light-bundle-0.5-126.tar.gz
-8d83e433c1419e0c0cc5fd1762903d11b4a5752c jdk-6u31.tar.gz
-ec740ee9ffd43551ddf1e5b91641405116af6291 jdk-7u6.tar.gz
-7d5b152ac70f720bb9e783fa45ecadcf95069584 jdk-7u9.tar.gz
-44775a22f42a9d665696bfb49e53c79371c394b0 jedit_build-20111217.tar.gz
-a242a688810f2bccf24587b0062ce8027bf77fa2 jedit_build-20120304.tar.gz
-4c948dee53f74361c097c08f49a1a5ff9b17bd1d jedit_build-20120307.tar.gz
-9c221fe71af8a063fcffcce21672a97aea0a8d5b jedit_build-20120313.tar.gz
-ed72630f307729df08fdedb095f0af8725f81b9c jedit_build-20120327.tar.gz
-6425f622625024c1de27f3730d6811f6370a19cd jedit_build-20120414.tar.gz
-7b012f725ec1cc102dc259df178d511cc7890bba jedit_build-20120813.tar.gz
-8e1d36f5071e3def2cb281f7fefe9f52352cb88f jedit_build-20120903.tar.gz
-8fa0c67f59beba369ab836562eed4e56382f672a jedit_build-20121201.tar.gz
-8122526f1fc362ddae1a328bdbc2152853186fee jfreechart-1.0.14.tar.gz
-6c737137cc597fc920943783382e928ea79e3feb kodkodi-1.2.16.tar.gz
-5f95c96bb99927f3a026050f85bd056f37a9189e kodkodi-1.5.2.tar.gz
-1c8cb6a8f4cbeaedce2d6d1ba8fc7e2ab3663aeb polyml-5.4.1.tar.gz
-1812e9fa6d163f63edb93e37d1217640a166cf3e polyml-5.5.0.tar.gz
-8ee375cfc38972f080dbc78f07b68dac03efe968 ProofGeneral-3.7.1.1.tar.gz
-847b52c0676b5eb0fbf0476f64fc08c2d72afd0c ProofGeneral-4.1.tar.gz
-b447017e81600cc5e30dd61b5d4962f6da01aa80 scala-2.8.1.final.tar.gz
-5659440f6b86db29f0c9c0de7249b7e24a647126 scala-2.9.2.tar.gz
-43b5afbcad575ab6817d2289756ca22fd2ef43a9 spass-3.8ds.tar.gz
-1f4a2053cc1f34fa36c4d9d2ac906ad4ebc863fd sumatra_pdf-2.1.1.tar.gz
-869ea6d8ea35c8ba68d7fcb028f16b2b7064c5fd vampire-1.0.tar.gz
-4530a1aa6f4498ee3d78d6000fa71a3f63bd077f yices-1.0.28.tar.gz
-12ae71acde43bd7bed1e005c43034b208c0cba4c z3-3.2.tar.gz
-d94a716502c8503d63952bcb4d4176fac8b28704 z3-4.0.tar.gz
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/Admin/components/README Fri Dec 14 18:41:56 2012 +0100
@@ -0,0 +1,62 @@
+Some notes on maintaining the Isabelle component repository at TUM
+==================================================================
+
+Quick reference
+---------------
+
+ $ install /home/isabelle/components/screwdriver-3.14.tar.gz
+ $ install /home/isabelle/contrib/screwdriver-3.14/
+ $ edit Admin/components/main: screwdriver-3.14
+ $ isabelle components_checksum -u
+ $ hg diff
+ $ hg commit
+
+
+Unique names
+------------
+
+Component names are globally unique over time and space: names of
+published components are never re-used. If some component needs to be
+re-packaged, extra indices may be added to the official version number
+like this:
+
+ screwdriver-3.14 #default packaging/publishing, no index
+ screwdriver-3.14-1 #another refinement of the same
+ screwdriver-3.14-2 #yet another refinement of the same
+
+There is no standard format for the structure of component names: they
+are compared for equality only, without any guess at an ordering.
+
+Components are registered in Admin/components/main (or similar) for
+use of that particular Isabelle repository version, subject to regular
+Mercurial history. This allows to bisect Isabelle versions with full
+record of the required components for testing.
+
+
+Authentic archives
+------------------
+
+Isabelle components are managed as authentic .tar.gz archives in
+/home/isabelle/components from where they are made publicly available
+on http://isabelle.in.tum.de/components/.
+
+Visibility on the HTTP server depends on local Unix file permission:
+nonfree components should omit "read" mode for the Unix group/other;
+regular components should be world-readable.
+
+The file Admin/components/components.sha1 contains SHA1 identifiers
+within the Isabelle repository, for integrity checking of the archives
+that are exposed to the public file-system. The components_checksum
+tool helps to update these hash-keys wrt. the information within the
+Isabelle repository.
+
+
+Unpacked copy
+-------------
+
+A second unpacked copy is provided in /home/isabelle/contrib/. This
+allows users within the TUM network to activate arbitrary snapshots of
+the repository with all standard components being available, without
+extra copying or unpacking of the authentic archives. Testing
+services like "isatest" and "mira" do this routinely, and will break
+accordingly if this is omitted.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/Admin/components/components.sha1 Fri Dec 14 18:41:56 2012 +0100
@@ -0,0 +1,35 @@
+2f6417b8e96a0e4e8354fe0f1a253c18fb55d9a7 cvc3-2.4.1.tar.gz
+0fe549949a025d65d52d6deca30554de8fca3b6e e-1.5.tar.gz
+b98a98025d1f7e560ca6864a53296137dae736b4 e-1.6.tar.gz
+6d34b18ca0aa1e10bab6413045d079188c0e2dfb exec_process-1.0.1.tar.gz
+8b9bffd10e396d965e815418295f2ee2849bea75 exec_process-1.0.2.tar.gz
+e6aada354da11e533af2dee3dcdd96c06479b053 exec_process-1.0.3.tar.gz
+ae7ee5becb26512f18c609e83b34612918bae5f0 exec_process-1.0.tar.gz
+683acd94761ef460cca1a628f650355370de5afb hol-light-bundle-0.5-126.tar.gz
+8d83e433c1419e0c0cc5fd1762903d11b4a5752c jdk-6u31.tar.gz
+ec740ee9ffd43551ddf1e5b91641405116af6291 jdk-7u6.tar.gz
+7d5b152ac70f720bb9e783fa45ecadcf95069584 jdk-7u9.tar.gz
+44775a22f42a9d665696bfb49e53c79371c394b0 jedit_build-20111217.tar.gz
+a242a688810f2bccf24587b0062ce8027bf77fa2 jedit_build-20120304.tar.gz
+4c948dee53f74361c097c08f49a1a5ff9b17bd1d jedit_build-20120307.tar.gz
+9c221fe71af8a063fcffcce21672a97aea0a8d5b jedit_build-20120313.tar.gz
+ed72630f307729df08fdedb095f0af8725f81b9c jedit_build-20120327.tar.gz
+6425f622625024c1de27f3730d6811f6370a19cd jedit_build-20120414.tar.gz
+7b012f725ec1cc102dc259df178d511cc7890bba jedit_build-20120813.tar.gz
+8e1d36f5071e3def2cb281f7fefe9f52352cb88f jedit_build-20120903.tar.gz
+8fa0c67f59beba369ab836562eed4e56382f672a jedit_build-20121201.tar.gz
+8122526f1fc362ddae1a328bdbc2152853186fee jfreechart-1.0.14.tar.gz
+6c737137cc597fc920943783382e928ea79e3feb kodkodi-1.2.16.tar.gz
+5f95c96bb99927f3a026050f85bd056f37a9189e kodkodi-1.5.2.tar.gz
+1c8cb6a8f4cbeaedce2d6d1ba8fc7e2ab3663aeb polyml-5.4.1.tar.gz
+1812e9fa6d163f63edb93e37d1217640a166cf3e polyml-5.5.0.tar.gz
+8ee375cfc38972f080dbc78f07b68dac03efe968 ProofGeneral-3.7.1.1.tar.gz
+847b52c0676b5eb0fbf0476f64fc08c2d72afd0c ProofGeneral-4.1.tar.gz
+b447017e81600cc5e30dd61b5d4962f6da01aa80 scala-2.8.1.final.tar.gz
+5659440f6b86db29f0c9c0de7249b7e24a647126 scala-2.9.2.tar.gz
+43b5afbcad575ab6817d2289756ca22fd2ef43a9 spass-3.8ds.tar.gz
+1f4a2053cc1f34fa36c4d9d2ac906ad4ebc863fd sumatra_pdf-2.1.1.tar.gz
+869ea6d8ea35c8ba68d7fcb028f16b2b7064c5fd vampire-1.0.tar.gz
+4530a1aa6f4498ee3d78d6000fa71a3f63bd077f yices-1.0.28.tar.gz
+12ae71acde43bd7bed1e005c43034b208c0cba4c z3-3.2.tar.gz
+d94a716502c8503d63952bcb4d4176fac8b28704 z3-4.0.tar.gz
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/Admin/lib/Tools/components_checksum Fri Dec 14 18:41:56 2012 +0100
@@ -0,0 +1,81 @@
+#!/usr/bin/env bash
+#
+# Author: Alexander Krauss
+#
+# DESCRIPTION: compute and validate checksums for component repository
+
+
+## diagnostics
+
+PRG="$(basename "$0")"
+
+function usage()
+{
+ echo
+ echo "Usage: $PRG [OPTIONS] [DIR]"
+ echo
+ echo " Options are:"
+ echo " -u update the recorded checksums in the repository"
+ echo " -c compare the actual checksums with the recorded ones"
+ echo
+ echo " Compute the checksums of component .tar.gz archives in DIR"
+ echo " (default \"/home/isabelle/components\") and synchronize them"
+ echo " with the Isabelle repository."
+ echo
+ exit 1
+}
+
+function fail()
+{
+ echo "$1" >&2
+ exit 2
+}
+
+
+## process command line
+
+# options
+
+UPDATE=""
+CHECK=""
+COMPONENTS_DIR="/home/isabelle/components"
+
+while getopts "uc" OPT
+do
+ case "$OPT" in
+ u)
+ UPDATE=true
+ ;;
+ c)
+ CHECK=true
+ ;;
+ esac
+done
+
+shift $(($OPTIND - 1))
+
+[ -n "$UPDATE" ] || [ -n "$CHECK" ] || usage
+
+
+# args
+
+[ "$#" -ge 1 ] && { COMPONENTS_DIR="$1"; shift; }
+[ "$#" -ne 0 ] && usage
+
+
+## compute checksums
+
+CHECKSUM_DIR="$ISABELLE_HOME/Admin/components"
+CHECKSUM_FILE="$CHECKSUM_DIR/components.sha1"
+CHECKSUM_TMP="$CHECKSUM_DIR/components.sha1.tmp"
+
+(
+ cd "$COMPONENTS_DIR"
+ sha1sum *.tar.gz > "$CHECKSUM_TMP"
+)
+
+[ -n "$UPDATE" ] && mv "$CHECKSUM_TMP" "$CHECKSUM_FILE"
+[ -n "$CHECK" ] && {
+ diff "$CHECKSUM_FILE" "$CHECKSUM_TMP" || fail "Integrity error"
+}
+
--- a/lib/Tools/options Fri Dec 14 18:41:45 2012 +0100
+++ b/lib/Tools/options Fri Dec 14 18:41:56 2012 +0100
@@ -16,9 +16,10 @@
echo
echo " Options are:"
echo " -b include \$ISABELLE_BUILD_OPTIONS"
- echo " -x FILE export to FILE in YXML format"
+ echo " -l list options"
+ echo " -x FILE export options to FILE in YXML format"
echo
- echo " Print Isabelle system options, augmented by MORE_OPTIONS given as"
+ echo " Report Isabelle system options, augmented by MORE_OPTIONS given as"
echo " arguments NAME=VAL or NAME."
echo
exit 1
@@ -34,14 +35,18 @@
## process command line
eval "declare -a BUILD_OPTIONS=()"
+LIST_OPTIONS="false"
EXPORT_FILE=""
-while getopts "bx:" OPT
+while getopts "blx:" OPT
do
case "$OPT" in
b)
BUILD_OPTIONS=($ISABELLE_BUILD_OPTIONS)
;;
+ l)
+ LIST_OPTIONS="true"
+ ;;
x)
EXPORT_FILE="$OPTARG"
;;
@@ -53,6 +58,8 @@
shift $(($OPTIND - 1))
+[ "$LIST_OPTIONS" = "false" -a -z "$EXPORT_FILE" ] && usage
+
## main
--- a/src/Doc/Functions/Functions.thy Fri Dec 14 18:41:45 2012 +0100
+++ b/src/Doc/Functions/Functions.thy Fri Dec 14 18:41:56 2012 +0100
@@ -1,4 +1,4 @@
-(* Title: Doc/Functions/Fundefs.thy
+(* Title: Doc/Functions/Functions.thy
Author: Alexander Krauss, TU Muenchen
Tutorial for function definitions with the new "function" package.
--- a/src/Doc/System/Sessions.thy Fri Dec 14 18:41:45 2012 +0100
+++ b/src/Doc/System/Sessions.thy Fri Dec 14 18:41:56 2012 +0100
@@ -150,9 +150,10 @@
Options are:
-b include $ISABELLE_BUILD_OPTIONS
+ -l list options
-x FILE export to FILE in YXML format
- Print Isabelle system options, augmented by MORE_OPTIONS given as
+ Report Isabelle system options, augmented by MORE_OPTIONS given as
arguments NAME=VAL or NAME.
\end{ttbox}
--- a/src/Doc/Tutorial/Protocol/Public.thy Fri Dec 14 18:41:45 2012 +0100
+++ b/src/Doc/Tutorial/Protocol/Public.thy Fri Dec 14 18:41:56 2012 +0100
@@ -1,4 +1,4 @@
-(* Title: HOL/Auth/Public
+(* Title: Doc/Tutorial/Protocol/Public.thy
Author: Lawrence C Paulson, Cambridge University Computer Laboratory
Copyright 1996 University of Cambridge
--- a/src/Doc/ZF/If.thy Fri Dec 14 18:41:45 2012 +0100
+++ b/src/Doc/ZF/If.thy Fri Dec 14 18:41:56 2012 +0100
@@ -1,4 +1,4 @@
-(* Title: FOL/ex/If.ML
+(* Title: Doc/ZF/If.thy
Author: Lawrence C Paulson, Cambridge University Computer Laboratory
Copyright 1991 University of Cambridge
--- a/src/HOL/BNF/Examples/Derivation_Trees/DTree.thy Fri Dec 14 18:41:45 2012 +0100
+++ b/src/HOL/BNF/Examples/Derivation_Trees/DTree.thy Fri Dec 14 18:41:56 2012 +0100
@@ -1,4 +1,4 @@
-(* Title: HOL/BNF/Examples/Infinite_Derivation_Trees/DTree.thy
+(* Title: HOL/BNF/Examples/Derivation_Trees/DTree.thy
Author: Andrei Popescu, TU Muenchen
Copyright 2012
--- a/src/HOL/BNF/Examples/Koenig.thy Fri Dec 14 18:41:45 2012 +0100
+++ b/src/HOL/BNF/Examples/Koenig.thy Fri Dec 14 18:41:56 2012 +0100
@@ -1,4 +1,4 @@
-(* Title: HOL/BNF/Examples/Stream.thy
+(* Title: HOL/BNF/Examples/Koenig.thy
Author: Dmitriy Traytel, TU Muenchen
Author: Andrei Popescu, TU Muenchen
Copyright 2012
--- a/src/HOL/Library/Refute.thy Fri Dec 14 18:41:45 2012 +0100
+++ b/src/HOL/Library/Refute.thy Fri Dec 14 18:41:56 2012 +0100
@@ -1,4 +1,4 @@
-(* Title: HOL/Refute.thy
+(* Title: HOL/Library/Refute.thy
Author: Tjark Weber
Copyright 2003-2007
--- a/src/HOL/Library/refute.ML Fri Dec 14 18:41:45 2012 +0100
+++ b/src/HOL/Library/refute.ML Fri Dec 14 18:41:56 2012 +0100
@@ -1,4 +1,4 @@
-(* Title: HOL/Tools/refute.ML
+(* Title: HOL/Library/refute.ML
Author: Tjark Weber, TU Muenchen
Finite model generation for HOL formulas, using a SAT solver.
--- a/src/HOL/Probability/Measurable.thy Fri Dec 14 18:41:45 2012 +0100
+++ b/src/HOL/Probability/Measurable.thy Fri Dec 14 18:41:56 2012 +0100
@@ -1,4 +1,4 @@
-(* Title: HOL/Probability/measurable.ML
+(* Title: HOL/Probability/Measurable.thy
Author: Johannes Hölzl <hoelzl@in.tum.de>
*)
theory Measurable
--- a/src/HOL/Probability/Regularity.thy Fri Dec 14 18:41:45 2012 +0100
+++ b/src/HOL/Probability/Regularity.thy Fri Dec 14 18:41:56 2012 +0100
@@ -1,4 +1,4 @@
-(* Title: HOL/Probability/Projective_Family.thy
+(* Title: HOL/Probability/Regularity.thy
Author: Fabian Immler, TU München
*)
--- a/src/Pure/System/build_dialog.scala Fri Dec 14 18:41:45 2012 +0100
+++ b/src/Pure/System/build_dialog.scala Fri Dec 14 18:41:56 2012 +0100
@@ -32,7 +32,7 @@
Isabelle_System.default_logic(logic,
if (logic_option != "") options.string(logic_option) else "")
- if (Build.build(Build.Ignore_Progress, options, no_build = true,
+ if (Build.build(Build.Ignore_Progress, options, build_heap = true, no_build = true,
more_dirs = more_dirs, sessions = List(session)) == 0) sys.exit(0)
else
Swing_Thread.later {
@@ -42,7 +42,8 @@
top.pack()
val point = GraphicsEnvironment.getLocalGraphicsEnvironment().getCenterPoint()
- top.location = new Point(point.x - top.size.width / 2, point.y - top.size.height / 2)
+ top.location =
+ new Point(point.x - top.size.width / 2, point.y - top.size.height / 2)
top.visible = true
}