got console coloring working in Windows - was missing jna.jar and nee…

…ded some fixes in jline.WindowsTerminal
grails · Jun 16, 2011 · 2956934 · 2956934
1 parent a649d4c
commit 2956934
Show file tree

Hide file tree

Showing 7 changed files with 576 additions and 5 deletions.
diff --git a/build.gradle b/build.gradle
@@ -26,6 +26,7 @@ gantVersion = "1.9.5"
 groovyVersion = "1.8.0"
 jansiVersion = "1.2.1"
 jlineVersion = "0.9.94"
+jnaVersion = "3.2.3"
 commonsCliVersion = "1.2"
 commonsCollectionsVersion = "3.2.1"
 commonsBeanUtilsVersion = "1.8.0"
@@ -237,6 +238,7 @@ task installResources << {
         filter(ReplaceTokens, tokens: ['groovy.version': groovyVersion])
         filter(ReplaceTokens, tokens: ['jline.version': jlineVersion])
         filter(ReplaceTokens, tokens: ['jansi.version': jansiVersion])
+        filter(ReplaceTokens, tokens: ['jna.version': jnaVersion])
         filter(ReplaceTokens, tokens: ['commons.cli.version': commonsCliVersion])
         filter(ReplaceTokens, tokens: ['ant.version': antVersion])
         filter(ReplaceTokens, tokens: ['gant.version': gantVersion])

diff --git a/grails-bootstrap/build.gradle b/grails-bootstrap/build.gradle
@@ -26,7 +26,8 @@ dependencies {
 
     // Ant
     compile 'org.fusesource.jansi:jansi:1.2.1',
-            'jline:jline:0.9.94'
+            'jline:jline:0.9.94',
+			'net.java.dev.jna:jna:3.2.3'
 
     compile "org.apache.ant:ant:${antVersion}",
             "org.apache.ant:ant-launcher:${antVersion}",

diff --git a/grails-bootstrap/src/main/groovy/grails/build/logging/GrailsConsole.java b/grails-bootstrap/src/main/groovy/grails/build/logging/GrailsConsole.java
@@ -31,6 +31,9 @@
 
 import jline.ConsoleReader;
 import jline.Terminal;
+import jline.UnixTerminal;
+import jline.UnsupportedTerminal;
+import jline.WindowsTerminal;
 
 import org.codehaus.groovy.grails.cli.interactive.CandidateListCompletionHandler;
 import org.codehaus.groovy.grails.cli.logging.GrailsConsolePrintStream;
@@ -103,7 +106,7 @@ protected GrailsConsole() throws IOException {
 
         System.setOut(new GrailsConsolePrintStream(this.out));
 
-        terminal = Terminal.setupTerminal();
+        terminal = setupTerminal();
         reader = new ConsoleReader();
         reader.setCompletionHandler(new CandidateListCompletionHandler());
         category.add("grails");
@@ -113,6 +116,33 @@ protected GrailsConsole() throws IOException {
         out.println();
     }
 
+    // copied from Terminal.setupTerminal()
+    private Terminal setupTerminal() {
+        final Terminal t;
+
+        String os = System.getProperty("os.name").toLowerCase();
+        if (os.indexOf("windows") != -1) {
+            t = new WindowsTerminal() {
+                @Override
+                public boolean isANSISupported() {
+                    return true;
+                };
+            };
+        }
+        else {
+            t = new UnixTerminal();
+        }
+
+        try {
+            t.initializeTerminal();
+            return t;
+        }
+        catch (Exception e) {
+            e.printStackTrace();
+            return new UnsupportedTerminal();
+        }
+    }
+
     public static synchronized GrailsConsole getInstance() {
         if (instance == null) {
             try {