Commits

seanmcl committed 7e1b0bf

inotify

Comments (0)

Files changed (9)

-
-GetInotifyDir() =
-  match $(OS)
-  case $"Linux"
-    return $(ROOT)/js-elisp/ocaml/contrib/ocaml_inotify
-  default
-    return $(ROOT)/js-elisp/ocaml/contrib/ocaml_inotify_dummy
-
-# Include inotify if running on linux
-INOTIFY_DIR = $(GetInotifyDir)
-export INOTIFY_DIR
-
 Subdirs()

ocaml/contrib/Makefile

 
-default : ocaml_inotify ocaml_inotify_dummy
-
-OS=$(shell uname)
-
-ocaml_inotify :
-ifeq ($(OS),Linux)
+default : 
 	cd ocaml_inotify; $(MAKE)
-endif
-
-ocaml_inotify_dummy :
-	cd ocaml_inotify_dummy; $(MAKE)
 
 clean :
-	cd ocaml_inotify_dummy; $(MAKE) clean
-ifeq ($(OS),Linux)
 	cd ocaml_inotify; $(MAKE) clean
-endif
 
-.PHONY : ocaml_inotify ocaml_inotify_dummy

ocaml/contrib/OMakefile

-
-.SUBDIRS : $(basename $(INOTIFY_DIR))
-
+Subdirs()

ocaml/contrib/ocaml_inotify_dummy/Makefile

-
-default : inotify.cmxa
-
-# dummy inotify rules must come after all other rules that match cmx files
-inotify.cmx : inotify.ml
-	ocamlopt -c -o $@ $<
-
-inotify.cmxa : inotify.cmx
-	ocamlopt -a -o $@ inotify.cmx
-
-clean :
-	rm -f *.cmx *.cmxa *.a *.cmi *.o

ocaml/contrib/ocaml_inotify_dummy/OMakefile

-include $(STDLIB)/build/OCaml
-
-OCamlLibrary(inotify, inotify)
-
-.DEFAULT : inotify.cmxa

ocaml/contrib/ocaml_inotify_dummy/OMakefile.1

-
-OCamlLibrary(inotify, inotify)
-
-.DEFAULT : inotify.cmxa

ocaml/contrib/ocaml_inotify_dummy/inotify.ml

-(* Dummy file for OSX. *)
-
-exception Error of string * int
-
-type select_event =
-| S_Access
-| S_Attrib
-| S_Close_write
-| S_Close_nowrite
-| S_Create
-| S_Delete
-| S_Delete_self
-| S_Modify
-| S_Move_self
-| S_Moved_from
-| S_Moved_to
-| S_Open
-| S_Dont_follow
-| S_Mask_add
-| S_Oneshot
-| S_Onlydir
-| S_Move
-| S_Close
-| S_All
-
-type wd = unit
-
-let init _ = failwith "Unimplemented"
-let add_watch _ _ _ = failwith "Unimplemented"
-let rm_watch _ _ = failwith "Unimplemented"

ocaml/omake/Makefile

 
 OS=$(shell uname)
 
-# Include inotify if runnign on linux
-ifeq ($(OS),Linux)
-	INOTIFY_DIR='../contrib/ocaml_inotify'
-else
-	INOTIFY_DIR='../contrib/ocaml_inotify_dummy'
-endif
+INOTIFY_DIR='../contrib/ocaml_inotify'
 
 OCAMLOPT=ocamlfind ocamlopt -thread -w @a-4-7-9-29-28 \
         -pp $(PP) \

ocaml/omake/OMakefile

   top
   omake_server
 
-# OCAMLOPTFLAGS += -I $(INOTIFY_DIR)
-# OCAMLPACKS += inotify
-
-# omake_inotify.cmx : $(INOTIFY_DIR)/inotify.cmxa
-
 OCamlMakePPDeps($(PA_JANE), $(FILES))
 
 OCamlMakeProjDefaults($(addsuffixes .exe, $(EXES)))