[1.2.9.1] xmacs_lts_version

XmacsLabs · Aug 25, 2024 · 72eff97 · 72eff97
1 parent ec224fa
commit 72eff97
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 10 deletions.
diff --git a/packages/windows/beamer.rc.in b/packages/windows/beamer.rc.in
@@ -8,8 +8,8 @@ appicon ICON "beamer.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,9,0
+ PRODUCTVERSION  1,2,9,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/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
@@ -9,7 +9,7 @@ appicon ICON "Xmacs.ico"
 // Version information; this, too, is used by WinSparkle
 1 VERSIONINFO
  FILEVERSION     1,2,9,1
- PRODUCTVERSION  1,2,9.1
+ PRODUCTVERSION  1,2,9,1
  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
@@ -170,27 +170,39 @@ 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") * "/" * app_dir () * "/system/cache/" *
-              XMACS_VERSION);
+              xmacs_lts_version ());
 #endif
 #if defined(OS_MACOS)
   return url (string ("$HOME/Library/Caches/") * app_dir () * "/" *
-              XMACS_VERSION);
+              xmacs_lts_version ());
 #endif
 #if defined(OS_LINUX)
   return url (string ("$XDG_CACHE_HOME") * "/" * app_dir () * "/" *
-              XMACS_VERSION);
+              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