Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

improving ocamlfind ocamldoc.

version 1.2.7


git-svn-id: https://godirepo.camlcity.org/svn/lib-findlib/trunk@142 5e68ba05-c9cc-0310-a7d4-dca2aa431786
  • Loading branch information...
commit fd27efffdcb5cf8fea73a1eb374dca166956460c 1 parent a8f28e4
authored April 06, 2011
2  configure
@@ -7,7 +7,7 @@
7 7
 
8 8
 #set -x
9 9
 
10  
-version="1.2.6"
  10
+version="1.2.7"
11 11
 
12 12
 # Remember the old IFS value:
13 13
 oldifs="$IFS"
18  doc/README.xml
@@ -110,6 +110,24 @@ configuration files, and library routines in detail.</p>
110 110
     <ul>
111 111
 
112 112
     <li>
  113
+      <p><em>1.2.7:</em>
  114
+Fix: if a META file defines several packages, and one of the packages
  115
+has a broken dependency, ocamlfind used to report all errors even if
  116
+the broken packages were not used. This is now changed - broken
  117
+subpackages are ignored when they are not needed, in the same way as
  118
+broken top-level packages are ignored when not needed. (Thanks to
  119
+Sylvain Le Gall for reporting the problem.)</p>
  120
+      <p>Added -thread and -vmthread switches to "ocamlfind ocamldoc".
  121
+These actually only add the right predicates. (Thanks to Vladimir
  122
+Ivanov for pointing this problem out.)</p>
  123
+      <p>Package warnings can be emitted by "ocamlfind ocamldoc".</p>
  124
+    </li>
  125
+    <li>
  126
+      <p><em>1.2.6:</em> adding META for ocamlbuild</p>
  127
+      <p>Fixes for MinGW/MSYS platform</p>
  128
+      <p>Improved messages</p>
  129
+    </li>
  130
+    <li>
113 131
       <p><em>1.2.5:</em> Fix: Again CR deletion... Turns out some OS do not
114 132
         understand '\r' but only '\015' (thanks to Isaiah Weiner)</p>
115 133
       <p>Support for Win64 (untested; thanks to David Allsopp)</p>
20  src/findlib/frontend.ml
@@ -1129,6 +1129,14 @@ let ocamldoc() =
1129 1129
 	Arg.String (fun s -> pp_opts := s :: !pp_opts),
1130 1130
 	"<opt>     Append option <opt> to preprocessor invocation";
1131 1131
 
  1132
+	"-thread",
  1133
+	Arg.Unit (fun () -> predicates := "mt" :: "mt_posix" :: !predicates),
  1134
+	"   Assume kernel multi-threading when doing dependency analyses";
  1135
+
  1136
+	"-vmthread",
  1137
+	Arg.Unit (fun () -> predicates := "mt" :: "mt_vm" :: !predicates),
  1138
+	"   Assume bytecode multi-threading when doing dependency analyses";
  1139
+
1132 1140
 	"-verbose",
1133 1141
 	Arg.Set verbose,
1134 1142
 	"        Be verbose\nSTANDARD OPTIONS:";
@@ -1180,6 +1188,18 @@ let ocamldoc() =
1180 1188
   let eff_packages =
1181 1189
     package_deep_ancestors !predicates !packages in
1182 1190
 
  1191
+  (* Check on [error] directives (turned into warnings): *)
  1192
+  List.iter
  1193
+    (fun pkg ->
  1194
+       try
  1195
+	 let error = package_property !predicates pkg "error" in
  1196
+	 prerr_endline("ocamlfind: [WARNING] Package `" ^ pkg ^
  1197
+			 "' signals error: " ^ error)
  1198
+       with
  1199
+	   Not_found -> ()
  1200
+    )
  1201
+    eff_packages;
  1202
+
1183 1203
   let eff_packages_dl =
1184 1204
     remove_dups (List.map package_directory eff_packages) in
1185 1205
 

0 notes on commit fd27eff

Please sign in to comment.
Something went wrong with that request. Please try again.