remove win62 wine config dir

This commit is contained in:
stanzabird 2023-02-07 21:07:32 +00:00
parent 93965f80c8
commit adfc097a38

View file

@ -13,16 +13,24 @@ zipname=librewolf-$(full_version).en-US.win64-portable.zip
wine=~/.mozbuild/wine/bin/wineconsole wine=~/.mozbuild/wine/bin/wineconsole
wine=wineconsole wine=wineconsole
artifacts : artifacts :
# this section makes the work/librewolf folder # this section makes the work/librewolf folder
( rm -rf work && mkdir work ) ( rm -rf work && mkdir work )
( cd work && unzip -q ../$(incoming_artifact) ) ( cd work && unzip -q ../$(incoming_artifact) )
mv work/firefox work/librewolf mv work/firefox work/librewolf
mv work/librewolf/firefox.exe work/librewolf/librewolf.exe mv work/librewolf/firefox.exe work/librewolf/librewolf.exe
cp assets/librewolf.ico work/librewolf cp assets/librewolf.ico work/librewolf
# this section makes the setup.exe # this section makes the setup.exe
mkdir work/x86-ansi mkdir work/x86-ansi
wget -q -O ./work/x86-ansi/nsProcess.dll "https://shorsh.de/upload/2y9p/nsProcess.dll" wget -q -O ./work/x86-ansi/nsProcess.dll "https://shorsh.de/upload/2y9p/nsProcess.dll"
wget -q -O ./work/vc_redist.x64.exe "https://aka.ms/vs/17/release/vc_redist.x64.exe" wget -q -O ./work/vc_redist.x64.exe "https://aka.ms/vs/17/release/vc_redist.x64.exe"
@ -33,19 +41,37 @@ artifacts :
rm -rf work/tmp.nsi work/librewolf.ico work/banner.bmp work/x86-ansi vc_redist.x64.exe rm -rf work/tmp.nsi work/librewolf.ico work/banner.bmp work/x86-ansi vc_redist.x64.exe
mv work/$(setupname) . mv work/$(setupname) .
# this section makes the portable.zip # this section makes the portable.zip
rm -rf work/librewolf-$(full_version) rm -rf work/librewolf-$(full_version)
mkdir -p work/librewolf-$(full_version)/Profiles/Default mkdir -p work/librewolf-$(full_version)/Profiles/Default
mkdir -p work/librewolf-$(full_version)/LibreWolf mkdir -p work/librewolf-$(full_version)/LibreWolf
cp -r work/librewolf/* work/librewolf-$(full_version)/LibreWolf cp -r work/librewolf/* work/librewolf-$(full_version)/LibreWolf
( cd work && git clone "https://github.com/ltGuillaume/LibreWolf-Portable" )
( cd work && git clone "https://github.com/ltGuillaume/LibreWolf-WinUpdater" ) # clone autohotkey stuff
( cd work && \
git clone "https://github.com/ltGuillaume/LibreWolf-Portable" && \
git clone "https://github.com/ltGuillaume/LibreWolf-WinUpdater" )
cp work/LibreWolf-Portable/LibreWolf-Portable.* work/LibreWolf-Portable/*.exe work/librewolf-$(full_version) cp work/LibreWolf-Portable/LibreWolf-Portable.* work/LibreWolf-Portable/*.exe work/librewolf-$(full_version)
cp work/LibreWolf-WinUpdater/LibreWolf-WinUpdater.ahk work/LibreWolf-WinUpdater/*.ico work/librewolf-$(full_version) 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" wget -q -O work/ahk.zip "https://www.autohotkey.com/download/ahk.zip"
( mkdir work/ahk && cd work/ahk && unzip -q ../ahk.zip ) ( mkdir work/ahk && cd work/ahk && unzip -q ../ahk.zip )
# now we can use wine32 to run autohotkey
# tip from: https://forums.linuxmint.com/viewtopic.php?t=74356
rm -rf /root/.wine
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 )
( 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 )
( 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 )
@ -56,8 +82,11 @@ artifacts :
[ -f work/librewolf-$(full_version)/LibreWolf-WinUpdater.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
( cd work/librewolf-$(full_version)/LibreWolf && \ ( cd work/librewolf-$(full_version)/LibreWolf && \
wget -q -O ./vc_redist.x64-extracted.zip "https://gitlab.com/librewolf-community/browser/windows/uploads/7106b776dc663d985bb88eabeb4c5d7d/vc_redist.x64-extracted.zip" && \ wget -q -O ./vc_redist.x64-extracted.zip "https://gitlab.com/librewolf-community/browser/windows/uploads/7106b776dc663d985bb88eabeb4c5d7d/vc_redist.x64-extracted.zip" && \
unzip vc_redist.x64-extracted.zip && \ unzip vc_redist.x64-extracted.zip && \
rm vc_redist.x64-extracted.zip ) rm vc_redist.x64-extracted.zip )
( rm -f $(zipname) && cd work && zip -qr9 ../$(zipname) librewolf-$(full_version) ) ( rm -f $(zipname) && cd work && zip -qr9 ../$(zipname) librewolf-$(full_version) )