122 \alert{\textit{!~Grunds\"atzliches Problem f\"ur das Projekt ``SD''~!}} |
123 \alert{\textit{!~Grunds\"atzliches Problem f\"ur das Projekt ``SD''~!}} |
123 \end{itemize} |
124 \end{itemize} |
124 \end{frame} |
125 \end{frame} |
125 |
126 |
126 \subsection[Integration]{Isabelles Filestruktur im \"Ubergangsstadium} |
127 \subsection[Integration]{Isabelles Filestruktur im \"Ubergangsstadium} |
127 |
128 <<<<<<< local |
|
129 |
|
130 ======= |
|
131 >>>>>>> other |
|
132 |
|
133 <<<<<<< local |
|
134 %\begin{frame}\frametitle{Isabelle Files: *.jar} |
|
135 %{\footnotesize |
|
136 %----- for ``isabelle jedit \&''; contained in Isabelle\_bundle}\\ |
|
137 %{\tiny |
|
138 %./contrib/jedit-4.3.2\_Isabelle-6d736d983d5c/jedit.jar\\ |
|
139 %./contrib/jedit-4.3.2\_Isabelle-6d736d983d5c/jars/LatestVersion.jar\\ |
|
140 %./contrib/jedit-4.3.2\_Isabelle-6d736d983d5c/jars/SideKick.jar\\ |
|
141 %./contrib/jedit-4.3.2\_Isabelle-6d736d983d5c/jars/Console.jar\\ |
|
142 %./contrib/jedit-4.3.2\_Isabelle-6d736d983d5c/jars/Pure.jar \alert{$\;\;\;\;\;\;\;\;\;\;\;\Longleftarrow$ entry to SML}\\ |
|
143 %./contrib/jedit-4.3.2\_Isabelle-6d736d983d5c/jars/Isac.jar\\ |
|
144 %./contrib/jedit-4.3.2\_Isabelle-6d736d983d5c/jars/scala-compiler.jar\\ |
|
145 %./contrib/jedit-4.3.2\_Isabelle-6d736d983d5c/jars/Isabelle-jEdit.jar\\ |
|
146 %./contrib/jedit-4.3.2\_Isabelle-6d736d983d5c/jars/cobra.jar\\ |
|
147 %./contrib/jedit-4.3.2\_Isabelle-6d736d983d5c/jars/js.jar\\ |
|
148 %./contrib/jedit-4.3.2\_Isabelle-6d736d983d5c/jars/Hyperlinks.jar\\ |
|
149 %./contrib/jedit-4.3.2\_Isabelle-6d736d983d5c/jars/scala-swing.jar\\ |
|
150 %./contrib/jedit-4.3.2\_Isabelle-6d736d983d5c/jars/scala-library.jar\\ |
|
151 %./contrib/jedit-4.3.2\_Isabelle-6d736d983d5c/jars/QuickNotepad.jar\\ |
|
152 %./contrib/jedit-4.3.2\_Isabelle-6d736d983d5c/jars/ErrorList.jar\\ |
|
153 % |
|
154 %{\footnotesize |
|
155 %----- scala system; contained in Isabelle\_bundle}\\ |
|
156 %./contrib/scala-2.8.1.final/misc/sbaz/scala-bazaars.jar\\ |
|
157 %./contrib/scala-2.8.1.final/misc/sbaz/sbaz-tests.jar\\ |
|
158 %./contrib/scala-2.8.1.final/misc/scala-devel/plugins/continuations.jar\\ |
|
159 %./contrib/scala-2.8.1.final/lib/scala-compiler.jar\\ |
|
160 %./contrib/scala-2.8.1.final/lib/scalap.jar\\ |
|
161 %./contrib/scala-2.8.1.final/lib/scala-swing.jar\\ |
|
162 %./contrib/scala-2.8.1.final/lib/scala-library.jar\\ |
|
163 %./contrib/scala-2.8.1.final/lib/jline.jar\\ |
|
164 %./contrib/scala-2.8.1.final/lib/scala-dbc.jar\\ |
|
165 %./contrib/scala-2.8.1.final/src/scala-library-src.jar\\ |
|
166 %./contrib/scala-2.8.1.final/src/scala-swing-src.jar\\ |
|
167 %./contrib/scala-2.8.1.final/src/scala-compiler-src.jar\\ |
|
168 %./contrib/scala-2.8.1.final/src/scala-dbc-src.jar\\ |
|
169 %./contrib/scala-2.8.1.final/src/sbaz-src.jar\\ |
|
170 %} |
|
171 %\end{frame} |
|
172 % |
|
173 %\begin{frame}\frametitle{Isabelle Files: *.scala} |
|
174 %{\tiny |
|
175 %./src/Pure/General/xml.scala\\ |
|
176 %./src/Pure/General/linear\_set.scala\\ |
|
177 ======= |
128 \begin{frame}\frametitle{Isabelle Files: *.scala} |
178 \begin{frame}\frametitle{Isabelle Files: *.scala} |
129 {\tiny |
179 {\tiny |
130 \textbf{\$ find -name ``*.scala''}\\ |
180 \textbf{\$ find -name ``*.scala''}\\ |
131 ./src/Pure/General/xml.scala\\ |
181 ./src/Pure/General/xml.scala\\ |
132 ./src/Pure/General/linear\_set.scala\\ |
182 ./src/Pure/General/linear\_set.scala\\ |
|
183 >>>>>>> other |
133 %./src/Pure/General/symbol.scala\\ |
184 %./src/Pure/General/symbol.scala\\ |
134 %./src/Pure/General/exn.scala\\ |
185 %./src/Pure/General/exn.scala\\ |
135 %./src/Pure/General/position.scala\\ |
186 %./src/Pure/General/position.scala\\ |
136 %./src/Pure/General/scan.scala\\ |
187 %./src/Pure/General/scan.scala\\ |
137 %./src/Pure/General/xml\_data.scala\\ |
188 %./src/Pure/General/xml\_data.scala\\ |
138 %./src/Pure/General/yxml.scala\\ |
189 %./src/Pure/General/yxml.scala\\ |
139 %./src/Pure/General/markup.scala\\ |
190 %./src/Pure/General/markup.scala\\ |
|
191 <<<<<<< local |
|
192 ======= |
140 :\\ |
193 :\\ |
|
194 >>>>>>> other |
141 %./src/Pure/General/sha1.scala\\ |
195 %./src/Pure/General/sha1.scala\\ |
|
196 <<<<<<< local |
|
197 %./src/Pure/General/timing.scala\\ |
|
198 %./src/Pure/General/pretty.scala\\ |
|
199 %.\\ |
|
200 %./src/Pure/Concurrent/volatile.scala\\ |
|
201 %./src/Pure/Concurrent/future.scala\\ |
|
202 %./src/Pure/Concurrent/simple\_thread.scala\\ |
|
203 %.\\ |
|
204 %./src/Pure/Thy/html.scala\\ |
|
205 %./src/Pure/Thy/completion.scala\\ |
|
206 %./src/Pure/Thy/thy\_header.scala\\ |
|
207 %./src/Pure/Thy/thy\_syntax.scala\\ |
|
208 %./src/Pure/Isac/isac.scala\\ |
|
209 %./src/Pure/library.scala\\ |
|
210 %.\\ |
|
211 %./src/Pure/Isar/keyword.scala\\ |
|
212 %./src/Pure/Isar/outer\_syntax.scala\\ |
|
213 %./src/Pure/Isar/token.scala\\ |
|
214 %./src/Pure/Isar/parse.scala\\ |
|
215 %.\\ |
|
216 %./src/Pure/System/gui\_setup.scala\\ |
|
217 %./src/Pure/System/isabelle\_system.scala\\ |
|
218 ======= |
142 ./src/Pure/General/timing.scala\\ |
219 ./src/Pure/General/timing.scala\\ |
143 ./src/Pure/General/pretty.scala\\ |
220 ./src/Pure/General/pretty.scala\\ |
144 .\\ |
221 .\\ |
145 ./src/Pure/Concurrent/volatile.scala\\ |
222 ./src/Pure/Concurrent/volatile.scala\\ |
146 ./src/Pure/Concurrent/future.scala\\ |
223 ./src/Pure/Concurrent/future.scala\\ |
158 ./src/Pure/Isar/token.scala\\ |
235 ./src/Pure/Isar/token.scala\\ |
159 ./src/Pure/Isar/parse.scala\\ |
236 ./src/Pure/Isar/parse.scala\\ |
160 .\\ |
237 .\\ |
161 ./src/Pure/System/gui\_setup.scala\\ |
238 ./src/Pure/System/gui\_setup.scala\\ |
162 ./src/Pure/System/isabelle\_system.scala\\ |
239 ./src/Pure/System/isabelle\_system.scala\\ |
|
240 >>>>>>> other |
163 %./src/Pure/System/swing\_thread.scala\\ |
241 %./src/Pure/System/swing\_thread.scala\\ |
164 %./src/Pure/System/download.scala\\ |
242 %./src/Pure/System/download.scala\\ |
165 %./src/Pure/System/session\_manager.scala\\ |
243 %./src/Pure/System/session\_manager.scala\\ |
166 %./src/Pure/System/standard\_system.scala\\ |
244 %./src/Pure/System/standard\_system.scala\\ |
167 %./src/Pure/System/isabelle\_syntax.scala\\ |
245 %./src/Pure/System/isabelle\_syntax.scala\\ |
168 %./src/Pure/System/session.scala\\ |
246 %./src/Pure/System/session.scala\\ |
169 %./src/Pure/System/platform.scala\\ |
247 %./src/Pure/System/platform.scala\\ |
170 %./src/Pure/System/cygwin.scala\\ |
248 %./src/Pure/System/cygwin.scala\\ |
|
249 <<<<<<< local |
|
250 %./src/Pure/System/event\_bus.scala\\ |
|
251 %./src/Pure/System/isabelle\_process.scala\\ |
|
252 %.\\ |
|
253 %./src/Pure/PIDE/document.scala\\ |
|
254 %./src/Pure/PIDE/markup\_tree.scala\\ |
|
255 %./src/Pure/PIDE/text.scala\\ |
|
256 %./src/Pure/PIDE/command.scala\\ |
|
257 %./src/Pure/PIDE/isar\_document.scala |
|
258 %} |
|
259 %\end{frame} |
|
260 ======= |
171 :\\ |
261 :\\ |
172 ./src/Pure/System/event\_bus.scala\\ |
262 ./src/Pure/System/event\_bus.scala\\ |
173 ./src/Pure/System/isabelle\_process.scala\\ |
263 ./src/Pure/System/isabelle\_process.scala\\ |
174 .\\ |
264 .\\ |
175 ./src/Pure/PIDE/document.scala\\ |
265 ./src/Pure/PIDE/document.scala\\ |
390 |
481 |
391 \section[Summary]{Zusammenfassung} |
482 \section[Summary]{Zusammenfassung} |
392 \begin{frame}\frametitle{Zusammenfassung} |
483 \begin{frame}\frametitle{Zusammenfassung} |
393 Folgende Milestones wurden erfolgreich abgeschlossen: |
484 Folgende Milestones wurden erfolgreich abgeschlossen: |
394 \begin{enumerate} |
485 \begin{enumerate} |
395 \item Relevante Isabelle Komponenten dokumentiert (...Std.) |
486 \item Relevante Isabelle Komponenten dokumentiert |
|
487 \pause |
396 \item Installation der Standard-Komponenten: |
488 \item Installation der Standard-Komponenten: |
397 \begin{itemize} |
489 \begin{itemize} |
398 \item Mercurial Versioncontrol |
490 \item Mercurial Versioncontrol |
399 \item NetBeans IDE |
491 \item NetBeans IDE |
400 \item Standard Isabelle Bundle |
492 \item Standard Isabelle Bundle |
401 \end{itemize} |
493 \end{itemize} |
|
494 \pause |
402 \item Entwicklungsumgebung vom Isabelle-Team kopieren |
495 \item Entwicklungsumgebung vom Isabelle-Team kopieren |
403 \begin{itemize} |
496 \begin{itemize} |
404 \item Isabelle-Sources vom Repository M\"unchen (Java, Scala, ML) |
497 \item Isabelle-Sources vom Repository M\"unchen (Java, Scala, ML) |
405 \item jEdit als NetBeans Projekt definiert |
498 \item jEdit als NetBeans Projekt definiert |
406 \end{itemize} |
499 \end{itemize} |
|
500 \pause |
407 \item Relevante Komponenten implementieren |
501 \item Relevante Komponenten implementieren |
408 \begin{itemize} |
502 \begin{itemize} |
409 \item jEdit Plugin f\"ur SD |
503 \item jEdit Plugin f\"ur SD |
410 \item Verbindung des Plugins zu Isabelle |
504 \item Verbindung des Plugins zu Isabelle |
411 \item zugeh\"origen Parser: nur ein Test in SML |
505 \item zugeh\"origen Parser: nur ein Test in SML |