Commits

camlspotter committed f0b4074

3.11.1+ocamlspot

Comments (0)

Files changed (4)

 typecore.cmo typedecl.cmo typeclass.cmo typemod.cmo cmigrep.ml
 
 
-GODI_CONF=$(shell godi_confdir)
-GODI_BASE=$(shell cat $(GODI_CONF)/godi.conf | grep ^LOCALBASE | sed -e 's/LOCALBASE *= *//')
-GODI_LIB=$(GODI_BASE)/lib/ocaml/compiler-lib
-
 all:
 	ocamlfind ocamlopt -o cmigrep -I $(GODI_LIB) \
 	-package pcre,findlib,unix -linkpkg $(SOURCES)
+include omake/OMyMakefile
+
+.PHONY: all install clean
+
+OCAMLFLAGS= -annot
+
+OPT_DEPENDS=misc.cmx tbl.cmx config.cmx clflags.cmx terminfo.cmx ccomp.cmx	\
+warnings.cmx consistbl.cmx linenum.cmx location.cmx longident.cmx	\
+syntaxerr.cmx parser.cmx lexer.cmx parse.cmx printast.cmx		\
+unused_var.cmx ident.cmx path.cmx primitive.cmx types.cmx btype.cmx	\
+oprint.cmx subst.cmx predef.cmx datarepr.cmx env.cmx typedtree.cmx	\
+ctype.cmx printtyp.cmx includeclass.cmx mtype.cmx includecore.cmx	\
+includemod.cmx parmatch.cmx spotcrc.cmx spot.cmx typetexp.cmx stypes.cmx typecore.cmx	\
+typedecl.cmx typeclass.cmx typemod.cmx
+
+BYTE_DEPENDS=misc.cmo tbl.cmo config.cmo clflags.cmo terminfo.cmo	\
+ccomp.cmo warnings.cmo consistbl.cmo linenum.cmo location.cmo		\
+longident.cmo syntaxerr.cmo parser.cmo lexer.cmo parse.cmo		\
+printast.cmo unused_var.cmo ident.cmo path.cmo primitive.cmo types.cmo	\
+btype.cmo oprint.cmo subst.cmo predef.cmo datarepr.cmo env.cmo		\
+typedtree.cmo ctype.cmo printtyp.cmo includeclass.cmo mtype.cmo		\
+includecore.cmo includemod.cmo parmatch.cmo spotcrc.cmo spot.cmo typetexp.cmo stypes.cmo	\
+typecore.cmo typedecl.cmo typeclass.cmo typemod.cmo spot.cmo
+
+OCAMLINCLUDES += ocaml/parsing ocaml/typing ocaml/utils
+
+# dirty workarounds
+OCAMLLINK += $(BYTE_DEPENDS)
+OCAMLOPTLINK += $(OPT_DEPENDS)
+
+MyOCamlProgram(cmigrep, \
+	       pcre findlib unix, \
+	       cmigrep)
+########################################################################
+# Permission is hereby granted, free of charge, to any person
+# obtaining a copy of this file, to deal in the File without
+# restriction, including without limitation the rights to use,
+# copy, modify, merge, publish, distribute, sublicense, and/or
+# sell copies of the File, and to permit persons to whom the
+# File is furnished to do so, subject to the following condition:
+#
+# THE FILE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+# OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+# IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+# DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+# OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE FILE OR
+# THE USE OR OTHER DEALINGS IN THE FILE.
+
+########################################################################
+# The standard OMakeroot file.
+# You will not normally need to modify this file.
+# By default, your changes should be placed in the
+# OMakefile in this directory.
+#
+# If you decide to modify this file, note that it uses exactly
+# the same syntax as the OMakefile.
+#
+
+#
+# Include the standard installed configuration files.
+# Any of these can be deleted if you are not using them,
+# but you probably want to keep the Common file.
+#
+open build/C
+open build/OCaml
+open build/LaTeX
+
+#
+# The command-line variables are defined *after* the
+# standard configuration has been loaded.
+#
+DefineCommandVars()
+
+#
+# Include the OMakefile in this directory.
+#
+.SUBDIRS: .
           "      (modules) comma seperated list of open modules (in order!)")]
     let usage = 
       Printf.sprintf
-        ("%s: <args> <module-expr> \n" ^^
+        ("%s: <option> <mode-switches> <args> <module-expr> \n" ^^
            "extract information from caml compiled interface files\n" ^^
            " <module-expr> can be an exact module name, " ^^
            " or a shell wildcard. Multiple modules can be specified " ^^
     (function
        | Tsig_type (id, type_decl, _rec_status) ->
            begin match type_decl.type_kind with
-           | Type_variant (constructors, _private) ->
+           | Type_variant constructors ->
                List.iter
                  (fun (name, type_exprs) ->
                     if Pcre.pmatch ~rex:exp name then begin
     (function
        | Tsig_type (id, type_decl, _rec_status) ->
            begin match type_decl.type_kind with
-           | Type_record (labels, _, _) ->
+           | Type_record (labels, _) ->
                List.iter
                  (fun (name, mutable_flag, type_expr) ->
                     if Pcre.pmatch ~rex:exp name then begin
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.