[Unison-hackers] [unison-svn] r332 - in branches/2.32/src: . lwt win32rc
vouillon@seas.upenn.edu
vouillon at seas.upenn.edu
Thu May 14 11:59:37 EDT 2009
Author: vouillon
Date: 2009-05-14 11:59:33 -0400 (Thu, 14 May 2009)
New Revision: 332
Modified:
branches/2.32/src/RECENTNEWS
branches/2.32/src/lwt/lwt_unix.ml
branches/2.32/src/mkProjectInfo.ml
branches/2.32/src/os.ml
branches/2.32/src/uigtk2.ml
branches/2.32/src/win32rc/U.ico
branches/2.32/src/win32rc/unison.rc
branches/2.32/src/win32rc/unison.res
branches/2.32/src/win32rc/unison.res.lib
Log:
* Fixed bug in GTK UI: buttons could be incorrectly activated back during
synchronization
* Improved error message when trying to synchronize a symlink to a
Windows machine
* Uses improved emulation of "select" call provided by Ocaml 3.11
under Windows (the GUI should not freeze as much during synchronization)
* Improved Unison icon
Modified: branches/2.32/src/RECENTNEWS
===================================================================
--- branches/2.32/src/RECENTNEWS 2009-05-13 18:02:17 UTC (rev 331)
+++ branches/2.32/src/RECENTNEWS 2009-05-14 15:59:33 UTC (rev 332)
@@ -1,3 +1,14 @@
+CHANGES FROM VERSION 2.32.12
+
+* Fixed bug in GTK UI: buttons could be incorrectly activated back during
+ synchronization
+* Improved error message when trying to synchronize a symlink to a
+ Windows machine
+* Uses improved emulation of "select" call provided by Ocaml 3.11
+ under Windows (the GUI should not freeze as much during synchronization)
+* Improved Unison icon
+
+-------------------------------
CHANGES FROM VERSION 2.32.11
* Fix up docs.
Modified: branches/2.32/src/lwt/lwt_unix.ml
===================================================================
--- branches/2.32/src/lwt/lwt_unix.ml 2009-05-13 18:02:17 UTC (rev 331)
+++ branches/2.32/src/lwt/lwt_unix.ml 2009-05-14 15:59:33 UTC (rev 332)
@@ -14,6 +14,9 @@
- [connect] is blocking
*)
let windows_hack = Sys.os_type <> "Unix"
+let recent_ocaml =
+ Scanf.sscanf Sys.ocaml_version "%d.%d"
+ (fun maj min -> (maj = 3 && min >= 11) || maj > 3)
module SleepQueue =
Pqueue.Make (struct
@@ -112,7 +115,7 @@
let infds = List.map fst !inputs in
let outfds = List.map fst !outputs in
let (readers, writers, _) =
- if windows_hack then
+ if windows_hack && not recent_ocaml then
let writers = outfds in
let readers =
if delay = 0. || writers <> [] then [] else infds in
Modified: branches/2.32/src/mkProjectInfo.ml
===================================================================
--- branches/2.32/src/mkProjectInfo.ml 2009-05-13 18:02:17 UTC (rev 331)
+++ branches/2.32/src/mkProjectInfo.ml 2009-05-14 15:59:33 UTC (rev 332)
@@ -108,3 +108,4 @@
+
Modified: branches/2.32/src/os.ml
===================================================================
--- branches/2.32/src/os.ml 2009-05-13 18:02:17 UTC (rev 331)
+++ branches/2.32/src/os.ml 2009-05-14 15:59:33 UTC (rev 332)
@@ -225,7 +225,11 @@
Unix.symlink l abspath)
else
fun fspath path l ->
- raise (Util.Transient "symlink not supported under Win32")
+ raise (Util.Transient
+ (Format.sprintf
+ "Cannot create symlink \"%s\": \
+ symlinks are not supported under Windows"
+ (Fspath.concatToString fspath path)))
(* Create a new directory, using the permissions from the given props *)
let createDir fspath path props =
Modified: branches/2.32/src/uigtk2.ml
===================================================================
--- branches/2.32/src/uigtk2.ml 2009-05-13 18:02:17 UTC (rev 331)
+++ branches/2.32/src/uigtk2.ml 2009-05-14 15:59:33 UTC (rev 332)
@@ -1443,8 +1443,10 @@
)
| None, _ ->
(false, true, false) in
- grSet grAction activate1;
- grSet grDiff activate2;
+ if not !busy then begin
+ grSet grAction activate1;
+ grSet grDiff activate2
+ end;
if details then
showDetailsButton#misc#show ()
else
Modified: branches/2.32/src/win32rc/U.ico
===================================================================
(Binary files differ)
Modified: branches/2.32/src/win32rc/unison.rc
===================================================================
--- branches/2.32/src/win32rc/unison.rc 2009-05-13 18:02:17 UTC (rev 331)
+++ branches/2.32/src/win32rc/unison.rc 2009-05-14 15:59:33 UTC (rev 332)
@@ -1,80 +1,3 @@
#include <winver.h>
UNISON_ICON ICON "U.ico"
-X_cursor CURSOR DISCARDABLE "cursor00.cur"
-arrow CURSOR DISCARDABLE "cursor02.cur"
-based_arrow_down CURSOR DISCARDABLE "cursor04.cur"
-based_arrow_up CURSOR DISCARDABLE "cursor06.cur"
-boat CURSOR DISCARDABLE "cursor08.cur"
-bogosity CURSOR DISCARDABLE "cursor0a.cur"
-bottom_left_corner CURSOR DISCARDABLE "cursor0c.cur"
-bottom_right_corner CURSOR DISCARDABLE "cursor0e.cur"
-bottom_side CURSOR DISCARDABLE "cursor10.cur"
-bottom_tee CURSOR DISCARDABLE "cursor12.cur"
-box_spiral CURSOR DISCARDABLE "cursor14.cur"
-center_ptr CURSOR DISCARDABLE "cursor16.cur"
-circle CURSOR DISCARDABLE "cursor18.cur"
-clock CURSOR DISCARDABLE "cursor1a.cur"
-coffee_mug CURSOR DISCARDABLE "cursor1c.cur"
-cross CURSOR DISCARDABLE "cursor1e.cur"
-cross_reverse CURSOR DISCARDABLE "cursor20.cur"
-crosshair CURSOR DISCARDABLE "cursor22.cur"
-diamond_cross CURSOR DISCARDABLE "cursor24.cur"
-dot CURSOR DISCARDABLE "cursor26.cur"
-dotbox CURSOR DISCARDABLE "cursor28.cur"
-double_arrow CURSOR DISCARDABLE "cursor2a.cur"
-draft_large CURSOR DISCARDABLE "cursor2c.cur"
-draft_small CURSOR DISCARDABLE "cursor2e.cur"
-draped_box CURSOR DISCARDABLE "cursor30.cur"
-exchange CURSOR DISCARDABLE "cursor32.cur"
-fleur CURSOR DISCARDABLE "cursor34.cur"
-gobbler CURSOR DISCARDABLE "cursor36.cur"
-gumby CURSOR DISCARDABLE "cursor38.cur"
-hand1 CURSOR DISCARDABLE "cursor3a.cur"
-hand2 CURSOR DISCARDABLE "cursor3c.cur"
-heart CURSOR DISCARDABLE "cursor3e.cur"
-icon CURSOR DISCARDABLE "cursor40.cur"
-iron_cross CURSOR DISCARDABLE "cursor42.cur"
-left_ptr CURSOR DISCARDABLE "cursor44.cur"
-left_side CURSOR DISCARDABLE "cursor46.cur"
-left_tee CURSOR DISCARDABLE "cursor48.cur"
-leftbutton CURSOR DISCARDABLE "cursor4a.cur"
-ll_angle CURSOR DISCARDABLE "cursor4c.cur"
-lr_angle CURSOR DISCARDABLE "cursor4e.cur"
-man CURSOR DISCARDABLE "cursor50.cur"
-middlebutton CURSOR DISCARDABLE "cursor52.cur"
-mouse CURSOR DISCARDABLE "cursor54.cur"
-pencil CURSOR DISCARDABLE "cursor56.cur"
-pirate CURSOR DISCARDABLE "cursor58.cur"
-plus CURSOR DISCARDABLE "cursor5a.cur"
-question_arrow CURSOR DISCARDABLE "cursor5c.cur"
-right_ptr CURSOR DISCARDABLE "cursor5e.cur"
-right_side CURSOR DISCARDABLE "cursor60.cur"
-right_tee CURSOR DISCARDABLE "cursor62.cur"
-rightbutton CURSOR DISCARDABLE "cursor64.cur"
-rtl_logo CURSOR DISCARDABLE "cursor66.cur"
-sailboat CURSOR DISCARDABLE "cursor68.cur"
-sb_down_arrow CURSOR DISCARDABLE "cursor6a.cur"
-sb_h_double_arrow CURSOR DISCARDABLE "cursor6c.cur"
-sb_left_arrow CURSOR DISCARDABLE "cursor6e.cur"
-sb_right_arrow CURSOR DISCARDABLE "cursor70.cur"
-sb_up_arrow CURSOR DISCARDABLE "cursor72.cur"
-sb_v_double_arrow CURSOR DISCARDABLE "cursor74.cur"
-shuttle CURSOR DISCARDABLE "cursor76.cur"
-sizing CURSOR DISCARDABLE "cursor78.cur"
-spider CURSOR DISCARDABLE "cursor7a.cur"
-spraycan CURSOR DISCARDABLE "cursor7c.cur"
-star CURSOR DISCARDABLE "cursor7e.cur"
-target CURSOR DISCARDABLE "cursor80.cur"
-tcross CURSOR DISCARDABLE "cursor82.cur"
-top_left_arrow CURSOR DISCARDABLE "cursor84.cur"
-top_left_corner CURSOR DISCARDABLE "cursor86.cur"
-top_right_corner CURSOR DISCARDABLE "cursor88.cur"
-top_side CURSOR DISCARDABLE "cursor8a.cur"
-top_tee CURSOR DISCARDABLE "cursor8c.cur"
-trek CURSOR DISCARDABLE "cursor8e.cur"
-ul_angle CURSOR DISCARDABLE "cursor90.cur"
-umbrella CURSOR DISCARDABLE "cursor92.cur"
-ur_angle CURSOR DISCARDABLE "cursor94.cur"
-xterm CURSOR DISCARDABLE "cursor98.cur"
-watch CURSOR DISCARDABLE "cursor96.cur"
Modified: branches/2.32/src/win32rc/unison.res
===================================================================
(Binary files differ)
Modified: branches/2.32/src/win32rc/unison.res.lib
===================================================================
(Binary files differ)
More information about the Unison-hackers
mailing list