# HG changeset patch
# User wenzelm
# Date 1307562054 -7200
# Node ID a319da4fbfb029823fab92af6713049a98e445ad
# Parent 966f359dc724a0fb2eb5f12242202581771e24a2
simplified directory structure;
diff -r 966f359dc724 -r a319da4fbfb0 src/Tools/jEdit/lib/Tools/jedit
--- a/src/Tools/jEdit/lib/Tools/jedit Wed Jun 08 21:29:49 2011 +0200
+++ b/src/Tools/jEdit/lib/Tools/jedit Wed Jun 08 21:40:54 2011 +0200
@@ -7,7 +7,7 @@
## sources
-declare -a SOURCES=(
+declare -a SOURCE_FILES=(
"src/dockable.scala"
"src/document_model.scala"
"src/document_view.scala"
@@ -25,11 +25,11 @@
"src/session_dockable.scala"
)
-declare -a PLUGIN_FILES=(
- "plugin/actions.xml"
- "plugin/dockables.xml"
- "plugin/Isabelle.props"
- "plugin/services.xml"
+declare -a MORE_FILES=(
+ "src/actions.xml"
+ "src/dockables.xml"
+ "src/Isabelle.props"
+ "src/services.xml"
)
@@ -169,7 +169,7 @@
OUTDATED=true
else
OUTDATED=false
- for SOURCE in "${SOURCES[@]}" "${PLUGIN_FILES[@]}" "$JEDIT_JAR" "${JEDIT_JARS[@]}"
+ for SOURCE in "${SOURCE_FILES[@]}" "${MORE_FILES[@]}" "$JEDIT_JAR" "${JEDIT_JARS[@]}"
do
[ ! -e "$SOURCE" ] && fail "Missing file: $SOURCE"
[ ! -e "$TARGET" -o "$SOURCE" -nt "$TARGET" ] && OUTDATED=true
@@ -198,9 +198,8 @@
mkdir -p dist dist/classes || failed
cp -a "$ISABELLE_JEDIT_BUILD_HOME/contrib/$ISABELLE_JEDIT_BUILD_VERSION/." dist/.
- cp -a "${PLUGIN_FILES[@]}" dist/classes/.
+ cp -a "${MORE_FILES[@]}" dist/classes/.
cp -a dist-template/. dist/.
- cp -a README dist/.
perl -i -e 'while (<>) { if (m/NAME="javacc"/) {
print qq,\n\n,;
@@ -218,7 +217,7 @@
CLASSPATH="$(jvmpath "$CLASSPATH")"
exec "$SCALA_HOME/bin/scalac" -unchecked -deprecation \
- -d dist/classes -target:jvm-1.5 "${SOURCES[@]}"
+ -d dist/classes -target:jvm-1.5 "${SOURCE_FILES[@]}"
) || fail "Failed to compile sources"
cd dist/classes
diff -r 966f359dc724 -r a319da4fbfb0 src/Tools/jEdit/plugin/Isabelle.props
--- a/src/Tools/jEdit/plugin/Isabelle.props Wed Jun 08 21:29:49 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,60 +0,0 @@
-## Isabelle plugin properties
-##
-##:encoding=ISO-8859-1:wrap=soft:maxLineLen=100:
-
-#identification
-plugin.isabelle.jedit.Plugin.name=Isabelle
-plugin.isabelle.jedit.Plugin.author=Johannes Hölzl, Fabian Immler, Makarius Wenzel
-plugin.isabelle.jedit.Plugin.version=0.1.0
-plugin.isabelle.jedit.Plugin.description=Isabelle/Isar asynchronous proof document editing
-
-#system parameters
-plugin.isabelle.jedit.Plugin.activate=startup
-plugin.isabelle.jedit.Plugin.usePluginHome=false
-
-#dependencies
-plugin.isabelle.jedit.Plugin.depend.0=jdk 1.6
-plugin.isabelle.jedit.Plugin.depend.1=jedit 04.03.99.00
-plugin.isabelle.jedit.Plugin.depend.2=plugin console.ConsolePlugin 4.4.1
-plugin.isabelle.jedit.Plugin.depend.3=plugin errorlist.ErrorListPlugin 1.8
-plugin.isabelle.jedit.Plugin.depend.4=plugin sidekick.SideKickPlugin 0.8
-plugin.isabelle.jedit.Plugin.depend.5=plugin gatchan.jedit.hyperlinks.HyperlinksPlugin 1.0.1
-
-#options
-plugin.isabelle.jedit.Plugin.option-pane=isabelle
-options.isabelle.label=Isabelle
-options.isabelle.code=new isabelle.jedit.Isabelle_Options();
-options.isabelle.logic.title=Logic
-options.isabelle.relative-font-size.title=Relative Font Size
-options.isabelle.relative-font-size=100
-options.isabelle.tooltip-font-size.title=Tooltip Font Size
-options.isabelle.tooltip-font-size=10
-options.isabelle.tooltip-margin.title=Tooltip Margin
-options.isabelle.tooltip-margin=40
-options.isabelle.tooltip-dismiss-delay.title=Tooltip Dismiss Delay (global)
-options.isabelle.tooltip-dismiss-delay=8.0
-options.isabelle.startup-timeout=25.0
-options.isabelle.auto-start.title=Auto Start
-options.isabelle.auto-start=true
-
-#menu actions
-plugin.isabelle.jedit.Plugin.menu.label=Isabelle
-plugin.isabelle.jedit.Plugin.menu=isabelle.session-panel isabelle.output-panel isabelle.raw-output-panel isabelle.protocol-panel
-isabelle.session-panel.label=Prover Session panel
-isabelle.output-panel.label=Output panel
-isabelle.raw-output-panel.label=Raw Output panel
-isabelle.protocol-panel.label=Protocol panel
-
-#dockables
-isabelle-session.title=Prover Session
-isabelle-output.title=Output
-isabelle-raw-output.title=Raw Output
-isabelle-protocol.title=Protocol
-
-#SideKick
-sidekick.parser.isabelle.label=Isabelle
-mode.isabelle.sidekick.parser=isabelle
-mode.ml.sidekick.parser=isabelle
-
-#Hyperlinks
-mode.isabelle.hyperlink.source=isabelle
diff -r 966f359dc724 -r a319da4fbfb0 src/Tools/jEdit/plugin/actions.xml
--- a/src/Tools/jEdit/plugin/actions.xml Wed Jun 08 21:29:49 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-
-
-
-
-
-
- wm.addDockableWindow("isabelle-session");
-
-
-
-
- wm.addDockableWindow("isabelle-output");
-
-
-
-
- wm.addDockableWindow("isabelle-raw-output");
-
-
-
-
- wm.addDockableWindow("isabelle-protocol");
-
-
-
\ No newline at end of file
diff -r 966f359dc724 -r a319da4fbfb0 src/Tools/jEdit/plugin/dockables.xml
--- a/src/Tools/jEdit/plugin/dockables.xml Wed Jun 08 21:29:49 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-
-
-
-
-
- new isabelle.jedit.Session_Dockable(view, position);
-
-
- new isabelle.jedit.Output_Dockable(view, position);
-
-
- new isabelle.jedit.Raw_Output_Dockable(view, position);
-
-
- new isabelle.jedit.Protocol_Dockable(view, position);
-
-
\ No newline at end of file
diff -r 966f359dc724 -r a319da4fbfb0 src/Tools/jEdit/plugin/services.xml
--- a/src/Tools/jEdit/plugin/services.xml Wed Jun 08 21:29:49 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-
-
-
-
-
- new isabelle.jedit.Isabelle_Encoding();
-
-
- new isabelle.jedit.Isabelle_Sidekick_Default();
-
-
- new isabelle.jedit.Isabelle_Sidekick_Raw();
-
-
- new isabelle.jedit.Isabelle_Hyperlinks();
-
-
- new isabelle.jedit.Scala_Console();
-
-
diff -r 966f359dc724 -r a319da4fbfb0 src/Tools/jEdit/src/Isabelle.props
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/Tools/jEdit/src/Isabelle.props Wed Jun 08 21:40:54 2011 +0200
@@ -0,0 +1,60 @@
+## Isabelle plugin properties
+##
+##:encoding=ISO-8859-1:wrap=soft:maxLineLen=100:
+
+#identification
+plugin.isabelle.jedit.Plugin.name=Isabelle
+plugin.isabelle.jedit.Plugin.author=Johannes Hölzl, Fabian Immler, Makarius Wenzel
+plugin.isabelle.jedit.Plugin.version=0.1.0
+plugin.isabelle.jedit.Plugin.description=Isabelle/Isar asynchronous proof document editing
+
+#system parameters
+plugin.isabelle.jedit.Plugin.activate=startup
+plugin.isabelle.jedit.Plugin.usePluginHome=false
+
+#dependencies
+plugin.isabelle.jedit.Plugin.depend.0=jdk 1.6
+plugin.isabelle.jedit.Plugin.depend.1=jedit 04.03.99.00
+plugin.isabelle.jedit.Plugin.depend.2=plugin console.ConsolePlugin 4.4.1
+plugin.isabelle.jedit.Plugin.depend.3=plugin errorlist.ErrorListPlugin 1.8
+plugin.isabelle.jedit.Plugin.depend.4=plugin sidekick.SideKickPlugin 0.8
+plugin.isabelle.jedit.Plugin.depend.5=plugin gatchan.jedit.hyperlinks.HyperlinksPlugin 1.0.1
+
+#options
+plugin.isabelle.jedit.Plugin.option-pane=isabelle
+options.isabelle.label=Isabelle
+options.isabelle.code=new isabelle.jedit.Isabelle_Options();
+options.isabelle.logic.title=Logic
+options.isabelle.relative-font-size.title=Relative Font Size
+options.isabelle.relative-font-size=100
+options.isabelle.tooltip-font-size.title=Tooltip Font Size
+options.isabelle.tooltip-font-size=10
+options.isabelle.tooltip-margin.title=Tooltip Margin
+options.isabelle.tooltip-margin=40
+options.isabelle.tooltip-dismiss-delay.title=Tooltip Dismiss Delay (global)
+options.isabelle.tooltip-dismiss-delay=8.0
+options.isabelle.startup-timeout=25.0
+options.isabelle.auto-start.title=Auto Start
+options.isabelle.auto-start=true
+
+#menu actions
+plugin.isabelle.jedit.Plugin.menu.label=Isabelle
+plugin.isabelle.jedit.Plugin.menu=isabelle.session-panel isabelle.output-panel isabelle.raw-output-panel isabelle.protocol-panel
+isabelle.session-panel.label=Prover Session panel
+isabelle.output-panel.label=Output panel
+isabelle.raw-output-panel.label=Raw Output panel
+isabelle.protocol-panel.label=Protocol panel
+
+#dockables
+isabelle-session.title=Prover Session
+isabelle-output.title=Output
+isabelle-raw-output.title=Raw Output
+isabelle-protocol.title=Protocol
+
+#SideKick
+sidekick.parser.isabelle.label=Isabelle
+mode.isabelle.sidekick.parser=isabelle
+mode.ml.sidekick.parser=isabelle
+
+#Hyperlinks
+mode.isabelle.hyperlink.source=isabelle
diff -r 966f359dc724 -r a319da4fbfb0 src/Tools/jEdit/src/actions.xml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/Tools/jEdit/src/actions.xml Wed Jun 08 21:40:54 2011 +0200
@@ -0,0 +1,25 @@
+
+
+
+
+
+
+ wm.addDockableWindow("isabelle-session");
+
+
+
+
+ wm.addDockableWindow("isabelle-output");
+
+
+
+
+ wm.addDockableWindow("isabelle-raw-output");
+
+
+
+
+ wm.addDockableWindow("isabelle-protocol");
+
+
+
\ No newline at end of file
diff -r 966f359dc724 -r a319da4fbfb0 src/Tools/jEdit/src/dockables.xml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/Tools/jEdit/src/dockables.xml Wed Jun 08 21:40:54 2011 +0200
@@ -0,0 +1,17 @@
+
+
+
+
+
+ new isabelle.jedit.Session_Dockable(view, position);
+
+
+ new isabelle.jedit.Output_Dockable(view, position);
+
+
+ new isabelle.jedit.Raw_Output_Dockable(view, position);
+
+
+ new isabelle.jedit.Protocol_Dockable(view, position);
+
+
\ No newline at end of file
diff -r 966f359dc724 -r a319da4fbfb0 src/Tools/jEdit/src/services.xml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/Tools/jEdit/src/services.xml Wed Jun 08 21:40:54 2011 +0200
@@ -0,0 +1,20 @@
+
+
+
+
+
+ new isabelle.jedit.Isabelle_Encoding();
+
+
+ new isabelle.jedit.Isabelle_Sidekick_Default();
+
+
+ new isabelle.jedit.Isabelle_Sidekick_Raw();
+
+
+ new isabelle.jedit.Isabelle_Hyperlinks();
+
+
+ new isabelle.jedit.Scala_Console();
+
+