TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-29 08:15:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

makepackage: skip message boxes if running NSIS installer in silent mode

Browse Source 
Fixes #1088
This commit is contained in:
rdb 2021-02-24 16:14:59 +01:00
parent d4830f40f0
commit 3955c71435
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
makepanda/installer.nsi
View File

@ -470,6 +470,7 @@ Section "Python ${INCLUDE_PYVER}" SecPython
IfFileExists "$0\python.exe" AskRegPath RegPath IfFileExists "$0\python.exe" AskRegPath RegPath
AskRegPath: AskRegPath:
IfSilent SkipRegPath
MessageBox MB_YESNO|MB_ICONQUESTION \ MessageBox MB_YESNO|MB_ICONQUESTION \
"You already have a copy of Python ${INCLUDE_PYVER} installed in:$\r$\n$0$\r$\n$\r$\nPanda3D installs its own copy of Python ${INCLUDE_PYVER}, which will install alongside your existing copy. Would you like to make Panda's copy the default Python for your user account?" \ "You already have a copy of Python ${INCLUDE_PYVER} installed in:$\r$\n$0$\r$\n$\r$\nPanda3D installs its own copy of Python ${INCLUDE_PYVER}, which will install alongside your existing copy. Would you like to make Panda's copy the default Python for your user account?" \
IDNO SkipRegPath IDNO SkipRegPath
@ -619,6 +620,7 @@ Function ConfirmPythonSelection
; No compatible Python version found (that wasn't shipped as part ; No compatible Python version found (that wasn't shipped as part
; of a different Panda3D build.) Ask the user if he's sure about this. ; of a different Panda3D build.) Ask the user if he's sure about this.
AskConfirmation: AskConfirmation:
IfSilent SkipCheck
MessageBox MB_YESNO|MB_ICONQUESTION \ MessageBox MB_YESNO|MB_ICONQUESTION \
"You do not appear to have a ${REGVIEW}-bit version of Python ${INCLUDE_PYVER} installed. Are you sure you don't want Panda to install a compatible copy of Python?$\r$\n$\r$\nIf you choose Yes, you will not be able to do Python development with Panda3D until you install a ${REGVIEW}-bit version of Python and install the bindings for this version." \ "You do not appear to have a ${REGVIEW}-bit version of Python ${INCLUDE_PYVER} installed. Are you sure you don't want Panda to install a compatible copy of Python?$\r$\n$\r$\nIf you choose Yes, you will not be able to do Python development with Panda3D until you install a ${REGVIEW}-bit version of Python and install the bindings for this version." \
IDYES SkipCheck IDYES SkipCheck