Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[1.2.5] bump to 1.2.5.1 #1728

Merged
merged 3 commits into from
Mar 14, 2024
Merged

[1.2.5] bump to 1.2.5.1 #1728

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6a7c5c4
[1.2.5] bump to v1.2.5.1
da-liii Mar 14, 2024
b33a862
hard code version
da-liii Mar 14, 2024
6548754
wi
da-liii Mar 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions packages/windows/research.nsis
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down
4 changes: 2 additions & 2 deletions packages/windows/resource.rc.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
24 changes: 19 additions & 5 deletions src/System/Misc/tm_sys_utils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion xmake.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading