From 6ae49b13d133a9cf3d87d5e1ae475b156bc26b67 Mon Sep 17 00:00:00 2001 From: Greg Troxel Date: Thu, 15 Feb 2024 09:56:12 -0500 Subject: [PATCH 1/5] NEWS: Update for 2.53.4 --- NEWS.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/NEWS.md b/NEWS.md index 24e96e851..792d97352 100644 --- a/NEWS.md +++ b/NEWS.md @@ -14,11 +14,12 @@ unison uses git history for that, and thus there is no changelog file. ## Changes in 2.53.4 -Released 2023-xx-yy +Released 2024-02-17 * Improved and simplified makefiles. Please review your build scripts for changed build goals, input variables and build artifact names. See INSTALL.md for details. + * opam build uses the makefile build system. * Various fixes in Windows and Cygwin builds. * Preferences "force", "prefer" and related "partial" preferences now work slightly differently with values "newer" and "older". Previously, From ad52b564a38ac732c2292765b1048c8d4f42684c Mon Sep 17 00:00:00 2001 From: Greg Troxel Date: Thu, 15 Feb 2024 09:56:51 -0500 Subject: [PATCH 2/5] Makefile.ProjectInfo: 2.53.4 --- src/Makefile.ProjectInfo | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Makefile.ProjectInfo b/src/Makefile.ProjectInfo index 5542191bd..fe6250388 100644 --- a/src/Makefile.ProjectInfo +++ b/src/Makefile.ProjectInfo @@ -1,5 +1,5 @@ MAJORVERSION=2.53 -VERSION=2.53.3 +VERSION=2.53.4 NAME=unison From a2d0f81873b287630e6043d648bdc9560e29c9bd Mon Sep 17 00:00:00 2001 From: Greg Troxel Date: Thu, 15 Feb 2024 09:58:44 -0500 Subject: [PATCH 3/5] strings.ml: regen --- src/strings.ml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/strings.ml b/src/strings.ml index 5fd19bdad..ceab8ee2e 100644 --- a/src/strings.ml +++ b/src/strings.ml @@ -4,7 +4,7 @@ let docs = ("about", ("About Unison", "Unison File Synchronizer\n\ - Version 2.53.3\n\ + Version 2.53.4\n\ \n\ ")) :: @@ -2649,7 +2649,7 @@ let docs = \032 * Each pattern can have one of three forms. The most general form is\n\ \032 a POSIX Extended Regular Expression introduced by the keyword\n\ \032 Regex. (The collating symbol, equivalence class expression, and\n\ - \032 character class expresssion described in Section 9.3.5 of the POSIX\n\ + \032 character class expression described in Section 9.3.5 of the POSIX\n\ \032 specification\n\ \032 (https://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap0\n\ \032 9.html#tag_09_03_05) are not currently supported).\n\ From 0ebc4df2e934227d9f7bdbe8286dba763be3b7ef Mon Sep 17 00:00:00 2001 From: Greg Troxel Date: Thu, 15 Feb 2024 09:59:18 -0500 Subject: [PATCH 4/5] .gitignore: Add unison-gui --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index fdc9a9c1f..39f0b0e24 100644 --- a/.gitignore +++ b/.gitignore @@ -30,6 +30,7 @@ /src/u-b.o.startup.s /src/ubase/projectInfo.ml /src/unison +/src/unison-gui /src/unison-fsmonitor TAGS build From dacfc897ff401979a765bdefc4ff635494d39ded Mon Sep 17 00:00:00 2001 From: Greg Troxel Date: Thu, 15 Feb 2024 10:16:29 -0500 Subject: [PATCH 5/5] .depend: regen --- src/.depend | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/.depend b/src/.depend index 644d54872..33e8d4641 100644 --- a/src/.depend +++ b/src/.depend @@ -1051,7 +1051,6 @@ test.cmo : \ ubase/prefs.cmi \ path.cmi \ os.cmi \ - lwt/lwt_util.cmi \ lwt/lwt_unix.cmi \ lwt/lwt.cmi \ globals.cmi \ @@ -1074,13 +1073,11 @@ test.cmx : \ ubase/prefs.cmx \ path.cmx \ os.cmx \ - lwt/lwt_util.cmx \ lwt/lwt_unix.cmx \ lwt/lwt.cmx \ globals.cmx \ fspath.cmx \ fs.cmx \ - fingerprint.cmx \ common.cmx \ test.cmi test.cmi :