[Unison-hackers] [unison-svn] r472 - in branches/2.40/src: . lwt

[bcpierce at seas.upenn.edu]

Author: bcpierce
Date: 2011-04-16 16:35:38 -0400 (Sat, 16 Apr 2011)
New Revision: 472

Modified:
   branches/2.40/src/Makefile
   branches/2.40/src/Makefile.OCaml
   branches/2.40/src/NEWS
   branches/2.40/src/RECENTNEWS
   branches/2.40/src/lwt/depend
   branches/2.40/src/mkProjectInfo.ml
   branches/2.40/src/strings.ml
Log:
* Small patch from Stephane Glondu to make Unison compile with Ocaml 3.12.

* Makefile fixes suggested by Ron Isaacson


Modified: branches/2.40/src/Makefile
===================================================================
--- branches/2.40/src/Makefile	2010-10-27 18:23:28 UTC (rev 471)
+++ branches/2.40/src/Makefile	2011-04-16 20:35:38 UTC (rev 472)
@@ -60,8 +60,10 @@
 # NAME, VERSION, and MAJORVERSION, automatically generated
 -include Makefile.ProjectInfo
 
-Makefile.ProjectInfo: mkProjectInfo.ml $(wildcard ../.bzr/branch/last-revision)
+Makefile.ProjectInfo: mkProjectInfo $(wildcard ../.bzr/branch/last-revision)
 	./mkProjectInfo > $@
+# BCP (4/11): simplified from this:
+#	ocaml str.cma unix.cma ./mkProjectInfo.ml > $@
 
 mkProjectInfo: mkProjectInfo.ml
 	ocamlc -o $@ unix.cma str.cma $^
@@ -210,7 +212,7 @@
 
 # For developers 
 runtest:
-	$(MAKE) all NATIVE=false DEBUG=true
+	$(MAKE) NATIVE=false DEBUG=true text
 	./unison test
 
 repeattest:

Modified: branches/2.40/src/Makefile.OCaml
===================================================================
--- branches/2.40/src/Makefile.OCaml	2010-10-27 18:23:28 UTC (rev 471)
+++ branches/2.40/src/Makefile.OCaml	2011-04-16 20:35:38 UTC (rev 472)
@@ -52,13 +52,14 @@
 # Unfortunately there is a literal control-M buried in this, I'd rather
 # get rid of it...
 # OCAMLLIBDIR=$(shell ocamlc -v | tail -1 | sed -e 's/.* //g' | sed -e 's/\\/\//g' | sed -e 's///g')
+# BCP (6/05) an alternative, but not quite working, version
+# suggested by Nick Montfort:
+# OCAMLLIBDIR=$(shell ocamlc -v | sed -n '$p' | sed -e 's/^Standard library directory: //' | sed -e 's/\\/\//g' | sed -e 's/\r//g')
 # Better(?) version, June 2005:
-OCAMLLIBDIR=$(shell ocamlc -v | tail -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')
+# Another try, Feb 2011, suggested by Ron Isaacson
+OCAMLLIBDIR=$(shell ocamlc -v | tail -1 | sed -e 's/.* //g' | tr '\\' '/' | tr -d '\r')
 
-## BCP (6/05) an alternative, but not quite working, version
-## suggested by Nick Montfort:
-# OCAMLLIBDIR=$(shell ocamlc -v | sed -n '$p' | sed -e 's/^Standard library directory: //' | sed -e 's/\\/\//g' | sed -e 's/\r//g')
-
 # User interface style:
 #   Legal values are
 #     UISTYLE=text

Modified: branches/2.40/src/NEWS
===================================================================
--- branches/2.40/src/NEWS	2010-10-27 18:23:28 UTC (rev 471)
+++ branches/2.40/src/NEWS	2011-04-16 20:35:38 UTC (rev 472)
@@ -1,5 +1,5 @@
 
-Changes in Version 2.40.16
+Changes in Version 2.40.61
 
    Changes since 2.40.1:
      * Added "BelowPath" patterns, that match a path as well as all paths

Modified: branches/2.40/src/RECENTNEWS
===================================================================
--- branches/2.40/src/RECENTNEWS	2010-10-27 18:23:28 UTC (rev 471)
+++ branches/2.40/src/RECENTNEWS	2011-04-16 20:35:38 UTC (rev 472)
@@ -1,3 +1,10 @@
+CHANGES FROM VERSION 2.40.61
+
+* Small patch from Stephane Glondu to make Unison compile with Ocaml 3.12.
+
+* Makefile fixes suggested by Ron Isaacson
+
+-------------------------------
 CHANGES FROM VERSION 2.40.16
 
 * Fixed incompatibility with OpenSSH 5.6.

Modified: branches/2.40/src/lwt/depend
===================================================================
--- branches/2.40/src/lwt/depend	2010-10-27 18:23:28 UTC (rev 471)
+++ branches/2.40/src/lwt/depend	2011-04-16 20:35:38 UTC (rev 472)
@@ -6,5 +6,7 @@
 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: branches/2.40/src/mkProjectInfo.ml
===================================================================
--- branches/2.40/src/mkProjectInfo.ml	2010-10-27 18:23:28 UTC (rev 471)
+++ branches/2.40/src/mkProjectInfo.ml	2011-04-16 20:35:38 UTC (rev 472)
@@ -96,3 +96,4 @@
 Printf.printf "MAJORVERSION=%d.%d\n" majorVersion minorVersion;;
 Printf.printf "VERSION=%d.%d.%d\n" majorVersion minorVersion pointVersion;;
 Printf.printf "NAME=%s\n" projectName;;
+

Modified: branches/2.40/src/strings.ml
===================================================================
--- branches/2.40/src/strings.ml	2010-10-27 18:23:28 UTC (rev 471)
+++ branches/2.40/src/strings.ml	2011-04-16 20:35:38 UTC (rev 472)
@@ -4,7 +4,7 @@
 let docs =
     ("about", ("About Unison", 
      "Unison File Synchronizer\n\
-      Version 2.40.16\n\
+      Version 2.40.61\n\
       \n\
       "))
 ::
@@ -2718,8 +2718,8 @@
       \n\
       "))
 ::
-    ("news", ("Changes in Version 2.40.16", 
-     "Changes in Version 2.40.16\n\
+    ("news", ("Changes in Version 2.40.61", 
+     "Changes in Version 2.40.61\n\
       \n\
       \032  Changes since 2.40.1:\n\
       \032    * Added \"BelowPath\" patterns, that match a path as well as all paths\n\