[Unison-hackers] [unison-svn] r428 - in trunk/src: . system
vouillon@seas.upenn.edu
vouillon at seas.upenn.edu
Thu Apr 8 03:43:52 EDT 2010
Author: vouillon
Date: 2010-04-08 03:43:52 -0400 (Thu, 08 Apr 2010)
New Revision: 428
Modified:
trunk/src/Makefile.OCaml
trunk/src/RECENTNEWS
trunk/src/fs.ml
trunk/src/mkProjectInfo.ml
trunk/src/system/system_generic.ml
trunk/src/uigtk2.ml
Log:
* GTK UI: typo
* Fixed Makefile for compilation under Solaris
Modified: trunk/src/Makefile.OCaml
===================================================================
--- trunk/src/Makefile.OCaml 2010-04-01 19:52:57 UTC (rev 427)
+++ trunk/src/Makefile.OCaml 2010-04-08 07:43:52 UTC (rev 428)
@@ -51,9 +51,9 @@
# to Unix '/' separators, and extraneous control-M's are deleted.
# Unfortunately there is a literal control-M buried in this, I'd rather
# get rid of it...
-# OCAMLLIBDIR=$(shell ocamlc -v | tail -n -1 | sed -e 's/.* //g' | sed -e 's/\\/\//g' | sed -e 's///g')
+# OCAMLLIBDIR=$(shell ocamlc -v | tail -1 | sed -e 's/.* //g' | sed -e 's/\\/\//g' | sed -e 's///g')
# Better(?) version, June 2005:
-OCAMLLIBDIR=$(shell ocamlc -v | tail -n -1 | sed -e 's/.* //g' | sed -e 's/\\/\//g' | tr -d '\r')
+OCAMLLIBDIR=$(shell ocamlc -v | tail -1 | sed -e 's/.* //g' | sed -e 's/\\/\//g' | tr -d '\r')
## BCP (6/05) an alternative, but not quite working, version
## suggested by Nick Montfort:
Modified: trunk/src/RECENTNEWS
===================================================================
--- trunk/src/RECENTNEWS 2010-04-01 19:52:57 UTC (rev 427)
+++ trunk/src/RECENTNEWS 2010-04-08 07:43:52 UTC (rev 428)
@@ -1,5 +1,11 @@
CHANGES FROM VERSION 2.40.16
+* GTK UI: typo
+* Fixed Makefile for compilation under Solaris
+
+-------------------------------
+CHANGES FROM VERSION 2.40.16
+
* Remove '.' entries in paths.; do not allow '..'.
* Some clean-up
Modified: trunk/src/fs.ml
===================================================================
--- trunk/src/fs.ml 2010-04-01 19:52:57 UTC (rev 427)
+++ trunk/src/fs.ml 2010-04-08 07:43:52 UTC (rev 428)
@@ -45,7 +45,7 @@
let openfile f flags perms = System.openfile (Fspath.toString f) flags perms
-let opendir f : dir_handle = System.opendir (Fspath.toString f)
+let opendir f = System.opendir (Fspath.toString f)
let open_in_gen flags mode f =
System.open_in_gen flags mode (Fspath.toString f)
Modified: trunk/src/mkProjectInfo.ml
===================================================================
--- trunk/src/mkProjectInfo.ml 2010-04-01 19:52:57 UTC (rev 427)
+++ trunk/src/mkProjectInfo.ml 2010-04-08 07:43:52 UTC (rev 428)
@@ -108,3 +108,4 @@
+
Modified: trunk/src/system/system_generic.ml
===================================================================
--- trunk/src/system/system_generic.ml 2010-04-01 19:52:57 UTC (rev 427)
+++ trunk/src/system/system_generic.ml 2010-04-08 07:43:52 UTC (rev 428)
@@ -51,7 +51,7 @@
let openfile = Unix.openfile
let opendir f =
let h = Unix.opendir f in
- { readdir = (fun () -> Unix.readdir h);
+ { readdir = (fun () -> Unix.readdir h);
closedir = (fun () -> Unix.closedir h) }
let readdir = Unix.readdir
Modified: trunk/src/uigtk2.ml
===================================================================
--- trunk/src/uigtk2.ml 2010-04-01 19:52:57 UTC (rev 427)
+++ trunk/src/uigtk2.ml 2010-04-08 07:43:52 UTC (rev 428)
@@ -3653,7 +3653,8 @@
grSet grRescan true;
make_interactive toplevelWindow;
- if failureCount + partialCount + skippedCount > 0 then begin
+ let totalCount = failureCount + partialCount + skippedCount in
+ if totalCount > 0 then begin
let format n item sing plur =
match n with
0 -> []
@@ -3668,7 +3669,8 @@
let message =
(if failureCount = 0 then "The synchronization was successful.\n\n"
else "") ^
- "The replicas are not fully synchronized.\nThere was" ^
+ "The replicas are not fully synchronized.\n" ^
+ (if totalCount < 2 then "There was" else "There were") ^
begin match infos with
[] -> assert false
| [x] -> " " ^ x
More information about the Unison-hackers
mailing list