Commits

seanmcl  committed 0a52298

Fixed CRs and removed nohup.out files, Issue 134

  • Participants
  • Parent commits 1ae0273

Comments (0)

Files changed (4)

File elisp/omake/omake-connection.el

 
 (defun Omake.Connection.open ()
   "A TCP connection is made to the server via the user's socket."
-  (message "Establishing a connection to the server.  This takes a couple of seconds.")
+  (message "Establishing a connection to the server.")
   (let* ((user (String.strip (shell-command-to-string "whoami")))
          (p (make-network-process
              :name "omake-server"

File elisp/omake/omake-interface.el

           (when project
             (let* ((num-watchers (Omake.Project.num-watchers project))
                    (watch-msg
-                    (if (< 1 num-watchers) 
+                    (if (< 1 num-watchers)
                         "\nThis will affect other processes watching this project."
                       ""))
-                   (kill 
+                   (kill
                     (Emacs.y-or-n-p
                      (format "\
 OMake is already building:
                   (if read-command
                       (read-from-minibuffer "Command: " (concat config " "))
                     config)))
-            (message "Starting compilation.  This takes a couple seconds.")
+            (message "Starting compilation.")
             (Omake.Server.create-project
              :id id
              :omakeroot-dir root-dir

File elisp/omake/omake-server.el

   "Start the server.  Use nohup so closing this Emacs instance will not affect
 the running server."
   (Omake.Server.logf "Starting the server.")
-  (message "Starting the server.  This takes a couple of seconds.")
+  (message "Starting the server.")
   (let ((p
          (start-process
-          "Omake.Server.start" nil "nohup" Omake.Server.program
-          "server" "start"))
+          "Omake.Server.start" nil "sh" "-c"
+          (format "nohup %s server start > /dev/null" Omake.Server.program)))
         (i 0))
     (set-process-query-on-exit-flag p nil)
     (Emacs.protect-from-quit
-      ;; CR smclaughlin: this is a bad hack to get around a mysterious 
+      ;; CR smclaughlin: this is a bad hack to get around a mysterious
       ;; problem where (sleep-for N) doesn't sleep.  It must have something
       ;; to do with the fact that other processes get to run during a sleep
       ;; but not a loop, but I haven't been able to find the problem yet.

File ocaml/omake/config.ml

 
 let write_default_file () =
   if not (has_config_file ()) then
-    (* CR sweeks: It would be nice to output a header line:
-
-         ;; -*-scheme-*-;
-
-       It would also be nice to use [Sexp.to_string_hum]. *)
-    Out_channel.write_all config_file ~data:(Sexp.to_string (sexp_of_t default))
+    Out_channel.write_lines config_file
+      [";; -*- scheme -*- ;;"; ""; Sexp.to_string_hum (sexp_of_t default) ]
 
 let init () =
   begin