librewolf-bot/windows
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix merge conflict

Browse source
This commit is contained in:
Bert van der Weerd 2023-02-08 07:48:56 +01:00
commit f891157b95
No known key found for this signature in database
GPG key ID: 73370A0B9E5516B0
1 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
linux/assets/artifacts.mk
View file

@ -11,7 +11,8 @@ setupname=librewolf-$(full_version).en-US.win64-setup.exe
zipname=librewolf-$(full_version).en-US.win64-portable.zip zipname=librewolf-$(full_version).en-US.win64-portable.zip
#wine=~/.mozbuild/wine/bin/wineconsole #wine=~/.mozbuild/wine/bin/wineconsole
wine=wineconsole wine=wineconsole --backend=curses
@ -66,20 +67,18 @@ artifacts :
# now we can use wine32 to run autohotkey # now we can use wine32 to run autohotkey
# tip from: https://forums.linuxmint.com/viewtopic.php?t=74356 # tip from: https://forums.linuxmint.com/viewtopic.php?t=74356
rm -rf /root/.wine rm -rf /root/.wine
winecfg winecfg
( cd work/librewolf-$(full_version) && $(wine) ../ahk/Compiler/Ahk2Exe.exe /in LibreWolf-Portable.ahk ) -( cd work/librewolf-$(full_version) && $(wine) ../ahk/Compiler/Ahk2Exe.exe /in LibreWolf-Portable.ahk )
[ -f work/librewolf-$(full_version)/LibreWolf-Portable.exe ] # because we ignored previous exit code
( cd work/librewolf-$(full_version) && rm -f LibreWolf-Portable.ahk LibreWolf-Portable.ico dejsonlz4.exe jsonlz4.exe ) ( cd work/librewolf-$(full_version) && rm -f LibreWolf-Portable.ahk LibreWolf-Portable.ico dejsonlz4.exe jsonlz4.exe )
( cd work/librewolf-$(full_version) && $(wine) ../ahk/Compiler/Ahk2Exe.exe /in LibreWolf-WinUpdater.ahk ) -( cd work/librewolf-$(full_version) && $(wine) ../ahk/Compiler/Ahk2Exe.exe /in LibreWolf-WinUpdater.ahk )
[ -f work/librewolf-$(full_version)/LibreWolf-WinUpdater.exe ]
( cd work/librewolf-$(full_version) && rm -f LibreWolf-WinUpdater.ahk LibreWolf-WinUpdater*.ico ) ( cd work/librewolf-$(full_version) && rm -f LibreWolf-WinUpdater.ahk LibreWolf-WinUpdater*.ico )
# # We do need to check if these executables are indeed
# # created, because we ignore the wine-autohotkey exit codes
# [ -f work/librewolf-$(full_version)/LibreWolf-Portable.exe ]
# [ -f work/librewolf-$(full_version)/LibreWolf-WinUpdater.exe ]
# issue #224 - Consider including msvcp140 & vcruntime140 in portable package # issue #224 - Consider including msvcp140 & vcruntime140 in portable package