Merge branch 'master' of gitlab.com:librewolf-community/browser/windows

This commit is contained in:
Bert van der Weerd 2022-05-06 09:18:00 +02:00
commit d82582a43a
No known key found for this signature in database
GPG key ID: 4CFABB96ADE0F5B1
2 changed files with 10 additions and 2 deletions

View file

@ -43,7 +43,13 @@ Section
SetErrorlevel 2
Abort
DetailPrint "${APPNAME} is still running. Closing it gracefully..."
DetailPrint "${APPNAME} is still running"
MessageBox MB_OKCANCEL "LibreWolf is still running and has to be closed for the setup to continue." IDOK continue IDCANCEL break
break:
SetErrorlevel 1
Abort
continue:
DetailPrint "Closing ${APPNAME} gracefully..."
nsProcess::_CloseProcess "${EXECUTABLE}"
Pop $R0
Sleep 2000

4
mk.py
View file

@ -8,6 +8,9 @@ from assets.tools import exec, patch
#
do_zip = False
def deps_win32():
exec('rustup target add i686-pc-windows-msvc')
@ -148,7 +151,6 @@ def artifacts():
exec('cp -v assets/librewolf.ico work/librewolf')
# Let's make the portable zip first.
do_zip = True
if do_zip:
os.chdir('work')
exec('rm -rf librewolf-{}'.format(version))