Commits

seanmcl  committed 6eb43e6 Merge
  • Participants
  • Parent commits 3bfb647, 60ab309

Comments (0)

Files changed (3)

File 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"

File 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:

File 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)