simplified directory structure;
authorwenzelm
Wed Jun 08 21:40:54 2011 +0200 (2011-06-08)
changeset 43286a319da4fbfb0
parent 43285 966f359dc724
child 43287 acc680ab6204
simplified directory structure;
src/Tools/jEdit/lib/Tools/jedit
src/Tools/jEdit/plugin/Isabelle.props
src/Tools/jEdit/plugin/actions.xml
src/Tools/jEdit/plugin/dockables.xml
src/Tools/jEdit/plugin/services.xml
src/Tools/jEdit/src/Isabelle.props
src/Tools/jEdit/src/actions.xml
src/Tools/jEdit/src/dockables.xml
src/Tools/jEdit/src/services.xml
     1.1 --- a/src/Tools/jEdit/lib/Tools/jedit	Wed Jun 08 21:29:49 2011 +0200
     1.2 +++ b/src/Tools/jEdit/lib/Tools/jedit	Wed Jun 08 21:40:54 2011 +0200
     1.3 @@ -7,7 +7,7 @@
     1.4  
     1.5  ## sources
     1.6  
     1.7 -declare -a SOURCES=(
     1.8 +declare -a SOURCE_FILES=(
     1.9    "src/dockable.scala"
    1.10    "src/document_model.scala"
    1.11    "src/document_view.scala"
    1.12 @@ -25,11 +25,11 @@
    1.13    "src/session_dockable.scala"
    1.14  )
    1.15  
    1.16 -declare -a PLUGIN_FILES=(
    1.17 -  "plugin/actions.xml"
    1.18 -  "plugin/dockables.xml"
    1.19 -  "plugin/Isabelle.props"
    1.20 -  "plugin/services.xml"
    1.21 +declare -a MORE_FILES=(
    1.22 +  "src/actions.xml"
    1.23 +  "src/dockables.xml"
    1.24 +  "src/Isabelle.props"
    1.25 +  "src/services.xml"
    1.26  )
    1.27  
    1.28  
    1.29 @@ -169,7 +169,7 @@
    1.30    OUTDATED=true
    1.31  else
    1.32    OUTDATED=false
    1.33 -  for SOURCE in "${SOURCES[@]}" "${PLUGIN_FILES[@]}" "$JEDIT_JAR" "${JEDIT_JARS[@]}"
    1.34 +  for SOURCE in "${SOURCE_FILES[@]}" "${MORE_FILES[@]}" "$JEDIT_JAR" "${JEDIT_JARS[@]}"
    1.35    do
    1.36      [ ! -e "$SOURCE" ] && fail "Missing file: $SOURCE"
    1.37      [ ! -e "$TARGET" -o "$SOURCE" -nt "$TARGET" ] && OUTDATED=true
    1.38 @@ -198,9 +198,8 @@
    1.39    mkdir -p dist dist/classes || failed
    1.40    cp -a "$ISABELLE_JEDIT_BUILD_HOME/contrib/$ISABELLE_JEDIT_BUILD_VERSION/." dist/.
    1.41  
    1.42 -  cp -a "${PLUGIN_FILES[@]}" dist/classes/.
    1.43 +  cp -a "${MORE_FILES[@]}" dist/classes/.
    1.44    cp -a dist-template/. dist/.
    1.45 -  cp -a README dist/.
    1.46  
    1.47    perl -i -e 'while (<>) { if (m/NAME="javacc"/) {
    1.48      print qq,<MODE NAME="isabelle" FILE="isabelle.xml" FILE_NAME_GLOB="*.thy"/>\n\n,;
    1.49 @@ -218,7 +217,7 @@
    1.50      CLASSPATH="$(jvmpath "$CLASSPATH")"
    1.51  
    1.52      exec "$SCALA_HOME/bin/scalac" -unchecked -deprecation \
    1.53 -      -d dist/classes -target:jvm-1.5 "${SOURCES[@]}"
    1.54 +      -d dist/classes -target:jvm-1.5 "${SOURCE_FILES[@]}"
    1.55    ) || fail "Failed to compile sources"
    1.56  
    1.57    cd dist/classes
     2.1 --- a/src/Tools/jEdit/plugin/Isabelle.props	Wed Jun 08 21:29:49 2011 +0200
     2.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.3 @@ -1,60 +0,0 @@
     2.4 -## Isabelle plugin properties
     2.5 -##
     2.6 -##:encoding=ISO-8859-1:wrap=soft:maxLineLen=100:
     2.7 -
     2.8 -#identification
     2.9 -plugin.isabelle.jedit.Plugin.name=Isabelle
    2.10 -plugin.isabelle.jedit.Plugin.author=Johannes Hölzl, Fabian Immler, Makarius Wenzel
    2.11 -plugin.isabelle.jedit.Plugin.version=0.1.0
    2.12 -plugin.isabelle.jedit.Plugin.description=Isabelle/Isar asynchronous proof document editing
    2.13 -
    2.14 -#system parameters
    2.15 -plugin.isabelle.jedit.Plugin.activate=startup
    2.16 -plugin.isabelle.jedit.Plugin.usePluginHome=false
    2.17 -
    2.18 -#dependencies
    2.19 -plugin.isabelle.jedit.Plugin.depend.0=jdk 1.6
    2.20 -plugin.isabelle.jedit.Plugin.depend.1=jedit 04.03.99.00
    2.21 -plugin.isabelle.jedit.Plugin.depend.2=plugin console.ConsolePlugin 4.4.1
    2.22 -plugin.isabelle.jedit.Plugin.depend.3=plugin errorlist.ErrorListPlugin 1.8
    2.23 -plugin.isabelle.jedit.Plugin.depend.4=plugin sidekick.SideKickPlugin 0.8
    2.24 -plugin.isabelle.jedit.Plugin.depend.5=plugin gatchan.jedit.hyperlinks.HyperlinksPlugin 1.0.1
    2.25 -
    2.26 -#options
    2.27 -plugin.isabelle.jedit.Plugin.option-pane=isabelle
    2.28 -options.isabelle.label=Isabelle
    2.29 -options.isabelle.code=new isabelle.jedit.Isabelle_Options();
    2.30 -options.isabelle.logic.title=Logic
    2.31 -options.isabelle.relative-font-size.title=Relative Font Size
    2.32 -options.isabelle.relative-font-size=100
    2.33 -options.isabelle.tooltip-font-size.title=Tooltip Font Size
    2.34 -options.isabelle.tooltip-font-size=10
    2.35 -options.isabelle.tooltip-margin.title=Tooltip Margin
    2.36 -options.isabelle.tooltip-margin=40
    2.37 -options.isabelle.tooltip-dismiss-delay.title=Tooltip Dismiss Delay (global)
    2.38 -options.isabelle.tooltip-dismiss-delay=8.0
    2.39 -options.isabelle.startup-timeout=25.0
    2.40 -options.isabelle.auto-start.title=Auto Start
    2.41 -options.isabelle.auto-start=true
    2.42 -
    2.43 -#menu actions
    2.44 -plugin.isabelle.jedit.Plugin.menu.label=Isabelle
    2.45 -plugin.isabelle.jedit.Plugin.menu=isabelle.session-panel isabelle.output-panel isabelle.raw-output-panel isabelle.protocol-panel
    2.46 -isabelle.session-panel.label=Prover Session panel
    2.47 -isabelle.output-panel.label=Output panel
    2.48 -isabelle.raw-output-panel.label=Raw Output panel
    2.49 -isabelle.protocol-panel.label=Protocol panel
    2.50 -
    2.51 -#dockables
    2.52 -isabelle-session.title=Prover Session
    2.53 -isabelle-output.title=Output
    2.54 -isabelle-raw-output.title=Raw Output
    2.55 -isabelle-protocol.title=Protocol
    2.56 -
    2.57 -#SideKick
    2.58 -sidekick.parser.isabelle.label=Isabelle
    2.59 -mode.isabelle.sidekick.parser=isabelle
    2.60 -mode.ml.sidekick.parser=isabelle
    2.61 -
    2.62 -#Hyperlinks
    2.63 -mode.isabelle.hyperlink.source=isabelle
     3.1 --- a/src/Tools/jEdit/plugin/actions.xml	Wed Jun 08 21:29:49 2011 +0200
     3.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.3 @@ -1,25 +0,0 @@
     3.4 -<?xml version="1.0"?>
     3.5 -<!DOCTYPE ACTIONS SYSTEM "actions.dtd">
     3.6 -
     3.7 -<ACTIONS>
     3.8 -	<ACTION NAME="isabelle.session-panel">
     3.9 -		<CODE>
    3.10 -			wm.addDockableWindow("isabelle-session");
    3.11 -		</CODE>
    3.12 -	</ACTION>
    3.13 -	<ACTION NAME="isabelle.output-panel">
    3.14 -		<CODE>
    3.15 -			wm.addDockableWindow("isabelle-output");
    3.16 -		</CODE>
    3.17 -	</ACTION>
    3.18 -	<ACTION NAME="isabelle.raw-output-panel">
    3.19 -		<CODE>
    3.20 -			wm.addDockableWindow("isabelle-raw-output");
    3.21 -		</CODE>
    3.22 -	</ACTION>
    3.23 -	<ACTION NAME="isabelle.protocol-panel">
    3.24 -		<CODE>
    3.25 -			wm.addDockableWindow("isabelle-protocol");
    3.26 -		</CODE>
    3.27 -	</ACTION>
    3.28 -</ACTIONS>
    3.29 \ No newline at end of file
     4.1 --- a/src/Tools/jEdit/plugin/dockables.xml	Wed Jun 08 21:29:49 2011 +0200
     4.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.3 @@ -1,17 +0,0 @@
     4.4 -<?xml version="1.0"?>
     4.5 -<!DOCTYPE DOCKABLES SYSTEM "dockables.dtd">
     4.6 -
     4.7 -<DOCKABLES>
     4.8 -	<DOCKABLE NAME="isabelle-session" MOVABLE="TRUE">
     4.9 -		new isabelle.jedit.Session_Dockable(view, position);
    4.10 -	</DOCKABLE>
    4.11 -	<DOCKABLE NAME="isabelle-output" MOVABLE="TRUE">
    4.12 -		new isabelle.jedit.Output_Dockable(view, position);
    4.13 -	</DOCKABLE>
    4.14 -	<DOCKABLE NAME="isabelle-raw-output" MOVABLE="TRUE">
    4.15 -		new isabelle.jedit.Raw_Output_Dockable(view, position);
    4.16 -	</DOCKABLE>
    4.17 -	<DOCKABLE NAME="isabelle-protocol" MOVABLE="TRUE">
    4.18 -		new isabelle.jedit.Protocol_Dockable(view, position);
    4.19 -	</DOCKABLE>
    4.20 -</DOCKABLES>
    4.21 \ No newline at end of file
     5.1 --- a/src/Tools/jEdit/plugin/services.xml	Wed Jun 08 21:29:49 2011 +0200
     5.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     5.3 @@ -1,20 +0,0 @@
     5.4 -<?xml version="1.0"?>
     5.5 -<!DOCTYPE SERVICES SYSTEM "services.dtd">
     5.6 -
     5.7 -<SERVICES>
     5.8 -	<SERVICE NAME="UTF-8-Isabelle" CLASS="org.gjt.sp.jedit.io.Encoding">
     5.9 -		new isabelle.jedit.Isabelle_Encoding();
    5.10 -	</SERVICE>
    5.11 -	<SERVICE NAME="isabelle" CLASS="sidekick.SideKickParser">
    5.12 -		new isabelle.jedit.Isabelle_Sidekick_Default();
    5.13 -	</SERVICE>
    5.14 -	<SERVICE NAME="isabelle-raw" CLASS="sidekick.SideKickParser">
    5.15 -		new isabelle.jedit.Isabelle_Sidekick_Raw();
    5.16 -	</SERVICE>
    5.17 -  <SERVICE NAME="isabelle" CLASS="gatchan.jedit.hyperlinks.HyperlinkSource">
    5.18 -    new isabelle.jedit.Isabelle_Hyperlinks();
    5.19 -  </SERVICE>
    5.20 - 	<SERVICE CLASS="console.Shell" NAME="Scala">
    5.21 -		new isabelle.jedit.Scala_Console();
    5.22 -	</SERVICE>
    5.23 -</SERVICES>
     6.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     6.2 +++ b/src/Tools/jEdit/src/Isabelle.props	Wed Jun 08 21:40:54 2011 +0200
     6.3 @@ -0,0 +1,60 @@
     6.4 +## Isabelle plugin properties
     6.5 +##
     6.6 +##:encoding=ISO-8859-1:wrap=soft:maxLineLen=100:
     6.7 +
     6.8 +#identification
     6.9 +plugin.isabelle.jedit.Plugin.name=Isabelle
    6.10 +plugin.isabelle.jedit.Plugin.author=Johannes Hölzl, Fabian Immler, Makarius Wenzel
    6.11 +plugin.isabelle.jedit.Plugin.version=0.1.0
    6.12 +plugin.isabelle.jedit.Plugin.description=Isabelle/Isar asynchronous proof document editing
    6.13 +
    6.14 +#system parameters
    6.15 +plugin.isabelle.jedit.Plugin.activate=startup
    6.16 +plugin.isabelle.jedit.Plugin.usePluginHome=false
    6.17 +
    6.18 +#dependencies
    6.19 +plugin.isabelle.jedit.Plugin.depend.0=jdk 1.6
    6.20 +plugin.isabelle.jedit.Plugin.depend.1=jedit 04.03.99.00
    6.21 +plugin.isabelle.jedit.Plugin.depend.2=plugin console.ConsolePlugin 4.4.1
    6.22 +plugin.isabelle.jedit.Plugin.depend.3=plugin errorlist.ErrorListPlugin 1.8
    6.23 +plugin.isabelle.jedit.Plugin.depend.4=plugin sidekick.SideKickPlugin 0.8
    6.24 +plugin.isabelle.jedit.Plugin.depend.5=plugin gatchan.jedit.hyperlinks.HyperlinksPlugin 1.0.1
    6.25 +
    6.26 +#options
    6.27 +plugin.isabelle.jedit.Plugin.option-pane=isabelle
    6.28 +options.isabelle.label=Isabelle
    6.29 +options.isabelle.code=new isabelle.jedit.Isabelle_Options();
    6.30 +options.isabelle.logic.title=Logic
    6.31 +options.isabelle.relative-font-size.title=Relative Font Size
    6.32 +options.isabelle.relative-font-size=100
    6.33 +options.isabelle.tooltip-font-size.title=Tooltip Font Size
    6.34 +options.isabelle.tooltip-font-size=10
    6.35 +options.isabelle.tooltip-margin.title=Tooltip Margin
    6.36 +options.isabelle.tooltip-margin=40
    6.37 +options.isabelle.tooltip-dismiss-delay.title=Tooltip Dismiss Delay (global)
    6.38 +options.isabelle.tooltip-dismiss-delay=8.0
    6.39 +options.isabelle.startup-timeout=25.0
    6.40 +options.isabelle.auto-start.title=Auto Start
    6.41 +options.isabelle.auto-start=true
    6.42 +
    6.43 +#menu actions
    6.44 +plugin.isabelle.jedit.Plugin.menu.label=Isabelle
    6.45 +plugin.isabelle.jedit.Plugin.menu=isabelle.session-panel isabelle.output-panel isabelle.raw-output-panel isabelle.protocol-panel
    6.46 +isabelle.session-panel.label=Prover Session panel
    6.47 +isabelle.output-panel.label=Output panel
    6.48 +isabelle.raw-output-panel.label=Raw Output panel
    6.49 +isabelle.protocol-panel.label=Protocol panel
    6.50 +
    6.51 +#dockables
    6.52 +isabelle-session.title=Prover Session
    6.53 +isabelle-output.title=Output
    6.54 +isabelle-raw-output.title=Raw Output
    6.55 +isabelle-protocol.title=Protocol
    6.56 +
    6.57 +#SideKick
    6.58 +sidekick.parser.isabelle.label=Isabelle
    6.59 +mode.isabelle.sidekick.parser=isabelle
    6.60 +mode.ml.sidekick.parser=isabelle
    6.61 +
    6.62 +#Hyperlinks
    6.63 +mode.isabelle.hyperlink.source=isabelle
     7.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     7.2 +++ b/src/Tools/jEdit/src/actions.xml	Wed Jun 08 21:40:54 2011 +0200
     7.3 @@ -0,0 +1,25 @@
     7.4 +<?xml version="1.0"?>
     7.5 +<!DOCTYPE ACTIONS SYSTEM "actions.dtd">
     7.6 +
     7.7 +<ACTIONS>
     7.8 +	<ACTION NAME="isabelle.session-panel">
     7.9 +		<CODE>
    7.10 +			wm.addDockableWindow("isabelle-session");
    7.11 +		</CODE>
    7.12 +	</ACTION>
    7.13 +	<ACTION NAME="isabelle.output-panel">
    7.14 +		<CODE>
    7.15 +			wm.addDockableWindow("isabelle-output");
    7.16 +		</CODE>
    7.17 +	</ACTION>
    7.18 +	<ACTION NAME="isabelle.raw-output-panel">
    7.19 +		<CODE>
    7.20 +			wm.addDockableWindow("isabelle-raw-output");
    7.21 +		</CODE>
    7.22 +	</ACTION>
    7.23 +	<ACTION NAME="isabelle.protocol-panel">
    7.24 +		<CODE>
    7.25 +			wm.addDockableWindow("isabelle-protocol");
    7.26 +		</CODE>
    7.27 +	</ACTION>
    7.28 +</ACTIONS>
    7.29 \ No newline at end of file
     8.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     8.2 +++ b/src/Tools/jEdit/src/dockables.xml	Wed Jun 08 21:40:54 2011 +0200
     8.3 @@ -0,0 +1,17 @@
     8.4 +<?xml version="1.0"?>
     8.5 +<!DOCTYPE DOCKABLES SYSTEM "dockables.dtd">
     8.6 +
     8.7 +<DOCKABLES>
     8.8 +	<DOCKABLE NAME="isabelle-session" MOVABLE="TRUE">
     8.9 +		new isabelle.jedit.Session_Dockable(view, position);
    8.10 +	</DOCKABLE>
    8.11 +	<DOCKABLE NAME="isabelle-output" MOVABLE="TRUE">
    8.12 +		new isabelle.jedit.Output_Dockable(view, position);
    8.13 +	</DOCKABLE>
    8.14 +	<DOCKABLE NAME="isabelle-raw-output" MOVABLE="TRUE">
    8.15 +		new isabelle.jedit.Raw_Output_Dockable(view, position);
    8.16 +	</DOCKABLE>
    8.17 +	<DOCKABLE NAME="isabelle-protocol" MOVABLE="TRUE">
    8.18 +		new isabelle.jedit.Protocol_Dockable(view, position);
    8.19 +	</DOCKABLE>
    8.20 +</DOCKABLES>
    8.21 \ No newline at end of file
     9.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     9.2 +++ b/src/Tools/jEdit/src/services.xml	Wed Jun 08 21:40:54 2011 +0200
     9.3 @@ -0,0 +1,20 @@
     9.4 +<?xml version="1.0"?>
     9.5 +<!DOCTYPE SERVICES SYSTEM "services.dtd">
     9.6 +
     9.7 +<SERVICES>
     9.8 +	<SERVICE NAME="UTF-8-Isabelle" CLASS="org.gjt.sp.jedit.io.Encoding">
     9.9 +		new isabelle.jedit.Isabelle_Encoding();
    9.10 +	</SERVICE>
    9.11 +	<SERVICE NAME="isabelle" CLASS="sidekick.SideKickParser">
    9.12 +		new isabelle.jedit.Isabelle_Sidekick_Default();
    9.13 +	</SERVICE>
    9.14 +	<SERVICE NAME="isabelle-raw" CLASS="sidekick.SideKickParser">
    9.15 +		new isabelle.jedit.Isabelle_Sidekick_Raw();
    9.16 +	</SERVICE>
    9.17 +  <SERVICE NAME="isabelle" CLASS="gatchan.jedit.hyperlinks.HyperlinkSource">
    9.18 +    new isabelle.jedit.Isabelle_Hyperlinks();
    9.19 +  </SERVICE>
    9.20 + 	<SERVICE CLASS="console.Shell" NAME="Scala">
    9.21 +		new isabelle.jedit.Scala_Console();
    9.22 +	</SERVICE>
    9.23 +</SERVICES>