Skip to content

Commit 0dcb507

Browse files
authored
Merge pull request #1561 from session-foundation/feat/installer_improvements_and_min_system_version
Improved windows installer and OS min version enforcement
2 parents 786bd3f + 93fc113 commit 0dcb507

File tree

4 files changed

+36
-2
lines changed

4 files changed

+36
-2
lines changed

build/installer-sidebar.bmp

151 KB
Binary file not shown.

build/installer.nsh

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
!macro preInit
2+
; This macro is inserted at the beginning of the NSIS .OnInit callback
3+
; Check Windows version and enforce minimum Windows 10 requirement
4+
${If} ${AtLeastWin10}
5+
; Windows 10 or later - continue with installation
6+
Goto continue_install
7+
${Else}
8+
MessageBox MB_OK|MB_ICONSTOP "This application requires Windows 10 or later.$\r$\n$\r$\nYour Windows version is not supported.$\r$\n$\r$\nPlease upgrade to Windows 10 or later to continue."
9+
Abort "Windows version requirement not met"
10+
${EndIf}
11+
12+
continue_install:
13+
; Continue with normal installation process
14+
!macroend
15+
16+
!ifndef BUILD_UNINSTALLER
17+
Function AddToStartup
18+
CreateShortCut "$SMSTARTUP\Session.lnk" "$INSTDIR\Session.exe" ""
19+
FunctionEnd
20+
21+
; Using the readme setting as an easy way to add an add to startup option
22+
!define MUI_FINISHPAGE_SHOWREADME
23+
!define MUI_FINISHPAGE_SHOWREADME_TEXT "Start Session when Windows starts"
24+
!define MUI_FINISHPAGE_SHOWREADME_FUNCTION AddToStartup
25+
!endif
26+
27+
!macro customUnInstall
28+
; Custom uninstall macro
29+
; This runs during the uninstallation process
30+
Delete "$SMSTARTUP\Session.lnk"
31+
!macroend

build/release-notes.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Session uses the Session encryption protocol and the Oxen blockchain’s decentr
1616

1717
<h1 id="supported-platforms">Supported Platforms</h1>
1818

19-
<!-- NOTE Make sure to verify the supported platforms have not changed before making a release -->
19+
<!-- NOTE Make sure to verify the supported platforms have not changed before making a release. Mac minimumSystemVersion in package.json and the Windows version in build/installer.nsh may need to be updated too -->
2020

2121
Session requires Windows 10 or later, macOS Ventura (13) or later, or a Linux distribution with glibc 2.35 or later like Debian 12 or Ubuntu 22.04.
2222

package.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,6 +214,7 @@
214214
"gatekeeperAssess": false,
215215
"entitlements": "build/entitlements.mac.plist",
216216
"entitlementsInherit": "build/entitlements.mac.plist",
217+
"minimumSystemVersion": "13.0.0",
217218
"extendInfo": {
218219
"NSCameraUsageDescription": "Session requires camera access to record video.",
219220
"NSMicrophoneUsageDescription": "Session requires microphone access to record audio."
@@ -240,7 +241,9 @@
240241
"nsis": {
241242
"deleteAppDataOnUninstall": true,
242243
"oneClick": false,
243-
"allowToChangeInstallationDirectory": true
244+
"allowToChangeInstallationDirectory": true,
245+
"include": "build/installer.nsh",
246+
"installerSidebar": "build/installer-sidebar.bmp"
244247
},
245248
"linux": {
246249
"category": "Network;InstantMessaging;Chat",

0 commit comments

Comments
 (0)