# HG changeset patch
# User immler@in.tum.de
# Date 1233489021 -3600
# Node ID 14d70378f1c7a7abda6c31c3dd55f1cc749c16af
# Parent  5839e34ef0bdb6d10fcba16f33f69734b138c4f7
modified netbeans build such that dist can be used as settings-directory for jedit;
adapted explicit makedist

diff -r 5839e34ef0bd -r 14d70378f1c7 src/Tools/jEdit/build.xml
--- a/src/Tools/jEdit/build.xml	Sun Feb 01 12:21:07 2009 +0100
+++ b/src/Tools/jEdit/build.xml	Sun Feb 01 12:50:21 2009 +0100
@@ -72,4 +72,22 @@
       <copy file="plugin/actions.xml" todir="${build.classes.dir}" />
       <copy file="plugin/Isabelle.props" todir="${build.classes.dir}" />
     </target>
+    <target name="-post-jar">
+      <!-- jars -->
+      <delete file="${dist.dir}/jars/lib/jEdit.jar" />
+      <move todir="${dist.dir}/jars">
+        <fileset dir="${dist.dir}/jars/lib" />
+      </move>
+      <copy file="${scala.library}" todir="${dist.dir}/jars" />
+      <!-- clean up -->
+      <delete dir="{dist.dir}/jars/lib" />
+      <!-- dist-template -->
+      <copy file="dist-template/properties/jedit.props" tofile="${dist.dir}/properties" />
+      <copy todir="${dist.dir}/modes">
+        <fileset dir="dist-template/modes">
+          <exclude name="catalog-template" />
+        </fileset>
+      </copy>
+      <copy file="dist-template/modes/catalog-template" tofile="${dist.dir}/modes/catalog" />
+    </target>
 </project>
diff -r 5839e34ef0bd -r 14d70378f1c7 src/Tools/jEdit/dist-template/modes/catalog-template
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/Tools/jEdit/dist-template/modes/catalog-template	Sun Feb 01 12:50:21 2009 +0100
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<!DOCTYPE MODES SYSTEM "catalog.dtd">
+
+<MODES>
+
+<MODE NAME="isabelle" FILE="isabelle.xml" FILE_NAME_GLOB="*.thy" />
+<MODE NAME="ml" FILE="ml.xml" FILE_NAME_GLOB="*.ML" />
+
+</MODES>
+
diff -r 5839e34ef0bd -r 14d70378f1c7 src/Tools/jEdit/dist-template/properties/jedit.props
--- a/src/Tools/jEdit/dist-template/properties/jedit.props	Sun Feb 01 12:21:07 2009 +0100
+++ b/src/Tools/jEdit/dist-template/properties/jedit.props	Sun Feb 01 12:50:21 2009 +0100
@@ -7,6 +7,8 @@
 buffer.noTabs=true
 buffer.tabSize=2
 fallbackEncodings=US-ASCII ISO-8859-15
+firstTime=false
+tip.show=false
 encodingDetectors=BOM XML-PI buffer-local-property
 delete-line.shortcut=A+d
 delete.shortcut2=C+d
diff -r 5839e34ef0bd -r 14d70378f1c7 src/Tools/jEdit/makedist
--- a/src/Tools/jEdit/makedist	Sun Feb 01 12:21:07 2009 +0100
+++ b/src/Tools/jEdit/makedist	Sun Feb 01 12:50:21 2009 +0100
@@ -12,7 +12,6 @@
 ## diagnostics
 
 JEDIT_HOME="/home/isajedit/jedit-orig/4.3pre16"
-SCALA_HOME="/home/scala/current"
 
 function usage()
 {
@@ -22,8 +21,6 @@
   echo "  Options are:"
   echo "    -j DIR       specify original jEdit distribution"
   echo "                 (default: $JEDIT_HOME)"
-  echo "    -s DIR       specify Scala distribution"
-  echo "                 (default: $SCALA_HOME)"
   echo
   echo "  Produce Isabelle/jEdit distribution from Netbeans build"
   echo "  in $THIS/dist"
@@ -48,9 +45,6 @@
     j)
       JEDIT_HOME="$OPTARG"
       ;;
-    s)
-      SCALA_HOME="$OPTARG"
-      ;;
     \?)
       usage
       ;;
@@ -86,10 +80,7 @@
 cp -R "$JEDIT_HOME/." "$JEDIT/."
 rm -rf "$JEDIT/jEdit" "$JEDIT/build-support"
 
-mkdir -p "$JEDIT/jars"
-
-[ "$SCALA_HOME/lib/scala-library.jar" ] || fail "Bad Scala directory: $SCALA_HOME"
-cp "$SCALA_HOME/lib/scala-library.jar" "$JEDIT/jars/"
+cp -R jars "$JEDIT/jars"
 
 cp -R "$THIS/dist-template/." "$JEDIT/."
 
@@ -97,13 +88,6 @@
   print qq,<MODE NAME="isabelle" FILE="isabelle.xml" FILE_NAME_GLOB="*.thy"/>\n\n,; }
   print; }' "$JEDIT/modes/catalog"
 
-cp jars/Isabelle-jEdit.jar "$JEDIT/jars/isabelle.jar"
-cp jars/lib/Pure.jar "$JEDIT/jars/isabelle-Pure.jar"
-cp jars/lib/core-renderer.jar "$JEDIT/jars/"
-cp jars/lib/ErrorList.jar "$JEDIT/jars/"
-cp jars/lib/SideKick.jar "$JEDIT/jars/"
-
-
 # build archive
 
 echo "${JEDIT}.tar.gz"
diff -r 5839e34ef0bd -r 14d70378f1c7 src/Tools/jEdit/plugin/Isabelle.props
--- a/src/Tools/jEdit/plugin/Isabelle.props	Sun Feb 01 12:21:07 2009 +0100
+++ b/src/Tools/jEdit/plugin/Isabelle.props	Sun Feb 01 12:50:21 2009 +0100
@@ -7,9 +7,9 @@
 plugin.isabelle.jedit.Plugin.description=Isabelle/Isar live document editing
 
 #system parameters
-plugin.isabelle.jedit.Plugin.activate=defer
+plugin.isabelle.jedit.Plugin.activate=startup
 plugin.isabelle.jedit.Plugin.usePluginHome=false
-plugin.isabelle.jedit.Plugin.jars=isabelle-Pure.jar core-renderer.jar scala-library.jar
+plugin.isabelle.jedit.Plugin.jars=Pure.jar core-renderer.jar scala-library.jar
 
 #dependencies
 plugin.isabelle.jedit.Plugin.depend.0=jdk 1.5
@@ -23,7 +23,7 @@
 options.isabelle.code=new isabelle.jedit.OptionPane();
 options.isabelle.font-path.title=Font Path
 options.isabelle.font-size.title=Font Size
-options.isabelle.font-size=14
+options.isabelle.font-size=18
 
 #menu actions
 plugin.isabelle.jedit.Plugin.menu.label=Isabelle