public-offering
/
pad.pub0.org
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Windows build: Switch to 64-bit Node.js executable

pull/5545/head
Richard Hansen 2022-05-13 18:52:52 -04:00
parent 2d56838792
commit 7e4931cf25
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -4,6 +4,8 @@
* Windows build: * Windows build:
* The bundled `node.exe` was upgraded from v12 to v16. * The bundled `node.exe` was upgraded from v12 to v16.
* The bundled `node.exe` is now a 64-bit executable. If you need the 32-bit
version you must download and install Node.js yourself.
* Improvements to login session management: * Improvements to login session management:
* `express_sid` cookies and `sessionstorage:*` database records are no longer * `express_sid` cookies and `sessionstorage:*` database records are no longer
created unless `requireAuthentication` is `true` (or a plugin causes them to created unless `requireAuthentication` is `true` (or a plugin causes them to

2
src/bin/buildForWindows.sh
View File

@ -49,7 +49,7 @@ try rm -rf node_modules
try mv node_modules_resolved node_modules try mv node_modules_resolved node_modules
log "download windows node..." log "download windows node..."
try wget "https://nodejs.org/dist/latest-v16.x/win-x86/node.exe" -O node.exe try wget "https://nodejs.org/dist/latest-v16.x/win-x64/node.exe" -O node.exe
log "create the zip..." log "create the zip..."
try zip -9 -r "${OUTPUT}" ./* try zip -9 -r "${OUTPUT}" ./*

9
src/bin/nsis/etherpad.nsi
View File

@ -1,5 +1,6 @@
;Include Modern UI ;Include Modern UI
!include "MUI2.nsh" !include "MUI2.nsh"
!include x64.nsh
;-------------------------------- ;--------------------------------
;Styling ;Styling
@ -15,11 +16,17 @@ Page directory
Page instfiles Page instfiles
; The default installation directory ; The default installation directory
InstallDir "$PROGRAMFILES\Etherpad Foundation\Etherpad Server" InstallDir "$PROGRAMFILES64\Etherpad Foundation\Etherpad Server"
Section Section
SectionIn RO SectionIn RO
${If} ${RunningX64}
DetailPrint "Installer running on x64 host"
${Else}
Abort "Unsupported CPU architecture (only x64 is supported)"
${Endif}
; Set output path to the installation directory. ; Set output path to the installation directory.
SetOutPath $INSTDIR SetOutPath $INSTDIR