Merge branch 'master' of gitlab.com:librewolf-community/browser/windows
This commit is contained in:
commit
d82582a43a
2 changed files with 10 additions and 2 deletions
|
|
@ -43,7 +43,13 @@ Section
|
||||||
SetErrorlevel 2
|
SetErrorlevel 2
|
||||||
Abort
|
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}"
|
nsProcess::_CloseProcess "${EXECUTABLE}"
|
||||||
Pop $R0
|
Pop $R0
|
||||||
Sleep 2000
|
Sleep 2000
|
||||||
|
|
|
||||||
4
mk.py
4
mk.py
|
|
@ -8,6 +8,9 @@ from assets.tools import exec, patch
|
||||||
#
|
#
|
||||||
|
|
||||||
|
|
||||||
|
do_zip = False
|
||||||
|
|
||||||
|
|
||||||
def deps_win32():
|
def deps_win32():
|
||||||
exec('rustup target add i686-pc-windows-msvc')
|
exec('rustup target add i686-pc-windows-msvc')
|
||||||
|
|
||||||
|
|
@ -148,7 +151,6 @@ def artifacts():
|
||||||
exec('cp -v assets/librewolf.ico work/librewolf')
|
exec('cp -v assets/librewolf.ico work/librewolf')
|
||||||
|
|
||||||
# Let's make the portable zip first.
|
# Let's make the portable zip first.
|
||||||
do_zip = True
|
|
||||||
if do_zip:
|
if do_zip:
|
||||||
os.chdir('work')
|
os.chdir('work')
|
||||||
exec('rm -rf librewolf-{}'.format(version))
|
exec('rm -rf librewolf-{}'.format(version))
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue