[Unison-hackers] [unison-svn] r497 - in trunk/src: . lwt ubase

[bcpierce at seas.upenn.edu]

Author: bcpierce
Date: 2012-05-23 14:55:29 -0400 (Wed, 23 May 2012)
New Revision: 497

Modified:
   trunk/src/RECENTNEWS
   trunk/src/abort.ml
   trunk/src/lwt/depend
   trunk/src/ubase/depend
   trunk/src/uitext.ml
Log:
* Small fix to the way fsmonitor.py gets invoked when using the file
  watching functionality, suggested by Josh Berdine.  Unison will now
  look for fsmonitor.py in the same directory where the Unison
  executable itself lives.

Modified: trunk/src/RECENTNEWS
===================================================================
--- trunk/src/RECENTNEWS	2012-05-21 10:06:36 UTC (rev 496)
+++ trunk/src/RECENTNEWS	2012-05-23 18:55:29 UTC (rev 497)
@@ -1,19 +1,20 @@
-CHANGES FROM VERSION 2.45.8
+CHANGES FROM VERSION 2.45.7
 
-* Fix bug in last commit
-
+* Small fix to the way fsmonitor.py gets invoked when using the file
+  watching functionality, suggested by Josh Berdine.  Unison will now
+  look for fsmonitor.py in the same directory where the Unison
+  executable itself lives.
 -------------------------------
 CHANGES FROM VERSION 2.45.7
 
-* Added some debugging code in transfer.ml
+* Small fix to the way fsmonitor.py gets invoked when using the file
+  watching functionality, suggested by Josh Berdine.  Unison will now
+  look for fsmonitor.py in the same directory where the Unison
+  executable itself lives.
 
--------------------------------
-CHANGES FROM VERSION 2.45.6
+* Fix bug in last commit
 
-* Display full stack backtraces when printing exceptions, per comment
-  from Jerome
--------------------------------
-CHANGES FROM VERSION 2.45.1
+* Added some debugging code in transfer.ml
 
 * Display full stack backtraces when printing exceptions, per comment
   from Jerome

Modified: trunk/src/abort.ml
===================================================================
--- trunk/src/abort.ml	2012-05-21 10:06:36 UTC (rev 496)
+++ trunk/src/abort.ml	2012-05-23 18:55:29 UTC (rev 497)
@@ -67,4 +67,4 @@
     raise (Util.Transient "Aborted")
   end
 
-let testException e = e = Util.Transient "Aborted"
+let testException e = (e = Util.Transient "Aborted")

Modified: trunk/src/lwt/depend
===================================================================
--- trunk/src/lwt/depend	2012-05-21 10:06:36 UTC (rev 496)
+++ trunk/src/lwt/depend	2012-05-23 18:55:29 UTC (rev 497)
@@ -1,12 +1,12 @@
-lwt.cmo: lwt.cmi
-lwt.cmx: lwt.cmi
-lwt_unix.cmo: lwt_unix.cmi
-lwt_unix.cmx: lwt_unix.cmi
-lwt_util.cmo: lwt.cmi lwt_util.cmi
-lwt_util.cmx: lwt.cmx lwt_util.cmi
-pqueue.cmo: pqueue.cmi
-pqueue.cmx: pqueue.cmi
-lwt.cmi:
-lwt_unix.cmi: lwt.cmi
-lwt_util.cmi: lwt.cmi
-pqueue.cmi:
+lwt.cmo: lwt.cmi 
+lwt.cmx: lwt.cmi 
+lwt_unix.cmo: lwt_unix.cmi 
+lwt_unix.cmx: lwt_unix.cmi 
+lwt_util.cmo: lwt.cmi lwt_util.cmi 
+lwt_util.cmx: lwt.cmx lwt_util.cmi 
+pqueue.cmo: pqueue.cmi 
+pqueue.cmx: pqueue.cmi 
+lwt.cmi: 
+lwt_unix.cmi: lwt.cmi 
+lwt_util.cmi: lwt.cmi 
+pqueue.cmi: 

