Skip to content

Commit

Permalink
Disable 7-zip shenanigans
Browse files Browse the repository at this point in the history
In v23 7-zip introduced a new filter for ARM64 binaries, incompatible with all previous versions and enabled by default.
Disable filters and set compression method to LZMA for maximum compatibility.
  • Loading branch information
alabuzhev committed Jul 19, 2023
1 parent 05896b0 commit c00c87b
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion appveyor-clang.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ after_build:
- appveyor SetVariable -Name NAME_PREFIX -Value "%NAME_PREFIX%"
#archive Far
#save artifacts only for release as we keep on reaching the appveyor limit
- if "%configuration%" == "Release" 7z a "%APPVEYOR_BUILD_FOLDER%\%NAME_PREFIX%.7z" -x!obj\
- if "%configuration%" == "Release" 7z a -m0=LZMA -mf=off -mx9 "%APPVEYOR_BUILD_FOLDER%\%NAME_PREFIX%.7z" -x!obj\
- cd ..\..

artifacts:
Expand Down
2 changes: 1 addition & 1 deletion appveyor-gcc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ after_build:
- appveyor SetVariable -Name NAME_PREFIX -Value "%NAME_PREFIX%"
#archive Far
#save artifacts only for release as we keep on reaching the appveyor limit
- if "%configuration%" == "Release" 7z a "%APPVEYOR_BUILD_FOLDER%\%NAME_PREFIX%.7z" -x!obj\
- if "%configuration%" == "Release" 7z a -m0=LZMA -mf=off -mx9 "%APPVEYOR_BUILD_FOLDER%\%NAME_PREFIX%.7z" -x!obj\
- cd ..\..

artifacts:
Expand Down
4 changes: 2 additions & 2 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -144,9 +144,9 @@ after_build:
- appveyor SetVariable -Name NAME_PREFIX -Value "%NAME_PREFIX%"
#save artifacts only for release as we keep on reaching the appveyor limit
#archive PDBs
- if "%configuration%" == "Release" 7z a -ir!*.pdb "%APPVEYOR_BUILD_FOLDER%\%NAME_PREFIX%.pdb.7z"
- if "%configuration%" == "Release" 7z a -m0=LZMA -mf=off -mx9 -ir!*.pdb "%APPVEYOR_BUILD_FOLDER%\%NAME_PREFIX%.pdb.7z"
#archive Far without PDBs
- if "%configuration%" == "Release" 7z a -xr!*.pdb "%APPVEYOR_BUILD_FOLDER%\%NAME_PREFIX%.7z"
- if "%configuration%" == "Release" 7z a -m0=LZMA -mf=off -mx9 -xr!*.pdb "%APPVEYOR_BUILD_FOLDER%\%NAME_PREFIX%.7z"
- cd ..\..
#create msi
- cd misc\msi-installer
Expand Down
12 changes: 6 additions & 6 deletions misc/nightly/old_plugins.sh
Original file line number Diff line number Diff line change
Expand Up @@ -83,19 +83,19 @@ cd ..

cd outfinalnew32/Plugins || exit 1
cd FTP || exit 1
7z a ../../../FarFtp.x86.7z
7z a -m0=LZMA -mf=off -mx9 ../../../FarFtp.x86.7z
cd ../MultiArc || exit 1
7z a ../../../MultiArc.x86.7z
7z a -m0=LZMA -mf=off -mx9 ../../../MultiArc.x86.7z
cd ../../../
cd outfinalnew64/Plugins || exit 1
cd FTP || exit 1
7z a ../../../FarFtp.x64.7z
7z a -m0=LZMA -mf=off -mx9 ../../../FarFtp.x64.7z
cd ../MultiArc || exit 1
7z a ../../../MultiArc.x64.7z
7z a -m0=LZMA -mf=off -mx9 ../../../MultiArc.x64.7z
cd ../../../
cd outfinalnewARM64/Plugins || exit 1
cd FTP || exit 1
7z a ../../../FarFtp.ARM64.7z
7z a -m0=LZMA -mf=off -mx9 ../../../FarFtp.ARM64.7z
cd ../MultiArc || exit 1
7z a ../../../MultiArc.ARM64.7z
7z a -m0=LZMA -mf=off -mx9 ../../../MultiArc.ARM64.7z
cd ../../../
4 changes: 2 additions & 2 deletions misc/nightly/publish.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ processFarBuild()
return 1
fi

7za a -m0=LZMA -r -x!${ARCNAME}.msi -x!*.pdb ${ARCNAME}.7z *
7za a -m0=LZMA -r -i!./*.pdb ${ARCNAME}.pdb.7z
7za a -m0=LZMA -mf=off -mx9 -r -x!${ARCNAME}.msi -x!*.pdb ${ARCNAME}.7z *
7za a -m0=LZMA -mf=off -mx9 -r -i!./*.pdb ${ARCNAME}.pdb.7z

cd $BASE || return 1
m4 -P -DFARBIT=$1 -DHOSTTYPE=Unix -D ARC=../outfinalnew$1/$ARCNAME -D FARVAR=new -D SCM_REVISION="$SCM_REVISION" -D LASTCHANGE="$LASTCHANGE" ../pagegen.m4 > $NIGHTLY_WEB_ROOT/FarW.$1.php
Expand Down

0 comments on commit c00c87b

Please sign in to comment.