Updated jline build to use xsbt 0.9.9 and rebuilt, no review.

git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@25034 5e8d7ff9-d8ef-0310-90f0-a4852d11357a

Author: extempore

lib/jline.jar

@@ -0,0 +1,49 @@
+seq(ProguardPlugin.proguardSettings :_*)
+
+name := "jline"
+
+organization := "org.scala-lang"
+
+version := "2.10.0-SNAPSHOT"
+
+scalaVersion := "2.9.0-1"
+
+// Only need these because of weird testing jline issues.
+retrieveManaged := true
+
+parallelExecution in Test := false
+
+libraryDependencies ++= Seq(
+	"org.fusesource.jansi" % "jansi" % "1.4",
+	"com.novocode" % "junit-interface" % "0.7" % "test->default"
+)
+
+javacOptions ++= Seq("-target", "1.5")
+
+proguardOptions ++= Seq(
+  "-dontshrink",
+  "-keep class *",
+  "-keepdirectories"
+)
+
+proguardInJars := Nil
+
+makeInJarFilter ~= { prevFilter =>
+  val jansiFilter = List(
+    "!META-INF/MANIFEST.MF",
+    "org/fusesource/hawtjni/runtime",
+    "org/fusesource/hawtjni/runtime/Callback.class",
+    "org/fusesource/hawtjni/runtime/Library.class",
+    "!org/fusesource/hawtjni/**",
+    "!META-INF/maven/org.fusesource.hawtjni",
+    "!META-INF/maven/org.fusesource.jansi",
+    "!META-INF/maven/org.fusesource.hawtjni/**",
+    "!META-INF/maven/org.fusesource.jansi/**"
+  ).mkString(",")
+  // In sbt 0.9.8 the scala-library.jar line was not necessary,
+  // but in 0.9.9 it started showing up here.  Who knows.
+  file =>
+    if (file startsWith "jansi-") jansiFilter
+    else if (file == "scala-library.jar") "!**"
+    else prevFilter(file)
+}

src/jline/TEST-NOTE.txt

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+#
+# Apparently the jline bundled with sbt interferes with testing some
+# changes: for instance after changing the keybindings I kept seeing
+# failures until I realized what was happening and bypassed sbt, like this.
+
+java -cp lib_managed/jar/com.novocode/junit-interface/junit-interface-0.5.jar:lib_managed/jar/junit/junit/junit-4.8.1.jar:lib_managed/jar/org.fusesource.jansi/jansi/jansi-1.4.jar:lib_managed/jar/org.scala-tools.testing/test-interface/test-interface-0.5.jar:target/scala-2.9.0.1/test-classes:target/scala-2.9.0.1/jline_2.9.0-1-2.10.0-SNAPSHOT.jar \
+org.junit.runner.JUnitCore scala.tools.jline.console.EditLineTest

src/jline/build.sbt

@@ -0,0 +1,5 @@
+resolvers += "Proguard plugin repo" at "http://siasia.github.com/maven2"
+
+libraryDependencies <<= (libraryDependencies, appConfiguration) { (deps, app) =>
+  deps :+ "com.github.siasia" %% "xsbt-proguard-plugin" % app.provider.id.version
+}

src/jline/manual-test.sh

@@ -1120,6 +1120,15 @@ int getKeyForAction(final Operation op) {
         return getKeyForAction(op.code);
     }
 
+    public void printBindings() {
+        System.out.println("printBindings(): keyBindings.length = " + keyBindings.length);
+        for (int i = 0; i < keyBindings.length; i++) {
+            if (keyBindings[i] != Operation.UNKNOWN.code) {
+                System.out.println("keyBindings[" + i + "] = " + keyBindings[i]);
+            }
+        }
+    }
+
     /**
      * Reads the console input and returns an array of the form [raw, key binding].
      */

src/jline/project/build.properties

@@ -65,6 +65,7 @@ private int getKeyForAction(final short logicalAction) {
         int action = console.getKeyForAction(logicalAction);
 
         if (action == -1) {
+            console.printBindings();
             fail("Keystroke for logical action " + logicalAction + " was not bound in the console");
         }