Changeset 394

Timestamp:

09/23/08 19:27:34 (4 months ago)

Author:

tjas..@bitfauna.com

Message:

Tim Jasko
-Fixed up the exe creation to work on Linux. Hope I didn't break it on windows.

Files:

• jasko.tim.lisp/src/jasko/tim/lisp/swank/SBCLImplementation.java (modified) (4 diffs)
• jasko.tim.lisp/src/jasko/tim/lisp/swank/SwankInterface.java (modified) (1 diff)

jasko.tim.lisp/src/jasko/tim/lisp/swank/SBCLImplementation.java

@@ -206 +206 @@
-                        commandLine.add(executable.getPath());
-                        commandLine.add("--eval");
-
-
-
-
-\"(require 'asdf)\"
+.replace("`", "\\`")
+
+.replace("`", "\\`")
+
+(require 'asdf)
-                        if(prefs.getBoolean(PreferenceConstants.USE_UNIT_TEST)){
-                                commandLine.add("--load");
-"\""+
-\"
+
+
-                        }
-                        if(prefs.getBoolean(PreferenceConstants.MANAGE_PACKAGES)){
@@ -222 +222 @@
-                                                + "lisp-extensions/asdf-extensions.lisp";
-                                        commandLine.add("--load");
-"\""+asdfext+"\""
+asdfext
-                                        commandLine.add("--eval");
-LispUtil.cleanPackage(code)
+code
-                                }
-                                
@@ -238 +238 @@
-                        
-                        commandLine.add("--load");
-"\""+asdFile+"\""
+asdFile
-                        commandLine.add("--eval");
-LispUtil.cleanPackage("(asdf:oos 'asdf:load-op \""+asdName+"\")")
+"(asdf:oos 'asdf:load-op \""+asdName+"\")"
-                        
-                        commandLine.add("--eval");
-                        if( pkg != null && !pkg.equals("") && !pkg.equalsIgnoreCase("nil")){
-LispUtil.cleanPackage(
-)
+
+
-                        } else {
-LispUtil.cleanPackage(
-)
+
+
-                        }
-
+
+
+
+
+
-                        String[] cmd = new String[commandLine.size()];
-                        ProcessBuilder pb = new ProcessBuilder(commandLine.toArray(cmd));
@@ -258 +262 @@
-                                LispPlugin.getDefault().out("--- compilation command:");
-                                for(String str : cmd){
+                                        System.out.println("$" + str);
-                                        LispPlugin.getDefault().out(str);
-                                }
-                                LispPlugin.getDefault().out("--- compilation log:");
+                                pb.redirectErrorStream(true);
-                                Process p = pb.start();
-
+
+
-                            String line;
-                            while ((line = is.readLine()) != null){
-                                        LispPlugin.getDefault().out(line);
-                                        if( line.contains("[QUIT ") ){ //ended up in debugger
+                                                /*BufferedReader es = new BufferedReader(new InputStreamReader(p.getErrorStream()));
+                                                String errline;
+                                            while ((errline = es.readLine()) != null){
+                                                        LispPlugin.getDefault().out(errline);
+                                                        System.out.println(errline);
+                                            }*/
-                                                p.destroy();
-                                                LispPlugin.getDefault().out("=== Error.");                              
-                                                return false;
+                                        } else if (line.contains("DONE")) {
+                                                //hacky way to detect the finishing point.
+                                                break;
-                                        }
-                            }

jasko.tim.lisp/src/jasko/tim/lisp/swank/SwankInterface.java

@@ -1865 +1865 @@
-                                                        }
-                                                        System.out.print("]");
-
+ln
-                                                        runFilters(curr);
-                                                        if(curr.toLowerCase().contains(implementation.fatalErrorString())){