[1.2.5] bump to 1.2.5.1

XmacsLabs · Mar 14, 2024 · 28f4a48 · 28f4a48
1 parent 8c8fc52
commit 28f4a48
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 10 deletions.
diff --git a/packages/windows/research.nsis b/packages/windows/research.nsis
@@ -105,8 +105,8 @@ ManifestDPIAware true
 !define RegUninstall "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PACKAGE_NAME}"
 
 ; set product information
-VIProductVersion "${VERSION}.0"
-VIFileVersion "${VERSION}.0"
+VIProductVersion "${VERSION}"
+VIFileVersion "${VERSION}"
 VIAddVersionKey /LANG=0 ProductName "${PACKAGE_NAME}"
 VIAddVersionKey /LANG=0 Comments "${PACKAGE_DESCRIPTION}"
 VIAddVersionKey /LANG=0 CompanyName "${PACKAGE_COMPANY}"

diff --git a/packages/windows/resource.rc.in b/packages/windows/resource.rc.in
@@ -8,8 +8,8 @@ appicon ICON "Xmacs.ico"
 
 // Version information; this, too, is used by WinSparkle
 1 VERSIONINFO
- FILEVERSION ${VERSION_MAJOR},${VERSION_MINOR},${VERSION_ALTER},0
- PRODUCTVERSION ${VERSION_MAJOR},${VERSION_MINOR},${VERSION_ALTER},0
+ FILEVERSION 1,2,5,0
+ PRODUCTVERSION 1,2,5,0
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
  FILEFLAGS 0 // indicate whether this file contains debugger information, and whether this is different from executable with same version.
  FILEOS VOS_NT_WINDOWS32

diff --git a/src/System/Misc/tm_sys_utils.cpp b/src/System/Misc/tm_sys_utils.cpp
@@ -145,24 +145,38 @@ init_texmacs_home_path () {
  }
 }
 
+string
+xmacs_lts_version () {
+ array<string> parts= tokenize (string (XMACS_VERSION), ".");
+ if (N (parts) >= 4) {
+ return parts[0] * "." * parts[1] * "." * parts[2];
+ }
+ else {
+ return XMACS_VERSION;
+ }
+}
+
 url
 get_tm_cache_path () {
 #if defined(OS_WIN) || defined(OS_MINGW)
- return url (string ("$LOCALAPPDATA/XmacsLabs/system/cache/") * XMACS_VERSION);
+ return url (string ("$LOCALAPPDATA/XmacsLabs/system/cache/") *
+ xmacs_lts_version ());
 #endif
 #if defined(OS_MACOS)
- return url (string ("$HOME/Library/Caches/XmacsLabs/") * XMACS_VERSION);
+ return url (string ("$HOME/Library/Caches/XmacsLabs/") *
+ xmacs_lts_version ());
 #endif
 #if defined(OS_LINUX)
- return url (string ("$XDG_CACHE_HOME/XmacsLabs/") * XMACS_VERSION);
+ return url (string ("$XDG_CACHE_HOME/XmacsLabs/") * xmacs_lts_version ());
 #endif
- return url (string ("$TEXMACS_HOME_PATH/system/cache/") * XMACS_VERSION);
+ return url (string ("$TEXMACS_HOME_PATH/system/cache/") *
+ xmacs_lts_version ());
 }
 
 url
 get_tm_preference_path () {
  return get_texmacs_home_path () *
- ("system/" * string (XMACS_VERSION) * "/preferences.scm");
+ ("system/" * xmacs_lts_version () * "/preferences.scm");
 }
 
 string

diff --git a/xmake.lua b/xmake.lua
@@ -32,7 +32,7 @@ if is_plat ("macosx", "windows") then
 end
 
 local TEXMACS_VERSION = "2.1.2"
-local XMACS_VERSION="1.2.5"
+local XMACS_VERSION="1.2.5.1"
 local CONFIG_USER = "XmacsLabs"
 local DEVEL_VERSION = TEXMACS_VERSION
 local DEVEL_RELEASE = 1