Commits

Peter Szilagyi committed 0e86f15 Merge

auto merge

Comments (0)

Files changed (6)

elisp/jane/jane-lib.el

 (defconst Log.buffer-max-size 100000
   "Max size of the log buffer in characters")
 
-(defun Log.printf(log-buffer format-string &rest args)
+(defun Log.printf (log-buffer format-string &rest args)
   "Display the text in the log buffer at the very end of it."
   (let ((inhibit-read-only t) ;; the log is probably read-only
-	(auto-window-vscroll t)
-	(kill-whole-line t) ;; kill the newline as well as the line contents
+        (auto-window-vscroll t)
+        (kill-whole-line t) ;; kill the newline as well as the line contents
         (fmt (concat "[%s] " format-string "\n"))
-        (time (format-time-string "%y/%m/%d %H:%M:%S" (current-time)))
-	(user-buffer (current-buffer))
-	(user-window (selected-window))
-	(log-window (get-buffer-window log-buffer)))
+        (time (format-time-string "%y/%m/%d %H:%M:%S"))
+        (user-buffer (current-buffer))
+        (user-window (selected-window))
+        (log-window (get-buffer-window log-buffer)))
     (with-current-buffer log-buffer
       (let* ((marker (point-marker))
              (log-point (point))

elisp/omake/omake-file.el

 
 (defun Omake.File.server-log ()
   (expand-file-name
-   (format-time-string "%Y-%m-%d" (current-time))
+   (format-time-string "%Y-%m-%d")
    Omake.File.server-log-dir))
+;; (Omake.File.server-log)
+;; (format-time-string "%Y-%m-%d")
 
 (defconst Omake.File.server-state
   (expand-file-name "server-state.el" Omake.File.top))
 (defun Omake.File.emacs-log ()
   (format "%s/%s"
           Omake.File.emacs-log-pid-dir
-          (format-time-string "%Y-%m-%d" (current-time))))
+          (format-time-string "%Y-%m-%d")))
 ;; (Omake.File.emacs-log)
 
 (defconst Omake.File.socket

elisp/omake/omake-server.el

 
 ;; [2012-08-13 10:38:38.719056]
 (defun Omake.Server.logf (fmt &rest rest)
+  (apply 'Log.printf (cons (Omake.Buffer.get 'mode-log) (cons fmt rest)))
   ;; CR sweeks: turned off logging because it interferes with emacs's keystroke
   ;; responsiveness.
   (when nil
     ;; Write to the mode log buffer
-    (apply 'Log.printf (cons (Omake.Buffer.get 'mode-log) (cons fmt rest)))
     (with-temp-buffer
       ;; Write to the log file (with timestamp)
       (let* ((time (format-time-string "[%Y-%m-%d %H:%M:%S] "))
 ;; (setq y (Omake.Server.list-projects))
 
 (defun Omake.Server.update-projects ()
-  (Omake.Server.send-sync "client" "update-projects"))
+  (Omake.Server.send-async "client" "update-projects"))
 ;; (Omake.Server.update-projects)
 
 (defun Omake.Server.list-watched ()

ocaml/contrib/ocaml_inotify/META

 version="1.0"
 description="Linux inotify"
 requires="unix"
-archive(byte)="inotify.cma"
-archive(native)="inotify.cmxa"
+archive(byte)="ocaml_inotify.cma"
+archive(native)="ocaml_inotify.cmxa"

ocaml/contrib/ocaml_inotify/Makefile

 .PHONY: install
 
 install: $(LIBS)
-	ocamlfind install $(OCAMLFIND_INSTALL_FLAGS) $(PKG_NAME) META inotify.cmi inotify.mli inotify.cma inotify.cmxa *.a *.so *.cmx
+	ocamlfind install $(OCAMLFIND_INSTALL_FLAGS) $(PKG_NAME) META ocaml_inotify.cmi inotify.mli ocaml_inotify.cma ocaml_inotify.cmxa *.a *.so *.cmx
 
 install-byte:
-	ocamlfind install $(OCAMLFIND_INSTALL_FLAGS) $(PKG_NAME) META inotify.cmi inotify.mli inotify.cma *.a *.so
+	ocamlfind install $(OCAMLFIND_INSTALL_FLAGS) $(PKG_NAME) META ocaml_inotify.cmi inotify.mli ocaml_inotify.cma *.a *.so
 
 install-opt:
-	ocamlfind install $(OCAMLFIND_INSTALL_FLAGS) $(PKG_NAME) META inotify.cmi inotify.mli inotify.cma inotify.cmxa *.a *.so *.cmx
+	ocamlfind install $(OCAMLFIND_INSTALL_FLAGS) $(PKG_NAME) META ocaml_inotify.cmi inotify.mli ocaml_inotify.cma ocaml_inotify.cmxa *.a *.so *.cmx
 
 uninstall:
 	ocamlfind remove $(OCAMLFIND_INSTALL_FLAGS) $(PKG_NAME)
 
-inotify_test: ocaml_inotify.cmxa inotify_test.ml
+ocaml_inotify_test: ocaml_inotify.cmxa ocaml_inotify_test.ml
 	$(OCAMLOPT) -I . -o $@ unix.cmxa $+
 
 clean:

ocaml/omake/project.ml

   |! List.length
 
 let pp t =
-  sprintf "  { id = %s; num_watchers = %d; omakeroot = %s; compilation = %s; dead = %b; }"
+  sprintf "
+  { id = %s
+  ; num_watchers = %d
+  ; omakeroot = %s
+  ; command = %s
+  ; compilation = %s
+  ; dead = %b; }"
     (Id.to_string t.id)
     (num_watching t)
     t.omakeroot_dir
+    (Omake_command.to_string t.command)
     t.compilation_dir
     (Deferred.is_determined t.omake_process_status)