From 91b0eaf892e7f25260d73a5a712267d93ebbbff0 Mon Sep 17 00:00:00 2001 From: Bert van der Weerd Date: Sat, 4 Feb 2023 12:59:25 +0100 Subject: [PATCH] just ignore wineconsole exit status for now --- linux/assets/artifacts.mk | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/linux/assets/artifacts.mk b/linux/assets/artifacts.mk index 88b0d29..a9f088b 100644 --- a/linux/assets/artifacts.mk +++ b/linux/assets/artifacts.mk @@ -10,6 +10,8 @@ incoming_artifact=firefox-$(full_version).en-US.win64.zip setupname=librewolf-$(full_version).en-US.win64-setup.exe zipname=librewolf-$(full_version).en-US.win64-portable.zip +wine=~/.mozbuild/wine/bin/wineconsole + artifacts : # this section makes the work/librewolf folder @@ -41,9 +43,9 @@ artifacts : cp work/LibreWolf-WinUpdater/LibreWolf-WinUpdater.ahk work/LibreWolf-WinUpdater/*.ico work/librewolf-$(full_version) wget -q -O work/ahk.zip "https://www.autohotkey.com/download/ahk.zip" ( mkdir work/ahk && cd work/ahk && unzip -q ../ahk.zip ) - ( cd work/librewolf-$(full_version) && wineconsole ../ahk/Compiler/Ahk2Exe.exe /in LibreWolf-Portable.ahk /icon LibreWolf-Portable.ico ) + -( cd work/librewolf-$(full_version) && $(wine) ../ahk/Compiler/Ahk2Exe.exe /in LibreWolf-Portable.ahk /icon LibreWolf-Portable.ico ) ( cd work/librewolf-$(full_version) && rm -f LibreWolf-Portable.ahk LibreWolf-Portable.ico dejsonlz4.exe jsonlz4.exe ) - ( cd work/librewolf-$(full_version) && wineconsole ../ahk/Compiler/Ahk2Exe.exe /in LibreWolf-WinUpdater.ahk /icon LibreWolf-WinUpdater.ico ) + -( cd work/librewolf-$(full_version) && $(wine) ../ahk/Compiler/Ahk2Exe.exe /in LibreWolf-WinUpdater.ahk /icon LibreWolf-WinUpdater.ico ) ( cd work/librewolf-$(full_version) && rm -f LibreWolf-WinUpdater.ahk LibreWolf-WinUpdater*.ico ) # issue #224 - Consider including msvcp140 & vcruntime140 in portable package ( cd work/librewolf-$(full_version)/LibreWolf && \