Modified: trunk/src/ubase/depend
===================================================================
--- trunk/src/ubase/depend	2012-05-21 10:06:36 UTC (rev 496)
+++ trunk/src/ubase/depend	2012-05-23 18:55:29 UTC (rev 497)
@@ -1,27 +1,27 @@
-myMap.cmo: myMap.cmi
-myMap.cmx: myMap.cmi
-prefs.cmo: util.cmi uarg.cmi safelist.cmi prefs.cmi
-prefs.cmx: util.cmx uarg.cmx safelist.cmx prefs.cmi
-proplist.cmo: util.cmi proplist.cmi
-proplist.cmx: util.cmx proplist.cmi
-rx.cmo: rx.cmi
-rx.cmx: rx.cmi
-safelist.cmo: safelist.cmi
-safelist.cmx: safelist.cmi
-trace.cmo: util.cmi safelist.cmi prefs.cmi trace.cmi
-trace.cmx: util.cmx safelist.cmx prefs.cmx trace.cmi
-uarg.cmo: util.cmi safelist.cmi uarg.cmi
-uarg.cmx: util.cmx safelist.cmx uarg.cmi
-uprintf.cmo: uprintf.cmi
-uprintf.cmx: uprintf.cmi
-util.cmo: uprintf.cmi safelist.cmi util.cmi
-util.cmx: uprintf.cmx safelist.cmx util.cmi
-myMap.cmi:
-prefs.cmi: util.cmi
-proplist.cmi:
-rx.cmi:
-safelist.cmi:
-trace.cmi: prefs.cmi
-uarg.cmi:
-uprintf.cmi:
-util.cmi:
+myMap.cmo: myMap.cmi 
+myMap.cmx: myMap.cmi 
+prefs.cmo: util.cmi uarg.cmi safelist.cmi prefs.cmi 
+prefs.cmx: util.cmx uarg.cmx safelist.cmx prefs.cmi 
+proplist.cmo: util.cmi proplist.cmi 
+proplist.cmx: util.cmx proplist.cmi 
+rx.cmo: rx.cmi 
+rx.cmx: rx.cmi 
+safelist.cmo: safelist.cmi 
+safelist.cmx: safelist.cmi 
+trace.cmo: util.cmi safelist.cmi prefs.cmi trace.cmi 
+trace.cmx: util.cmx safelist.cmx prefs.cmx trace.cmi 
+uarg.cmo: util.cmi safelist.cmi uarg.cmi 
+uarg.cmx: util.cmx safelist.cmx uarg.cmi 
+uprintf.cmo: uprintf.cmi 
+uprintf.cmx: uprintf.cmi 
+util.cmo: uprintf.cmi safelist.cmi util.cmi 
+util.cmx: uprintf.cmx safelist.cmx util.cmi 
+myMap.cmi: 
+prefs.cmi: util.cmi 
+proplist.cmi: 
+rx.cmi: 
+safelist.cmi: 
+trace.cmi: prefs.cmi 
+uarg.cmi: 
+uprintf.cmi: 
+util.cmi: 

Modified: trunk/src/uitext.ml
===================================================================
--- trunk/src/uitext.ml	2012-05-21 10:06:36 UTC (rev 496)
+++ trunk/src/uitext.ml	2012-05-23 18:55:29 UTC (rev 497)
@@ -726,7 +726,12 @@
   let follow = Safelist.map
                  (fun s -> "--follow '" ^ Uutil.quotes s ^ "'")
                  followpaths in
-  let cmd = Printf.sprintf "fsmonitor.py %s --outfile %s --statefile %s %s %s\n"
+(* BCP (per Josh Berdine, 5/2012): changed startup command from this...
+     let cmd = Printf.sprintf "fsmonitor.py %s --outfile %s --statefile %s %s %s\n"
+   ... to this: *)
+  let fsmonfile = Filename.concat (Filename.dirname Sys.executable_name) "fsmonitor.py" in
+  let cmd = Printf.sprintf "python \"%s\" \"%s\" --outfile \"%s\" --statefile \"%s\" %s %s\n"
+              fsmonfile
               root
               (System.fspathToPrintString changefile)
               (System.fspathToPrintString statefile)