-
Notifications
You must be signed in to change notification settings - Fork 1
/
Copy pathIsabelle2022-CyPhyAssure.diff
207 lines (186 loc) · 13.9 KB
/
Isabelle2022-CyPhyAssure.diff
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
diff -ur Isabelle2022/contrib/jedit-20211103/etc/settings Isabelle2022-patched/contrib/jedit-20211103/etc/settings
--- Isabelle2022/contrib/jedit-20211103/etc/settings 2021-11-02 23:31:23.000000000 +0000
+++ Isabelle2022-patched/contrib/jedit-20211103/etc/settings 2022-11-11 16:05:11.345317290 +0000
@@ -4,6 +4,8 @@
JEDIT_JARS="$JEDIT_HOME/jars/Code2HTML.jar:$JEDIT_HOME/jars/CommonControls.jar:$JEDIT_HOME/jars/Console.jar:$JEDIT_HOME/jars/ErrorList.jar:$JEDIT_HOME/jars/Highlight.jar:$JEDIT_HOME/jars/Navigator.jar:$JEDIT_HOME/jars/QuickNotepad.jar:$JEDIT_HOME/jars/SideKick.jar:$JEDIT_HOME/jars/jsr305-3.0.2.jar:$JEDIT_HOME/jars/kappalayout.jar"
JEDIT_JAR="$JEDIT_HOME/jedit.jar"
classpath "$JEDIT_JAR"
+classpath "$JEDIT_HOME/jars/Console.jar"
+classpath "$JEDIT_HOME/jars/ErrorList.jar"
JEDIT_SETTINGS="$ISABELLE_HOME_USER/jedit"
JEDIT_OPTIONS="-reuseview -nobackground -nosplash -log=9"
diff -ur Isabelle2022/contrib/jedit-20211103/jedit5.6.0-patched/properties/jEdit.props Isabelle2022-patched/contrib/jedit-20211103/jedit5.6.0-patched/properties/jEdit.props
--- Isabelle2022/contrib/jedit-20211103/jedit5.6.0-patched/properties/jEdit.props 2022-10-25 13:59:05.000000000 +0100
+++ Isabelle2022-patched/contrib/jedit-20211103/jedit5.6.0-patched/properties/jEdit.props 2022-11-11 16:05:11.345317290 +0000
@@ -11,7 +11,7 @@
buffer.undoCount=1000
close-docking-area.shortcut2=C+e C+CIRCUMFLEX
complete-word.shortcut=
-console.dock-position=floating
+console.dock-position=bottom
console.encoding=UTF-8
console.font=Isabelle DejaVu Sans Mono
console.fontsize=18
diff -ur Isabelle2022/etc/build.props Isabelle2022-patched/etc/build.props
--- Isabelle2022/etc/build.props 2022-10-24 19:37:32.000000000 +0100
+++ Isabelle2022-patched/etc/build.props 2022-11-11 16:07:04.901957069 +0000
@@ -1,6 +1,8 @@
title = Isabelle/Scala
module = $ISABELLE_HOME/lib/classes/isabelle.jar
main = isabelle.jedit.JEdit_Main
+requirements = \
+ env:JEDIT_JARS
resources = \
lib/services/java.nio.charset.spi.CharsetProvider:META-INF/services/ \
lib/logo/isabelle_transparent-32.gif:isabelle/ \
Only in Isabelle2022-patched/etc: build.props~
Only in Isabelle2022-patched/etc: build.props.orig
Only in Isabelle2022-patched/etc: build.props.rej
diff -ur Isabelle2022/etc/options Isabelle2022-patched/etc/options
--- Isabelle2022/etc/options 2022-10-24 19:37:32.000000000 +0100
+++ Isabelle2022-patched/etc/options 2022-11-11 16:05:11.345317290 +0000
@@ -142,7 +142,7 @@
option system_log : string = "" (standard "-")
-- "output for system messages (log file or \"-\" for console progress)"
-option system_heaps : bool = false
+option system_heaps : bool = true
-- "store session heaps in $ISABELLE_HEAPS_SYSTEM, not $ISABELLE_HEAPS"
Only in Isabelle2022-patched/etc: options.orig
Binary files Isabelle2022/heaps/polyml-5.9_x86_64_32-linux/HOL and Isabelle2022-patched/heaps/polyml-5.9_x86_64_32-linux/HOL differ
Binary files Isabelle2022/heaps/polyml-5.9_x86_64_32-linux/log/HOL.db and Isabelle2022-patched/heaps/polyml-5.9_x86_64_32-linux/log/HOL.db differ
Binary files Isabelle2022/heaps/polyml-5.9_x86_64_32-linux/log/Pure.db and Isabelle2022-patched/heaps/polyml-5.9_x86_64_32-linux/log/Pure.db differ
Binary files Isabelle2022/heaps/polyml-5.9_x86_64_32-linux/log/Pure.gz and Isabelle2022-patched/heaps/polyml-5.9_x86_64_32-linux/log/Pure.gz differ
Binary files Isabelle2022/heaps/polyml-5.9_x86_64_32-linux/Pure and Isabelle2022-patched/heaps/polyml-5.9_x86_64_32-linux/Pure differ
Binary files Isabelle2022/lib/classes/isabelle.jar and Isabelle2022-patched/lib/classes/isabelle.jar differ
diff -ur Isabelle2022/lib/scripts/Isabelle_app Isabelle2022-patched/lib/scripts/Isabelle_app
--- Isabelle2022/lib/scripts/Isabelle_app 2022-10-25 13:59:05.000000000 +0100
+++ Isabelle2022-patched/lib/scripts/Isabelle_app 2022-11-11 16:10:35.791134010 +0000
@@ -28,6 +28,6 @@
exec "$ISABELLE_JDK_HOME/bin/java" \
"-Disabelle.root=$ISABELLE_HOME" "${JAVA_OPTIONS[@]}" \
- -classpath "$ISABELLE_HOME/contrib/apache-commons-20211211/lib/commons-lang3-3.12.0.jar:$ISABELLE_HOME/contrib/apache-commons-20211211/lib/commons-text-1.9.jar:$ISABELLE_HOME/contrib/flatlaf-2.4/lib/flatlaf-2.4.jar:$ISABELLE_HOME/contrib/isabelle_setup-20221020/lib/isabelle_setup.jar:$ISABELLE_HOME/contrib/jedit-20211103/jedit5.6.0-patched/jedit.jar:$ISABELLE_HOME/contrib/jfreechart-1.5.3/lib/iText-2.1.5.jar:$ISABELLE_HOME/contrib/jfreechart-1.5.3/lib/jfreechart-1.5.3.jar:$ISABELLE_HOME/contrib/jortho-1.0-2/jortho.jar:$ISABELLE_HOME/contrib/kodkodi-1.5.7/jar/antlr-runtime-3.1.1.jar:$ISABELLE_HOME/contrib/kodkodi-1.5.7/jar/kodkod-1.5.jar:$ISABELLE_HOME/contrib/kodkodi-1.5.7/jar/kodkodi-1.5.7.jar:$ISABELLE_HOME/contrib/kodkodi-1.5.7/jar/sat4j-2.3.jar:$ISABELLE_HOME/contrib/postgresql-42.5.0/postgresql-42.5.0.jar:$ISABELLE_HOME/contrib/scala-3.2.0-2/lib/scala-library-2.13.8.jar:$ISABELLE_HOME/contrib/scala-3.2.0-2/lib/scala3-library_3-3.2.0.jar:$ISABELLE_HOME/contrib/scala-3.2.0-2/lib/scala-asm-9.3.0-scala-1.jar:$ISABELLE_HOME/contrib/scala-3.2.0-2/lib/compiler-interface-1.3.5.jar:$ISABELLE_HOME/contrib/scala-3.2.0-2/lib/scala3-interfaces-3.2.0.jar:$ISABELLE_HOME/contrib/scala-3.2.0-2/lib/scala3-compiler_3-3.2.0.jar:$ISABELLE_HOME/contrib/scala-3.2.0-2/lib/tasty-core_3-3.2.0.jar:$ISABELLE_HOME/contrib/scala-3.2.0-2/lib/scala3-staging_3-3.2.0.jar:$ISABELLE_HOME/contrib/scala-3.2.0-2/lib/scala3-tasty-inspector_3-3.2.0.jar:$ISABELLE_HOME/contrib/scala-3.2.0-2/lib/jline-reader-3.19.0.jar:$ISABELLE_HOME/contrib/scala-3.2.0-2/lib/jline-terminal-3.19.0.jar:$ISABELLE_HOME/contrib/scala-3.2.0-2/lib/jline-terminal-jna-3.19.0.jar:$ISABELLE_HOME/contrib/scala-3.2.0-2/lib/jna-5.3.1.jar:$ISABELLE_HOME/contrib/scala-3.2.0-2/lib/scala-parallel-collections_3-1.0.4.jar:$ISABELLE_HOME/contrib/scala-3.2.0-2/lib/scala-parser-combinators_3-2.1.1.jar:$ISABELLE_HOME/contrib/scala-3.2.0-2/lib/scala-swing_3-3.0.0.jar:$ISABELLE_HOME/contrib/scala-3.2.0-2/lib/scala-xml_3-2.1.0.jar:$ISABELLE_HOME/contrib/sqlite-jdbc-3.36.0.3/sqlite-jdbc-3.36.0.3.jar:$ISABELLE_HOME/contrib/xz-java-1.9/lib/xz-1.9.jar:$ISABELLE_HOME/contrib/naproche-20221024/Isabelle/naproche.jar:$ISABELLE_HOME/lib/classes/isabelle.jar:$ISABELLE_HOME/lib/classes/isabelle_graphbrowser.jar" \
+ -classpath "$ISABELLE_HOME/contrib/edit-20211103/jedit5.6.0-patched/jars/Console.jar:$ISABELLE_HOME/contrib/edit-20211103/jedit5.6.0-patched/jars/ErrorList.jar:$ISABELLE_HOME/contrib/apache-commons-20211211/lib/commons-lang3-3.12.0.jar:$ISABELLE_HOME/contrib/apache-commons-20211211/lib/commons-text-1.9.jar:$ISABELLE_HOME/contrib/flatlaf-2.4/lib/flatlaf-2.4.jar:$ISABELLE_HOME/contrib/isabelle_setup-20221020/lib/isabelle_setup.jar:$ISABELLE_HOME/contrib/jedit-20211103/jedit5.6.0-patched/jedit.jar:$ISABELLE_HOME/contrib/jfreechart-1.5.3/lib/iText-2.1.5.jar:$ISABELLE_HOME/contrib/jfreechart-1.5.3/lib/jfreechart-1.5.3.jar:$ISABELLE_HOME/contrib/jortho-1.0-2/jortho.jar:$ISABELLE_HOME/contrib/kodkodi-1.5.7/jar/antlr-runtime-3.1.1.jar:$ISABELLE_HOME/contrib/kodkodi-1.5.7/jar/kodkod-1.5.jar:$ISABELLE_HOME/contrib/kodkodi-1.5.7/jar/kodkodi-1.5.7.jar:$ISABELLE_HOME/contrib/kodkodi-1.5.7/jar/sat4j-2.3.jar:$ISABELLE_HOME/contrib/postgresql-42.5.0/postgresql-42.5.0.jar:$ISABELLE_HOME/contrib/scala-3.2.0-2/lib/scala-library-2.13.8.jar:$ISABELLE_HOME/contrib/scala-3.2.0-2/lib/scala3-library_3-3.2.0.jar:$ISABELLE_HOME/contrib/scala-3.2.0-2/lib/scala-asm-9.3.0-scala-1.jar:$ISABELLE_HOME/contrib/scala-3.2.0-2/lib/compiler-interface-1.3.5.jar:$ISABELLE_HOME/contrib/scala-3.2.0-2/lib/scala3-interfaces-3.2.0.jar:$ISABELLE_HOME/contrib/scala-3.2.0-2/lib/scala3-compiler_3-3.2.0.jar:$ISABELLE_HOME/contrib/scala-3.2.0-2/lib/tasty-core_3-3.2.0.jar:$ISABELLE_HOME/contrib/scala-3.2.0-2/lib/scala3-staging_3-3.2.0.jar:$ISABELLE_HOME/contrib/scala-3.2.0-2/lib/scala3-tasty-inspector_3-3.2.0.jar:$ISABELLE_HOME/contrib/scala-3.2.0-2/lib/jline-reader-3.19.0.jar:$ISABELLE_HOME/contrib/scala-3.2.0-2/lib/jline-terminal-3.19.0.jar:$ISABELLE_HOME/contrib/scala-3.2.0-2/lib/jline-terminal-jna-3.19.0.jar:$ISABELLE_HOME/contrib/scala-3.2.0-2/lib/jna-5.3.1.jar:$ISABELLE_HOME/contrib/scala-3.2.0-2/lib/scala-parallel-collections_3-1.0.4.jar:$ISABELLE_HOME/contrib/scala-3.2.0-2/lib/scala-parser-combinators_3-2.1.1.jar:$ISABELLE_HOME/contrib/scala-3.2.0-2/lib/scala-swing_3-3.0.0.jar:$ISABELLE_HOME/contrib/scala-3.2.0-2/lib/scala-xml_3-2.1.0.jar:$ISABELLE_HOME/contrib/sqlite-jdbc-3.36.0.3/sqlite-jdbc-3.36.0.3.jar:$ISABELLE_HOME/contrib/xz-java-1.9/lib/xz-1.9.jar:$ISABELLE_HOME/contrib/naproche-20221024/Isabelle/naproche.jar:$ISABELLE_HOME/lib/classes/isabelle.jar:$ISABELLE_HOME/lib/classes/isabelle_graphbrowser.jar" \
"-splash:$ISABELLE_HOME/lib/logo/isabelle.gif" \
isabelle.jedit.JEdit_Main "$@"
Only in Isabelle2022-patched/lib/scripts: Isabelle_app~
Only in Isabelle2022-patched/lib/scripts: Isabelle_app.orig
Only in Isabelle2022-patched/lib/scripts: Isabelle_app.rej
diff -ur Isabelle2022/src/Pure/PIDE/active.ML Isabelle2022-patched/src/Pure/PIDE/active.ML
--- Isabelle2022/src/Pure/PIDE/active.ML 2022-10-24 19:37:32.000000000 +0100
+++ Isabelle2022-patched/src/Pure/PIDE/active.ML 2022-11-11 16:05:11.345317290 +0000
@@ -14,6 +14,8 @@
val dialog: unit -> (string -> Markup.T) * string future
val dialog_text: unit -> (string -> string) * string future
val dialog_result: serial -> string -> unit
+ val run_shell_command: string -> string option -> string -> string -> string
+ val run_system_shell_command: string option -> string -> string -> string
end;
structure Active: ACTIVE =
@@ -60,5 +62,15 @@
(fn tab => (Inttab.lookup tab i, Inttab.delete_safe i tab))
|> (fn NONE => () | SOME promise => Future.fulfill promise result);
+fun run_shell_command shell dir cmd =
+ let val dirprop = (case dir of NONE => [] | SOME d => [(Markup.shell_directoryN, d)])
+ in Markup.markup
+ (make_markup Markup.run_shell_commandN
+ {implicit = false
+ ,properties = [(Markup.shell_typeN, shell), (Markup.shell_commandN, cmd)] @ dirprop})
+ end
+
+val run_system_shell_command = run_shell_command "System";
+
end;
diff -ur Isabelle2022/src/Pure/PIDE/markup.ML Isabelle2022-patched/src/Pure/PIDE/markup.ML
--- Isabelle2022/src/Pure/PIDE/markup.ML 2022-10-24 19:37:32.000000000 +0100
+++ Isabelle2022-patched/src/Pure/PIDE/markup.ML 2022-11-11 16:05:11.345317290 +0000
@@ -237,6 +237,10 @@
val padding_command: Properties.entry
val dialogN: string val dialog: serial -> string -> T
val jedit_actionN: string
+ val run_shell_commandN: string
+ val shell_commandN: string
+ val shell_typeN: string
+ val shell_directoryN: string
val functionN: string
val ML_statistics: {pid: int, stats_dir: string} -> Properties.T
val commands_accepted: Properties.T
@@ -748,6 +752,13 @@
val jedit_actionN = "jedit_action";
+val run_shell_commandN = "run_shell_command"
+
+val shell_commandN = "shell_command"
+
+val shell_typeN = "shell_type"
+
+val shell_directoryN = "shell_directory"
(* protocol message functions *)
Only in Isabelle2022-patched/src/Pure/PIDE: markup.ML.orig
diff -ur Isabelle2022/src/Pure/PIDE/markup.scala Isabelle2022-patched/src/Pure/PIDE/markup.scala
--- Isabelle2022/src/Pure/PIDE/markup.scala 2022-10-24 19:37:32.000000000 +0100
+++ Isabelle2022-patched/src/Pure/PIDE/markup.scala 2022-11-11 16:05:11.349317313 +0000
@@ -606,6 +606,10 @@
val JEDIT_ACTION = "jedit_action"
+ val SHELL_COMMAND = "shell_command"
+ val SHELL_TYPE = "shell_type"
+ val SHELL_DIRECTORY = "shell_directory"
+ val RUN_SHELL_COMMAND = "run_shell_command"
/* protocol message functions */
Only in Isabelle2022-patched/src/Pure/PIDE: markup.scala.orig
diff -ur Isabelle2022/src/Pure/PIDE/rendering.scala Isabelle2022-patched/src/Pure/PIDE/rendering.scala
--- Isabelle2022/src/Pure/PIDE/rendering.scala 2022-10-24 19:37:32.000000000 +0100
+++ Isabelle2022-patched/src/Pure/PIDE/rendering.scala 2022-11-11 16:05:11.349317313 +0000
@@ -211,7 +211,7 @@
val active_elements =
Markup.Elements(Markup.DIALOG, Markup.BROWSER, Markup.GRAPHVIEW, Markup.THEORY_EXPORTS,
- Markup.SENDBACK, Markup.JEDIT_ACTION, Markup.SIMP_TRACE_PANEL)
+ Markup.SENDBACK, Markup.JEDIT_ACTION, Markup.SIMP_TRACE_PANEL, Markup.RUN_SHELL_COMMAND)
val background_elements =
Document_Status.Command_Status.proper_elements + Markup.WRITELN_MESSAGE +
Only in Isabelle2022-patched/src/Pure/PIDE: rendering.scala.orig
diff -ur Isabelle2022/src/Tools/jEdit/src/active.scala Isabelle2022-patched/src/Tools/jEdit/src/active.scala
--- Isabelle2022/src/Tools/jEdit/src/active.scala 2022-10-24 19:37:32.000000000 +0100
+++ Isabelle2022-patched/src/Tools/jEdit/src/active.scala 2022-11-11 16:05:11.349317313 +0000
@@ -9,7 +9,7 @@
import isabelle._
import org.gjt.sp.jedit.{ServiceManager, View}
-
+import console.{Console, Shell}
object Active {
abstract class Handler {
@@ -99,6 +99,36 @@
model.session.dialog_result(id, serial, result)
true
+ case XML.Elem(Markup(Markup.RUN_SHELL_COMMAND, props), _) =>
+ val shell_name = Properties.get(props, Markup.SHELL_TYPE).getOrElse("System")
+ Properties.get (props, Markup.SHELL_COMMAND) match {
+ case None => false
+ case Some(cmd) =>
+ view.getDockableWindowManager().addDockableWindow("console")
+
+ // Obtain the console instance
+ val console = view.getDockableWindowManager().getDockable("console").asInstanceOf[Console]
+
+ // Set the shell to use
+ val shell = Shell.getShell(shell_name)
+
+ shell.stop(console)
+ while (!shell.waitFor(console)) { }
+
+ // Change directory if requested
+ Properties.get(props, Markup.SHELL_DIRECTORY) match {
+ case Some(dir) => shell.chDir(console, dir);
+ case None => {}
+ }
+ while (!shell.waitFor(console)) { }
+
+ // Run the given command
+ console.run(shell, cmd)
+
+ true
+ }
+
+
case _ => false
}
}
Only in Isabelle2022-patched/src/Tools/jEdit/src: active.scala.orig