[Unison-hackers] [unison-svn] r534 - in branches: . 2.48/src

bcpierce at seas.upenn.edu bcpierce at seas.upenn.edu
Tue Oct 21 10:10:27 EDT 2014


Author: bcpierce
Date: 2014-10-21 10:10:26 -0400 (Tue, 21 Oct 2014)
New Revision: 534

Added:
   branches/2.48/
   branches/2.48/src/RECENTNEWS
   branches/2.48/src/mkProjectInfo.ml
Removed:
   branches/2.48/src/RECENTNEWS
   branches/2.48/src/mkProjectInfo.ml
Log:
New release branch

Deleted: branches/2.48/src/RECENTNEWS
===================================================================
--- trunk/src/RECENTNEWS	2014-10-21 14:08:49 UTC (rev 532)
+++ branches/2.48/src/RECENTNEWS	2014-10-21 14:10:26 UTC (rev 534)
@@ -1,10 +0,0 @@
-CHANGES FROM VERSION 2.48.0
-
-* Preparing for new beta release
-
--------------------------------
-CHANGES FROM VERSION 2.47.4
-
-* Preparing for new beta release
-
--------------------------------

Copied: branches/2.48/src/RECENTNEWS (from rev 533, trunk/src/RECENTNEWS)
===================================================================
--- branches/2.48/src/RECENTNEWS	                        (rev 0)
+++ branches/2.48/src/RECENTNEWS	2014-10-21 14:10:26 UTC (rev 534)
@@ -0,0 +1,15 @@
+CHANGES FROM VERSION 2.48.-1
+
+* Preparing for new beta release
+
+-------------------------------
+CHANGES FROM VERSION 2.48.0
+
+* Preparing for new beta release
+
+-------------------------------
+CHANGES FROM VERSION 2.47.4
+
+* Preparing for new beta release
+
+-------------------------------

Deleted: branches/2.48/src/mkProjectInfo.ml
===================================================================
--- trunk/src/mkProjectInfo.ml	2014-10-21 14:08:49 UTC (rev 532)
+++ branches/2.48/src/mkProjectInfo.ml	2014-10-21 14:10:26 UTC (rev 534)
@@ -1,99 +0,0 @@
-(* Program for printing project info into a Makefile.  Documentation below. *)
-
-(* FIX: When the time comes for the next alpha-release, remember to
-   increment the archive version number first. See update.ml. *)
-
-let projectName = "unison"
-let majorVersion = 2
-let minorVersion = 48
-let pointVersionOrigin = 531 (* Revision that corresponds to point version 0 *)
-
-(* Documentation:
-   This is a program to construct a version of the form Major.Minor.Point,
-   e.g., 2.10.4.
-   The Point release number is calculated from the Subversion revision number,
-   so it will be automatically incremented on svn commit.
-   The Major and Minor numbers are hard coded, as is the revision number
-   corresponding to the 0 point release.
-
-   If you want to increment the Major or Minor number, you will have to do a
-   little thinking to get the Point number back to 0.  Suppose the current svn
-   revision number is 27, and we have below
-
-        let majorVersion = 2
-        let minorVersion = 11
-        let pointVersionOrigin = 3
-
-   This means that the current Unison version is 2.11.24, since 27-3 = 24.
-   If we want to change the release to 3.0.0 we need to change things to
-
-        let majorVersion = 3
-        let minorVersion = 0
-        let pointVersionOrigin = 28
-
-   and then do a svn commit.
-
-   The first two lines are obvious.  The last line says that Subversion
-   revision 28 corresponds to a 0 point release.  Since we were at revision
-   27 and we're going to do a commit before making a release, we
-   will be at 28 after the commit and this will be Unison version 3.0.0.
-*)
-
-(* ---------------------------------------------------------------------- *)
-(* You shouldn't need to edit below. *)
-
-let revisionString = "$Rev$";;
-
-let pointVersion = 
-  Scanf.sscanf revisionString "$Rev: %d " (fun x -> x) - pointVersionOrigin;;
-
-Printf.printf "MAJORVERSION=%d.%d\n" majorVersion minorVersion;;
-Printf.printf "VERSION=%d.%d.%d\n" majorVersion minorVersion pointVersion;;
-Printf.printf "NAME=%s\n" projectName;;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-

Copied: branches/2.48/src/mkProjectInfo.ml (from rev 533, trunk/src/mkProjectInfo.ml)
===================================================================
--- branches/2.48/src/mkProjectInfo.ml	                        (rev 0)
+++ branches/2.48/src/mkProjectInfo.ml	2014-10-21 14:10:26 UTC (rev 534)
@@ -0,0 +1,100 @@
+(* Program for printing project info into a Makefile.  Documentation below. *)
+
+(* FIX: When the time comes for the next alpha-release, remember to
+   increment the archive version number first. See update.ml. *)
+
+let projectName = "unison"
+let majorVersion = 2
+let minorVersion = 48
+let pointVersionOrigin = 533 (* Revision that corresponds to point version 0 *)
+
+(* Documentation:
+   This is a program to construct a version of the form Major.Minor.Point,
+   e.g., 2.10.4.
+   The Point release number is calculated from the Subversion revision number,
+   so it will be automatically incremented on svn commit.
+   The Major and Minor numbers are hard coded, as is the revision number
+   corresponding to the 0 point release.
+
+   If you want to increment the Major or Minor number, you will have to do a
+   little thinking to get the Point number back to 0.  Suppose the current svn
+   revision number is 27, and we have below
+
+        let majorVersion = 2
+        let minorVersion = 11
+        let pointVersionOrigin = 3
+
+   This means that the current Unison version is 2.11.24, since 27-3 = 24.
+   If we want to change the release to 3.0.0 we need to change things to
+
+        let majorVersion = 3
+        let minorVersion = 0
+        let pointVersionOrigin = 28
+
+   and then do a svn commit.
+
+   The first two lines are obvious.  The last line says that Subversion
+   revision 28 corresponds to a 0 point release.  Since we were at revision
+   27 and we're going to do a commit before making a release, we
+   will be at 28 after the commit and this will be Unison version 3.0.0.
+*)
+
+(* ---------------------------------------------------------------------- *)
+(* You shouldn't need to edit below. *)
+
+let revisionString = "$Rev$";;
+
+let pointVersion = 
+  Scanf.sscanf revisionString "$Rev: %d " (fun x -> x) - pointVersionOrigin;;
+
+Printf.printf "MAJORVERSION=%d.%d\n" majorVersion minorVersion;;
+Printf.printf "VERSION=%d.%d.%d\n" majorVersion minorVersion pointVersion;;
+Printf.printf "NAME=%s\n" projectName;;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+



More information about the Unison-hackers mailing list