This is an automated email from the git hooks/post-receive script. glondu pushed a commit to branch master in repository findlib.
commit f59ccf8c9c3d87046badb1e9637126cc414142d1 Author: Stephane Glondu <st...@glondu.net> Date: Thu Jun 9 11:38:23 2016 +0200 Imported Upstream version 1.6.2 --- Makefile | 4 ++-- configure | 6 +++--- doc/README | 7 +++++++ doc/README.xml | 9 ++++++++ doc/ref-html/lib/Findlib.html | 10 ++------- doc/ref-html/lib/Fl_metascanner.html | 20 ++++-------------- doc/ref-html/lib/Fl_package_base.html | 27 ++++++------------------ doc/ref-html/lib/index_extensions.html | 23 -------------------- doc/ref-html/lib/style.css | 37 ++++++++++++++++++++------------- itest | 2 +- mini/ocamlfind-mini | 2 +- site-lib-src/bigarray/interfaces.out | 1 - site-lib-src/dbm/interfaces.out | 1 - site-lib-src/dynlink/interfaces.out | 1 - site-lib-src/graphics/interfaces.out | 1 - site-lib-src/labltk/interfaces.out | 1 - site-lib-src/num/interfaces.out | 1 - site-lib-src/ocamldoc/META.in | 5 +++++ site-lib-src/stdlib/interfaces.out | 1 - site-lib-src/str/interfaces.out | 1 - site-lib-src/threads/interfaces.out | 1 - site-lib-src/unix/interfaces.out | 1 - src/findlib-toolbox/make_wizard.ml | 2 +- src/findlib-toolbox/make_wizard.pattern | 2 +- src/findlib/findlib.ml | 2 +- src/findlib/findlib.mli | 2 +- src/findlib/findlib_config.mlp | 2 +- src/findlib/fl_args.ml | 2 +- src/findlib/fl_dynload.ml | 2 +- src/findlib/fl_dynload.mli | 2 +- src/findlib/fl_lint.ml | 2 +- src/findlib/fl_meta.mll | 2 +- src/findlib/fl_metascanner.mli | 2 +- src/findlib/fl_metascanner.src | 2 +- src/findlib/fl_metatoken.ml | 2 +- src/findlib/fl_package_base.ml | 2 +- src/findlib/fl_package_base.mli | 2 +- src/findlib/fl_split.ml | 2 +- src/findlib/fl_topo.ml | 2 +- src/findlib/fl_topo.mli | 2 +- src/findlib/frontend.ml | 2 +- src/findlib/num_top.ml | 2 +- src/findlib/num_top.mli | 2 +- src/findlib/num_top_printers.ml | 2 +- src/findlib/num_top_printers.mli | 2 +- src/findlib/topfind.ml.in | 2 +- src/findlib/topfind.mli | 2 +- src/findlib/topfind_rd0.p | 2 +- src/findlib/topfind_rd1.p | 2 +- tools/collect_files | 2 +- tools/extract_args/extract_args.ml | 4 ++-- 51 files changed, 92 insertions(+), 130 deletions(-) diff --git a/Makefile b/Makefile index 62aee66..bf3aabb 100644 --- a/Makefile +++ b/Makefile @@ -86,11 +86,11 @@ uninstall-doc: .PHONY: install-meta install-meta: - for x in `ls site-lib-src`; do if [ "$$x" != "CVS" -a -f "site-lib-src/$$x/META" ]; then mkdir -p "$(prefix)$(OCAML_SITELIB)/$$x"; cp site-lib-src/$$x/META "$(prefix)$(OCAML_SITELIB)/$$x"; fi; done + for x in `ls site-lib-src`; do if [ -f "site-lib-src/$$x/META" ]; then mkdir -p "$(prefix)$(OCAML_SITELIB)/$$x"; cp site-lib-src/$$x/META "$(prefix)$(OCAML_SITELIB)/$$x"; fi; done .PHONY: uninstall-meta uninstall-meta: - for x in `ls site-lib-src`; do if [ "$$x" != "CVS" ]; then rm -rf "$(prefix)$(OCAML_SITELIB)/$$x"; fi; done + for x in `ls site-lib-src`; do if [ -f "site-lib-src/$$x/META" ]; then rm -rf "$(prefix)$(OCAML_SITELIB)/$$x"; fi; done .PHONY: install-config install-config: diff --git a/configure b/configure index 6d5d015..7052e10 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #! /bin/sh -# $Id: configure 278 2015-12-07 14:34:54Z gerd $ +# $Id$ # ---------------------------------------------------------------------- # @@ -7,7 +7,7 @@ #set -x -version="1.6.1" +version="1.6.2" # Remember the old IFS value: oldifs="$IFS" @@ -521,7 +521,7 @@ fi # Generate the META files now. -l="$ldbm dynlink graphics num num-top str threads unix stdlib bigarray $llabltk $lcamlp4 $lobuild $lcomplibs $lbytes" +l="$ldbm dynlink graphics num num-top str threads unix stdlib bigarray ocamldoc $llabltk $lcamlp4 $lobuild $lcomplibs $lbytes" for dir in site-lib-src/*; do # We do not really know if $dir is a directory. diff --git a/doc/README b/doc/README index 720a43a..7e5c44f 100644 --- a/doc/README +++ b/doc/README @@ -85,6 +85,13 @@ of questions. List of Changes ============================================================================== +- 1.6.2:Uninstalling findlib no longer uninstalls the ocamlbuild library by + accident (Gabriel Scherer, Edwin T�r�k) + Adding an "ocamldoc" library, providing the cmi's for ocamldoc plugins + (suggested by Arma�l Gu�neau) + Support for OCaml-4.03: recognize that the new -color option has an argument + (reported by Guillaume Bury) + - 1.6.1: Just an important doc fix. - 1.6.0: Adding support for dynamically loading packages (Fran�ois Bobot): diff --git a/doc/README.xml b/doc/README.xml index fdff77c..c4d5503 100644 --- a/doc/README.xml +++ b/doc/README.xml @@ -110,6 +110,15 @@ configuration files, and library routines in detail.</p> <ul> <li> + <p><em>1.6.2:</em>Uninstalling findlib no longer uninstalls the +ocamlbuild library by accident (Gabriel Scherer, Edwin Török)</p> + <p>Adding an "ocamldoc" library, providing the cmi's for ocamldoc +plugins (suggested by Armaël Guéneau)</p> + <p>Support for OCaml-4.03: recognize that the new -color option +has an argument (reported by Guillaume Bury)</p> + </li> + + <li> <p><em>1.6.1:</em> Just an important doc fix.</p> </li> diff --git a/doc/ref-html/lib/Findlib.html b/doc/ref-html/lib/Findlib.html index 2b6e426..23f496f 100644 --- a/doc/ref-html/lib/Findlib.html +++ b/doc/ref-html/lib/Findlib.html @@ -232,20 +232,14 @@ This is a registry of packages that are available in-core. This is both <code><span class="keyword">|</span></code></td> <td align="left" valign="top" > <code><span id="TYPEELTrectype.Record_core"><span class="constructor">Record_core</span></span></code></td> -<td class="typefieldcomment" align="left" valign="top" ><code>(*</code></td><td class="typefieldcomment" align="left" valign="top" ><div class="info "> -The package is part of the executable core<br> -</div> -</td><td class="typefieldcomment" align="left" valign="bottom" ><code>*)</code></td> +<td class="typefieldcomment" align="left" valign="top" ><code>(*</code></td><td class="typefieldcomment" align="left" valign="top" >The package is part of the executable core</td><td class="typefieldcomment" align="left" valign="bottom" ><code>*)</code></td> </tr> <tr> <td align="left" valign="top" > <code><span class="keyword">|</span></code></td> <td align="left" valign="top" > <code><span id="TYPEELTrectype.Record_load"><span class="constructor">Record_load</span></span></code></td> -<td class="typefieldcomment" align="left" valign="top" ><code>(*</code></td><td class="typefieldcomment" align="left" valign="top" ><div class="info "> -The package has been dynamically loaded<br> -</div> -</td><td class="typefieldcomment" align="left" valign="bottom" ><code>*)</code></td> +<td class="typefieldcomment" align="left" valign="top" ><code>(*</code></td><td class="typefieldcomment" align="left" valign="top" >The package has been dynamically loaded</td><td class="typefieldcomment" align="left" valign="bottom" ><code>*)</code></td> </tr></table> diff --git a/doc/ref-html/lib/Fl_metascanner.html b/doc/ref-html/lib/Fl_metascanner.html index 0ea447a..1700215 100644 --- a/doc/ref-html/lib/Fl_metascanner.html +++ b/doc/ref-html/lib/Fl_metascanner.html @@ -45,40 +45,28 @@ Parses META files<br> <code> </code></td> <td align="left" valign="top" > <code><span id="TYPEELTpkg_definition.def_var">def_var</span> : <code class="type">string</code>;</code></td> -<td class="typefieldcomment" align="left" valign="top" ><code>(*</code></td><td class="typefieldcomment" align="left" valign="top" ><div class="info "> -The name of the defined variable<br> -</div> -</td><td class="typefieldcomment" align="left" valign="bottom" ><code>*)</code></td> +<td class="typefieldcomment" align="left" valign="top" ><code>(*</code></td><td class="typefieldcomment" align="left" valign="top" >The name of the defined variable</td><td class="typefieldcomment" align="left" valign="bottom" ><code>*)</code></td> </tr> <tr> <td align="left" valign="top" > <code> </code></td> <td align="left" valign="top" > <code><span id="TYPEELTpkg_definition.def_flav">def_flav</span> : <code class="type"><a href="Fl_metascanner.html#TYPEflavour">flavour</a></code>;</code></td> -<td class="typefieldcomment" align="left" valign="top" ><code>(*</code></td><td class="typefieldcomment" align="left" valign="top" ><div class="info "> -The flavour of the definition<br> -</div> -</td><td class="typefieldcomment" align="left" valign="bottom" ><code>*)</code></td> +<td class="typefieldcomment" align="left" valign="top" ><code>(*</code></td><td class="typefieldcomment" align="left" valign="top" >The flavour of the definition</td><td class="typefieldcomment" align="left" valign="bottom" ><code>*)</code></td> </tr> <tr> <td align="left" valign="top" > <code> </code></td> <td align="left" valign="top" > <code><span id="TYPEELTpkg_definition.def_preds">def_preds</span> : <code class="type"><a href="Fl_metascanner.html#TYPEformal_pred">formal_pred</a> list</code>;</code></td> -<td class="typefieldcomment" align="left" valign="top" ><code>(*</code></td><td class="typefieldcomment" align="left" valign="top" ><div class="info "> -The formal predicates of the def<br> -</div> -</td><td class="typefieldcomment" align="left" valign="bottom" ><code>*)</code></td> +<td class="typefieldcomment" align="left" valign="top" ><code>(*</code></td><td class="typefieldcomment" align="left" valign="top" >The formal predicates of the def</td><td class="typefieldcomment" align="left" valign="bottom" ><code>*)</code></td> </tr> <tr> <td align="left" valign="top" > <code> </code></td> <td align="left" valign="top" > <code><span id="TYPEELTpkg_definition.def_value">def_value</span> : <code class="type">string</code>;</code></td> -<td class="typefieldcomment" align="left" valign="top" ><code>(*</code></td><td class="typefieldcomment" align="left" valign="top" ><div class="info "> -The value assigned to the variable<br> -</div> -</td><td class="typefieldcomment" align="left" valign="bottom" ><code>*)</code></td> +<td class="typefieldcomment" align="left" valign="top" ><code>(*</code></td><td class="typefieldcomment" align="left" valign="top" >The value assigned to the variable</td><td class="typefieldcomment" align="left" valign="bottom" ><code>*)</code></td> </tr></table> } diff --git a/doc/ref-html/lib/Fl_package_base.html b/doc/ref-html/lib/Fl_package_base.html index bd5ddf3..af5df7f 100644 --- a/doc/ref-html/lib/Fl_package_base.html +++ b/doc/ref-html/lib/Fl_package_base.html @@ -37,52 +37,37 @@ Direct access to the package graph and package files<br> <code> </code></td> <td align="left" valign="top" > <code><span id="TYPEELTpackage.package_name">package_name</span> : <code class="type">string</code>;</code></td> -<td class="typefieldcomment" align="left" valign="top" ><code>(*</code></td><td class="typefieldcomment" align="left" valign="top" ><div class="info "> -The fully qualified package name, i.e. for subpackages the +<td class="typefieldcomment" align="left" valign="top" ><code>(*</code></td><td class="typefieldcomment" align="left" valign="top" >The fully qualified package name, i.e. for subpackages the names of the containing packages are prepended and the name - components are separated by '.'<br> -</div> -</td><td class="typefieldcomment" align="left" valign="bottom" ><code>*)</code></td> + components are separated by '.'</td><td class="typefieldcomment" align="left" valign="bottom" ><code>*)</code></td> </tr> <tr> <td align="left" valign="top" > <code> </code></td> <td align="left" valign="top" > <code><span id="TYPEELTpackage.package_dir">package_dir</span> : <code class="type">string</code>;</code></td> -<td class="typefieldcomment" align="left" valign="top" ><code>(*</code></td><td class="typefieldcomment" align="left" valign="top" ><div class="info "> -The directory where to lookup package files<br> -</div> -</td><td class="typefieldcomment" align="left" valign="bottom" ><code>*)</code></td> +<td class="typefieldcomment" align="left" valign="top" ><code>(*</code></td><td class="typefieldcomment" align="left" valign="top" >The directory where to lookup package files</td><td class="typefieldcomment" align="left" valign="bottom" ><code>*)</code></td> </tr> <tr> <td align="left" valign="top" > <code> </code></td> <td align="left" valign="top" > <code><span id="TYPEELTpackage.package_meta">package_meta</span> : <code class="type">string</code>;</code></td> -<td class="typefieldcomment" align="left" valign="top" ><code>(*</code></td><td class="typefieldcomment" align="left" valign="top" ><div class="info "> -The path to the META file<br> -</div> -</td><td class="typefieldcomment" align="left" valign="bottom" ><code>*)</code></td> +<td class="typefieldcomment" align="left" valign="top" ><code>(*</code></td><td class="typefieldcomment" align="left" valign="top" >The path to the META file</td><td class="typefieldcomment" align="left" valign="bottom" ><code>*)</code></td> </tr> <tr> <td align="left" valign="top" > <code> </code></td> <td align="left" valign="top" > <code><span id="TYPEELTpackage.package_defs">package_defs</span> : <code class="type"><a href="Fl_metascanner.html#TYPEpkg_definition">Fl_metascanner.pkg_definition</a> list</code>;</code></td> -<td class="typefieldcomment" align="left" valign="top" ><code>(*</code></td><td class="typefieldcomment" align="left" valign="top" ><div class="info "> -The definitions in the META file<br> -</div> -</td><td class="typefieldcomment" align="left" valign="bottom" ><code>*)</code></td> +<td class="typefieldcomment" align="left" valign="top" ><code>(*</code></td><td class="typefieldcomment" align="left" valign="top" >The definitions in the META file</td><td class="typefieldcomment" align="left" valign="bottom" ><code>*)</code></td> </tr> <tr> <td align="left" valign="top" > <code> </code></td> <td align="left" valign="top" > <code><span id="TYPEELTpackage.package_priv">package_priv</span> : <code class="type"><a href="Fl_package_base.html#TYPEpackage_priv">package_priv</a></code>;</code></td> -<td class="typefieldcomment" align="left" valign="top" ><code>(*</code></td><td class="typefieldcomment" align="left" valign="top" ><div class="info "> -Private part of the definition<br> -</div> -</td><td class="typefieldcomment" align="left" valign="bottom" ><code>*)</code></td> +<td class="typefieldcomment" align="left" valign="top" ><code>(*</code></td><td class="typefieldcomment" align="left" valign="top" >Private part of the definition</td><td class="typefieldcomment" align="left" valign="bottom" ><code>*)</code></td> </tr></table> } diff --git a/doc/ref-html/lib/index_extensions.html b/doc/ref-html/lib/index_extensions.html deleted file mode 100644 index 4406ab8..0000000 --- a/doc/ref-html/lib/index_extensions.html +++ /dev/null @@ -1,23 +0,0 @@ -<html> -<head> -<link rel="stylesheet" href="style.css" type="text/css"> -<meta content="text/html; charset=iso-8859-1" http-equiv="Content-Type"> -<link rel="Start" href="index.html"> -<link title="Index of types" rel=Appendix href="index_types.html"> -<link title="Index of exceptions" rel=Appendix href="index_exceptions.html"> -<link title="Index of values" rel=Appendix href="index_values.html"> -<link title="Index of modules" rel=Appendix href="index_modules.html"> -<link title="Findlib" rel="Chapter" href="Findlib.html"> -<link title="Fl_package_base" rel="Chapter" href="Fl_package_base.html"> -<link title="Fl_metascanner" rel="Chapter" href="Fl_metascanner.html"> -<link title="Fl_dynload" rel="Chapter" href="Fl_dynload.html"> -<link title="Topfind" rel="Chapter" href="Topfind.html"><title>The Findlib Library : Index of extensions</title> -</head> -<body> -<div class="navbar"> <a class="up" href="index.html" title="Index">Up</a> - </div> -<h1>Index of extensions</h1> -<table> -</table> -</body> -</html> \ No newline at end of file diff --git a/doc/ref-html/lib/style.css b/doc/ref-html/lib/style.css index 9c84d31..993fd5c 100644 --- a/doc/ref-html/lib/style.css +++ b/doc/ref-html/lib/style.css @@ -1,7 +1,3 @@ -a:visited {color : #416DFF; text-decoration : none; } -a:link {color : #416DFF; text-decoration : none;} -a:hover {color : Red; text-decoration : none; background-color: #5FFF88} -a:active {color : Red; text-decoration : underline; } .keyword { font-weight : bold ; color : Red } .keywordsign { color : #C04600 } .superscript { font-size : 4 } @@ -11,24 +7,35 @@ a:active {color : Red; text-decoration : underline; } .type { color : #5C6585 } .string { color : Maroon } .warning { color : Red ; font-weight : bold } -.info { margin-left : 3em; margin-right : 3em } +.info { margin-left : 3em; margin-right: 3em } .param_info { margin-top: 4px; margin-left : 3em; margin-right : 3em } .code { color : #465F91 ; } +.typetable { border-style : hidden } +.paramstable { border-style : hidden ; padding: 5pt 5pt} +tr { background-color : White } +td.typefieldcomment { background-color : #FFFFFF ; font-size: smaller ;} +div.sig_block {margin-left: 2em} +*:target { background: yellow; } +body {font: 13px sans-serif; color: black; text-align: left; padding: 5px; margin: 0} h1 { font-size : 20pt ; text-align: center; } h2 { font-size : 20pt ; border: 1px solid #000000; margin-top: 5px; margin-bottom: 2px;text-align: center; background-color: #90BDFF ;padding: 2px; } h3 { font-size : 20pt ; border: 1px solid #000000; margin-top: 5px; margin-bottom: 2px;text-align: center; background-color: #90DDFF ;padding: 2px; } h4 { font-size : 20pt ; border: 1px solid #000000; margin-top: 5px; margin-bottom: 2px;text-align: center; background-color: #90EDFF ;padding: 2px; } h5 { font-size : 20pt ; border: 1px solid #000000; margin-top: 5px; margin-bottom: 2px;text-align: center; background-color: #90FDFF ;padding: 2px; } -h6 { font-size : 20pt ; border: 1px solid #000000; margin-top: 5px; margin-bottom: 2px;text-align: center; background-color: #C0FFFF ; padding: 2px; } +h6 { font-size : 20pt ; border: 1px solid #000000; margin-top: 5px; margin-bottom: 2px;text-align: center; background-color: #90BDFF ; padding: 2px; } div.h7 { font-size : 20pt ; border: 1px solid #000000; margin-top: 5px; margin-bottom: 2px;text-align: center; background-color: #E0FFFF ; padding: 2px; } div.h8 { font-size : 20pt ; border: 1px solid #000000; margin-top: 5px; margin-bottom: 2px;text-align: center; background-color: #F0FFFF ; padding: 2px; } div.h9 { font-size : 20pt ; border: 1px solid #000000; margin-top: 5px; margin-bottom: 2px;text-align: center; background-color: #FFFFFF ; padding: 2px; } -.typetable { border-style : hidden } -.indextable { border-style : hidden } -.paramstable { border-style : hidden ; padding: 5pt 5pt} -body { background-color : White } -tr { background-color : White } -td.typefieldcomment { background-color : #FFFFFF ; font-size: smaller ;} -pre { margin-bottom: 4px } -div.sig_block {margin-left: 2em} -*:target { background: yellow; } \ No newline at end of file +a {color: #416DFF; text-decoration: none} +a:hover {background-color: #ddd; text-decoration: underline} +pre { margin-bottom: 4px; font-family: monospace; } +pre.verbatim, pre.codepre { } +.indextable {border: 1px #ddd solid; border-collapse: collapse} +.indextable td, .indextable th {border: 1px #ddd solid; min-width: 80px} +.indextable td.module {background-color: #eee ; padding-left: 2px; padding-right: 2px} +.indextable td.module a {color: 4E6272; text-decoration: none; display: block; width: 100%} +.indextable td.module a:hover {text-decoration: underline; background-color: transparent} +.deprecated {color: #888; font-style: italic} +.indextable tr td div.info { margin-left: 2px; margin-right: 2px } +ul.indexlist { margin-left: 0; padding-left: 0;} +ul.indexlist li { list-style-type: none ; margin-left: 0; padding-left: 0; } \ No newline at end of file diff --git a/itest b/itest index c262cf4..6aa0137 100755 --- a/itest +++ b/itest @@ -1,5 +1,5 @@ #! /bin/sh -# $Id: itest 114 2007-11-11 21:46:09Z gerd $ +# $Id$ # ---------------------------------------------------------------------- # diff --git a/mini/ocamlfind-mini b/mini/ocamlfind-mini index 202a150..4e37221 100755 --- a/mini/ocamlfind-mini +++ b/mini/ocamlfind-mini @@ -3,7 +3,7 @@ exec ocaml "$0" "$@" *) directory ".";; -(* $Id: ocamlfind-mini 191 2013-02-13 15:08:32Z gerd $ +(* $Id$ * ---------------------------------------------------------------------- * *) diff --git a/site-lib-src/bigarray/interfaces.out b/site-lib-src/bigarray/interfaces.out deleted file mode 100644 index 22caf12..0000000 --- a/site-lib-src/bigarray/interfaces.out +++ /dev/null @@ -1 +0,0 @@ - Unit name: Bigarray diff --git a/site-lib-src/dbm/interfaces.out b/site-lib-src/dbm/interfaces.out deleted file mode 100644 index 4f37ca5..0000000 --- a/site-lib-src/dbm/interfaces.out +++ /dev/null @@ -1 +0,0 @@ - Unit name: Dbm diff --git a/site-lib-src/dynlink/interfaces.out b/site-lib-src/dynlink/interfaces.out deleted file mode 100644 index 6433463..0000000 --- a/site-lib-src/dynlink/interfaces.out +++ /dev/null @@ -1 +0,0 @@ - Unit name: Dynlink Unit name: Dynlinkaux diff --git a/site-lib-src/graphics/interfaces.out b/site-lib-src/graphics/interfaces.out deleted file mode 100644 index 1b8d77b..0000000 --- a/site-lib-src/graphics/interfaces.out +++ /dev/null @@ -1 +0,0 @@ - Unit name: Graphics Unit name: GraphicsX11 diff --git a/site-lib-src/labltk/interfaces.out b/site-lib-src/labltk/interfaces.out deleted file mode 100644 index 64f4ef8..0000000 --- a/site-lib-src/labltk/interfaces.out +++ /dev/null @@ -1 +0,0 @@ - Unit name: Frx_after Unit name: Frx_color Unit name: Frx_ctext Unit name: Frx_dialog Unit name: Frx_entry Unit name: Frx_fillbox Unit name: Frx_fit Unit name: Frx_focus Unit name: Frx_font Unit name: Frx_listbox Unit name: Frx_mem Unit name: Frx_misc Unit name: Frx_req Unit name: Frx_rpc Unit name: Frx_selection Unit name: Frx_synth Unit name: Frx_text Unit name: Frx_widget Unit name: Balloon Unit name: Fileselect Unit name: Jpf_font Unit name: Shell Unit name: Bell Unit name: Button [...] diff --git a/site-lib-src/num/interfaces.out b/site-lib-src/num/interfaces.out deleted file mode 100644 index 5259e88..0000000 --- a/site-lib-src/num/interfaces.out +++ /dev/null @@ -1 +0,0 @@ - Unit name: Arith_flags Unit name: Arith_status Unit name: Big_int Unit name: Int_misc Unit name: Nat Unit name: Num Unit name: Ratio diff --git a/site-lib-src/ocamldoc/META.in b/site-lib-src/ocamldoc/META.in new file mode 100644 index 0000000..bbd49f8 --- /dev/null +++ b/site-lib-src/ocamldoc/META.in @@ -0,0 +1,5 @@ +# Specification for the "ocamldoc" library +requires = "compiler-libs" +version = "[distributed with Ocaml]" +description = "ocamldoc plugin interface" +directory= "^ocamldoc" diff --git a/site-lib-src/stdlib/interfaces.out b/site-lib-src/stdlib/interfaces.out deleted file mode 100644 index dc1be91..0000000 --- a/site-lib-src/stdlib/interfaces.out +++ /dev/null @@ -1 +0,0 @@ - Unit name: Arg Unit name: Array Unit name: ArrayLabels Unit name: Buffer Unit name: Callback Unit name: CamlinternalLazy Unit name: CamlinternalMod Unit name: CamlinternalOO Unit name: Char Unit name: Complex Unit name: Digest Unit name: Filename Unit name: Format Unit name: Gc Unit name: Genlex Unit name: Hashtbl Unit name: Int32 Unit name: Int64 Unit name: Lazy Unit name: Lexing Unit name: List Unit name: ListLabels Unit name: Map Unit name: Marshal Unit name: MoreLabels Unit name: Na [...] diff --git a/site-lib-src/str/interfaces.out b/site-lib-src/str/interfaces.out deleted file mode 100644 index 2e0caa7..0000000 --- a/site-lib-src/str/interfaces.out +++ /dev/null @@ -1 +0,0 @@ - Unit name: Str diff --git a/site-lib-src/threads/interfaces.out b/site-lib-src/threads/interfaces.out deleted file mode 100644 index 87b37c1..0000000 --- a/site-lib-src/threads/interfaces.out +++ /dev/null @@ -1 +0,0 @@ - Unit name: Condition Unit name: Event Unit name: Mutex Unit name: Thread Unit name: ThreadUnix diff --git a/site-lib-src/unix/interfaces.out b/site-lib-src/unix/interfaces.out deleted file mode 100644 index a73f9b5..0000000 --- a/site-lib-src/unix/interfaces.out +++ /dev/null @@ -1 +0,0 @@ - Unit name: Unix Unit name: UnixLabels diff --git a/src/findlib-toolbox/make_wizard.ml b/src/findlib-toolbox/make_wizard.ml index a3b42d3..fb7b0e2 100644 --- a/src/findlib-toolbox/make_wizard.ml +++ b/src/findlib-toolbox/make_wizard.ml @@ -1,4 +1,4 @@ -(* $Id: make_wizard.ml 191 2013-02-13 15:08:32Z gerd $ +(* $Id$ * ---------------------------------------------------------------------- * *) diff --git a/src/findlib-toolbox/make_wizard.pattern b/src/findlib-toolbox/make_wizard.pattern index db33624..90116e9 100644 --- a/src/findlib-toolbox/make_wizard.pattern +++ b/src/findlib-toolbox/make_wizard.pattern @@ -1,4 +1,4 @@ -## $Id: make_wizard.pattern 191 2013-02-13 15:08:32Z gerd $ +## $Id$ ## ---------------------------------------------------------------------- ## diff --git a/src/findlib/findlib.ml b/src/findlib/findlib.ml index 90f9f61..2376315 100644 --- a/src/findlib/findlib.ml +++ b/src/findlib/findlib.ml @@ -1,4 +1,4 @@ -(* $Id: findlib.ml 272 2015-12-07 13:47:02Z gerd $ +(* $Id$ * ---------------------------------------------------------------------- * *) diff --git a/src/findlib/findlib.mli b/src/findlib/findlib.mli index bde2156..84b4dd2 100644 --- a/src/findlib/findlib.mli +++ b/src/findlib/findlib.mli @@ -1,4 +1,4 @@ -(* $Id: findlib.mli 272 2015-12-07 13:47:02Z gerd $ +(* $Id$ * ---------------------------------------------------------------------- * *) diff --git a/src/findlib/findlib_config.mlp b/src/findlib/findlib_config.mlp index 795b0d7..64b4840 100644 --- a/src/findlib/findlib_config.mlp +++ b/src/findlib/findlib_config.mlp @@ -1,4 +1,4 @@ -(* $Id: findlib_config.mlp 251 2015-04-27 09:02:35Z gerd $ +(* $Id$ * ---------------------------------------------------------------------- * *) diff --git a/src/findlib/fl_args.ml b/src/findlib/fl_args.ml index ccbdb2b..2bca50c 100644 --- a/src/findlib/fl_args.ml +++ b/src/findlib/fl_args.ml @@ -1,4 +1,4 @@ -(* $Id: fl_args.ml 185 2013-01-14 16:35:19Z gerd $ *) +(* $Id$ *) (* Rewrite a list of arguments args (from Sys.args) so that contracted options like -L<arg> are transformed to -L <arg>, and become parseable diff --git a/src/findlib/fl_dynload.ml b/src/findlib/fl_dynload.ml index e01a92e..ece81fe 100644 --- a/src/findlib/fl_dynload.ml +++ b/src/findlib/fl_dynload.ml @@ -1,4 +1,4 @@ -(* $Id: fl_dynload.ml 259 2015-05-03 14:36:24Z gerd $ *) +(* $Id$ *) (* Utilities for loading dynamically packages *) diff --git a/src/findlib/fl_dynload.mli b/src/findlib/fl_dynload.mli index 33e21c9..56282fb 100644 --- a/src/findlib/fl_dynload.mli +++ b/src/findlib/fl_dynload.mli @@ -1,4 +1,4 @@ -(* $Id: fl_dynload.mli 277 2015-12-07 14:33:35Z gerd $ *) +(* $Id$ *) (** Utilities for loading dynamically packages *) diff --git a/src/findlib/fl_lint.ml b/src/findlib/fl_lint.ml index a486b05..160cdfb 100644 --- a/src/findlib/fl_lint.ml +++ b/src/findlib/fl_lint.ml @@ -1,4 +1,4 @@ -(* $Id: fl_lint.ml 267 2015-12-07 13:05:29Z gerd $ -*- tuareg -*- +(* $Id$ -*- tuareg -*- * ---------------------------------------------------------------------- * *) diff --git a/src/findlib/fl_meta.mll b/src/findlib/fl_meta.mll index 2fc97af..b0737a1 100644 --- a/src/findlib/fl_meta.mll +++ b/src/findlib/fl_meta.mll @@ -1,4 +1,4 @@ -(* $Id: fl_meta.mll 273 2015-12-07 14:20:45Z gerd $ +(* $Id$ * ---------------------------------------------------------------------- * *) diff --git a/src/findlib/fl_metascanner.mli b/src/findlib/fl_metascanner.mli index 57478bb..aace846 100644 --- a/src/findlib/fl_metascanner.mli +++ b/src/findlib/fl_metascanner.mli @@ -1,4 +1,4 @@ -(* $Id: fl_metascanner.mli 264 2015-12-07 12:48:08Z gerd $ +(* $Id$ * ---------------------------------------------------------------------- * *) diff --git a/src/findlib/fl_metascanner.src b/src/findlib/fl_metascanner.src index 362715a..83f5615 100644 --- a/src/findlib/fl_metascanner.src +++ b/src/findlib/fl_metascanner.src @@ -1,4 +1,4 @@ -(* $Id: fl_metascanner.src 273 2015-12-07 14:20:45Z gerd $ -*- tuareg -*- +(* $Id$ -*- tuareg -*- * ---------------------------------------------------------------------- * *) diff --git a/src/findlib/fl_metatoken.ml b/src/findlib/fl_metatoken.ml index 4dc086e..6a2483f 100644 --- a/src/findlib/fl_metatoken.ml +++ b/src/findlib/fl_metatoken.ml @@ -1,4 +1,4 @@ -(* $Id: fl_metatoken.ml 195 2013-06-05 23:29:59Z gerd $ +(* $Id$ * ---------------------------------------------------------------------- * *) diff --git a/src/findlib/fl_package_base.ml b/src/findlib/fl_package_base.ml index 2e002e0..87e3254 100644 --- a/src/findlib/fl_package_base.ml +++ b/src/findlib/fl_package_base.ml @@ -1,4 +1,4 @@ -(* $Id: fl_package_base.ml 272 2015-12-07 13:47:02Z gerd $ +(* $Id$ * ---------------------------------------------------------------------- * *) diff --git a/src/findlib/fl_package_base.mli b/src/findlib/fl_package_base.mli index b0c5549..f907d89 100644 --- a/src/findlib/fl_package_base.mli +++ b/src/findlib/fl_package_base.mli @@ -1,4 +1,4 @@ -(* $Id: fl_package_base.mli 272 2015-12-07 13:47:02Z gerd $ +(* $Id$ * ---------------------------------------------------------------------- * *) diff --git a/src/findlib/fl_split.ml b/src/findlib/fl_split.ml index fce7082..36473be 100644 --- a/src/findlib/fl_split.ml +++ b/src/findlib/fl_split.ml @@ -1,4 +1,4 @@ -(* $Id: fl_split.ml 273 2015-12-07 14:20:45Z gerd $ +(* $Id$ * ---------------------------------------------------------------------- * *) diff --git a/src/findlib/fl_topo.ml b/src/findlib/fl_topo.ml index 0b16a15..aa291fa 100644 --- a/src/findlib/fl_topo.ml +++ b/src/findlib/fl_topo.ml @@ -1,4 +1,4 @@ -(* $Id: fl_topo.ml 212 2014-06-23 19:30:16Z gerd $ +(* $Id$ * ---------------------------------------------------------------------- * *) diff --git a/src/findlib/fl_topo.mli b/src/findlib/fl_topo.mli index d8f61c0..aaf1782 100644 --- a/src/findlib/fl_topo.mli +++ b/src/findlib/fl_topo.mli @@ -1,4 +1,4 @@ -(* $Id: fl_topo.mli 191 2013-02-13 15:08:32Z gerd $ +(* $Id$ * ---------------------------------------------------------------------- * *) diff --git a/src/findlib/frontend.ml b/src/findlib/frontend.ml index 201ea20..9339a5c 100644 --- a/src/findlib/frontend.ml +++ b/src/findlib/frontend.ml @@ -1,4 +1,4 @@ -(* $Id: frontend.ml 273 2015-12-07 14:20:45Z gerd $ +(* $Id$ * ---------------------------------------------------------------------- * *) diff --git a/src/findlib/num_top.ml b/src/findlib/num_top.ml index 94fa7cc..947d486 100644 --- a/src/findlib/num_top.ml +++ b/src/findlib/num_top.ml @@ -1,4 +1,4 @@ -(* $Id: num_top.ml 191 2013-02-13 15:08:32Z gerd $ +(* $Id$ * ---------------------------------------------------------------------- * *) diff --git a/src/findlib/num_top.mli b/src/findlib/num_top.mli index 1e2452f..1022570 100644 --- a/src/findlib/num_top.mli +++ b/src/findlib/num_top.mli @@ -1,4 +1,4 @@ -(* $Id: num_top.mli 191 2013-02-13 15:08:32Z gerd $ +(* $Id$ * ---------------------------------------------------------------------- * *) diff --git a/src/findlib/num_top_printers.ml b/src/findlib/num_top_printers.ml index c1c6c2f..80b0cf7 100644 --- a/src/findlib/num_top_printers.ml +++ b/src/findlib/num_top_printers.ml @@ -1,4 +1,4 @@ -(* $Id: num_top_printers.ml 191 2013-02-13 15:08:32Z gerd $ +(* $Id$ * ---------------------------------------------------------------------- * *) diff --git a/src/findlib/num_top_printers.mli b/src/findlib/num_top_printers.mli index b433e18..44566db 100644 --- a/src/findlib/num_top_printers.mli +++ b/src/findlib/num_top_printers.mli @@ -1,4 +1,4 @@ -(* $Id: num_top_printers.mli 151 2012-02-28 23:16:37Z gerd $ +(* $Id$ * ---------------------------------------------------------------------- * *) diff --git a/src/findlib/topfind.ml.in b/src/findlib/topfind.ml.in index 1a66552..febb216 100644 --- a/src/findlib/topfind.ml.in +++ b/src/findlib/topfind.ml.in @@ -1,4 +1,4 @@ -(* $Id: topfind.ml.in 253 2015-04-27 11:59:16Z gerd $ +(* $Id$ * ---------------------------------------------------------------------- * *) diff --git a/src/findlib/topfind.mli b/src/findlib/topfind.mli index c3fac25..f311200 100644 --- a/src/findlib/topfind.mli +++ b/src/findlib/topfind.mli @@ -1,4 +1,4 @@ -(* $Id: topfind.mli 192 2013-03-13 00:33:25Z gerd $ +(* $Id$ * ---------------------------------------------------------------------- * *) diff --git a/src/findlib/topfind_rd0.p b/src/findlib/topfind_rd0.p index c4dc69f..b00a6f8 100644 --- a/src/findlib/topfind_rd0.p +++ b/src/findlib/topfind_rd0.p @@ -1,4 +1,4 @@ -(* $Id: topfind_rd0.p 178 2012-07-09 09:20:31Z gerd $ -*- tuareg -*- *) +(* $Id$ -*- tuareg -*- *) (* For Ocaml-3.03 and up, so you can do: #use "topfind" and get a * working findlib toploop. diff --git a/src/findlib/topfind_rd1.p b/src/findlib/topfind_rd1.p index e85fbbc..1455738 100644 --- a/src/findlib/topfind_rd1.p +++ b/src/findlib/topfind_rd1.p @@ -1,4 +1,4 @@ -(* $Id: topfind_rd1.p 178 2012-07-09 09:20:31Z gerd $ -*- tuareg -*- *) +(* $Id$ -*- tuareg -*- *) (* For Ocaml-3.03 and up, so you can do: #use "topfind" and get a * working findlib toploop. diff --git a/tools/collect_files b/tools/collect_files index e3e2272..b8aacbf 100755 --- a/tools/collect_files +++ b/tools/collect_files @@ -1,6 +1,6 @@ #! /bin/sh # -# $Id: collect_files 191 2013-02-13 15:08:32Z gerd $ +# $Id$ # ---------------------------------------------------------------------- # # usage: collect_files file ... diff --git a/tools/extract_args/extract_args.ml b/tools/extract_args/extract_args.ml index 3848783..eb63066 100644 --- a/tools/extract_args/extract_args.ml +++ b/tools/extract_args/extract_args.ml @@ -1,4 +1,4 @@ -(* $Id: extract_args.ml 163 2012-05-07 13:03:54Z gerd $ *) +(* $Id$ *) (* Runs ocamlc -help and extract the command-line signature *) @@ -46,7 +46,7 @@ let get_help cmd = let switch1_re = Str.regexp "[ \t]*\\(-[-a-zA-Z0-9_,]+\\)[ \t]?\\(.*\\)$";; let switch2_re = Str.regexp "[ \t]*\\(-\\)[ \t]+\\(.*\\)$";; -let argument_re = Str.regexp "[ \t]*[<[]";; +let argument_re = Str.regexp "[ \t]*[<[{]";; let rec extract_signature lines = match lines with -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/findlib.git _______________________________________________ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits