Commits

camlspotter committed 28baff0

removed non-working functions, and added OCamlRequire

Comments (0)

Files changed (2)

 OMyManagedPackages(packages) =
    return $(set-diff $(packages), $(OCAML_PREINSTALLED_PACKS))
 
-#|Add dependencies of any build activity of this directory over $(files).
+#|Add dependencies of OCaml compiled files (cmx, cmo, etc.) over $(files).
 #
 # .. note:: These functions introduce implicit rules: *you may need to export it, if you use this function in a local context.*
-RequireFiles(files) =
-    .SCANNER: scan-%: $(files)
-    % : $(files)
-    export
-
-#|Add dependencies of any build activity over $(packages).
-#
-# .. note:: These functions introduce implicit rules: *you may need to export it, if you use this function in a local context.*
-RequirePackages(packages) =
-    RequireFiles($(OMyManagedPackages $(packages)))
-    export
-
-#|Add dependencies of any build activity of this directory over $(targets) and their dependencies
-# Creates an intermidiate md5 memo dependencies.md5
-#
-# .. note:: These functions introduce implicit rules: *you may need to export it, if you use this function in a local context.*
-RequireBuild(targets) =
-    dependencies.md5: $(targets)
-        CreateCheckSum($@, $(sequence-sort $(compare), $(dependencies-all $(targets))))
-    RequireFiles(dependencies.md5)
+OCamlRequire(files) =
+    %.cmx %.cmo %.cmi %.cma %.cmxa %.annot %.spot %.spit : $(files)
     export
 
 #|Add dependencies of OCaml compiled files (cmx, cmo, etc.) over $(packages).
   # CR jfuruse: I guess we do not need the following
   # export # export the implicit rule above
 
-  .DEFAULT: $(library_name).cmo $(library_name).cmx $(library_name).cma $(library_name).cmxa $(MyOCamlPackageExtras)
+  .PHONY: install-lib
+  install-lib: $(library_name).cmo $(library_name).cmx $(library_name).cma $(library_name).cmxa $(MyOCamlPackageExtras)
 
   $(CMA) $(CMXA) $(library_name).a $(CSTUBLIBRARIES) : $(CSTUBS) $(CMOS) $(CMXS)
       if $(not $(equal $(cmodules), $(EMPTY)))
   export # The above thing is local: need to be exported
 
   # CR jfuruse: forgot to add the deps over the packages!
-  .DEFAULT: $(OCamlLibrary $(name), $(files))
+  install-lib: $(OCamlLibrary $(name), $(files))
 
   # The following clean the files twice if MyOCamlPacakge coexists,
   # but who cases ?
 
     clean:
         ocaml setup.ml -distclean
+
+OMyOasisDir(PACK, DIR, REQUIRED) =
+    $(Installed $(PACK)): $(REQUIRED)
+        cd $(DIR); ocaml setup.ml -configure
+        cd $(DIR); ocaml setup.ml -build
+        cd $(DIR); ocaml setup.ml -uninstall
+        cd $(DIR); ocaml setup.ml -install
+        cd $(DIR); spotinstall $(PACK)
+        CreateInstalled($(PACK), $(find $(OCAMLFIND_DESTDIR)$(DIRSEP)$(PACK) -f {}))
+
+    clean:
+	cd $(DIR); ocaml setup.ml -distclean
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.