feat: opens sole folder instead of upper folder after extraction; cancel folder priority over file in comparison; other minor ui fix

This commit is contained in:
shunf4
2024-05-11 15:59:23 +08:00
parent 7c6d4e7757
commit 6b5da20fb6
10 changed files with 151 additions and 25 deletions
+50 -11
View File
@@ -2,6 +2,11 @@
set OPTS=Z7_SFX=1 PLATFORM=x64
set LFLAGS=/DEBUG /SUBSYSTEM:WINDOWS,"5.02"
taskkill /f /im 7zFM.exe
taskkill /f /im 7zG.exe
set HAS_ERROR=FALSE
@echo ^_^_^_^_^_ ^_ ^_ ^_^_ ^_^_
@echo ^| ^_^_^_(^_) ^| ^_^_^_^| \^/ ^| ^_^_ ^_ ^_ ^_^_ ^_^_ ^_ ^_^_ ^_ ^_^_^_ ^_ ^_^_
@echo ^| ^|^_ ^| ^| ^|^/ ^_ \ ^|\^/^| ^|^/ ^_^` ^| '^_ \ ^/ ^_^` ^|^/ ^_^` ^|^/ ^_ \ '^_^_^|
@@ -14,7 +19,10 @@ set O=%~dp0out\FileManager
mkdir %O%
pushd %~dp0CPP\7zip\UI\FileManager
nmake %OPTS%
IF %errorlevel% NEQ 0 echo "Error x64 @ 7zFM.exe" >> errorfile.txt
IF %errorlevel% NEQ 0 (
echo "Error x64 @ 7zFM.exe" >> errorfile.txt
set HAS_ERROR=TRUE
)
popd
@echo ^_^_^_^_^_ ^_^_^_^_ ^_ ^_ ^_^_^_
@@ -27,7 +35,10 @@ set O=%~dp0out\GUI
mkdir %O%
pushd %~dp0CPP\7zip\UI\GUI
nmake %OPTS%
IF %errorlevel% NEQ 0 echo "Error x64 @ 7zG.exe" >> errorfile.txt
IF %errorlevel% NEQ 0 (
echo "Error x64 @ 7zG.exe" >> errorfile\.txt
set HAS_ERROR=TRUE
)
popd
@echo ^_^_^_^_^_ ^_^_^_^_^_ ^_
@@ -41,7 +52,10 @@ set O=%~dp0out\Explorer
mkdir %O%
pushd %~dp0CPP\7zip\UI\Explorer
nmake %OPTS%
IF %errorlevel% NEQ 0 echo "Error x64 @ 7-zip.dll" >> errorfile.txt
IF %errorlevel% NEQ 0 (
echo "Error x64 @ 7-zip.dll" >> errorfile\.txt
set HAS_ERROR=TRUE
)
popd
@echo ^_^_^_^_ ^_^_ ^_^_ ^_^_^_
@@ -55,7 +69,10 @@ set O=%~dp0out\SFXWin
mkdir %O%
pushd %~dp0CPP\7zip\Bundles\SFXWin
nmake %OPTS%
IF %errorlevel% NEQ 0 echo "Error x64 @ 7z.sfx" >> errorfile.txt
IF %errorlevel% NEQ 0 (
echo "Error x64 @ 7z.sfx" >> errorfile\.txt
set HAS_ERROR=TRUE
)
popd
@echo ^_^_^_^_^_ ^_ ^_^_^_ ^_ ^_ ^_
@@ -69,7 +86,10 @@ set O=%~dp0out\7zipInstall
mkdir %O%
pushd %~dp0C\Util\7zipInstall
nmake %OPTS%
IF %errorlevel% NEQ 0 echo "Error x64 @ Install-x64.exe" >> errorfile.txt
IF %errorlevel% NEQ 0 (
echo "Error x64 @ Install-x64.exe" >> errorfile\.txt
set HAS_ERROR=TRUE
)
popd
@echo ^_^_^_^_^_ ^_ ^_ ^_ ^_^_^_ ^_ ^_ ^_
@@ -83,7 +103,10 @@ set O=%~dp0out\7zipUninstall
mkdir %O%
pushd %~dp0C\Util\7zipUninstall
nmake %OPTS%
IF %errorlevel% NEQ 0 echo "Error x64 @ Uninstall.exe" >> errorfile.txt
IF %errorlevel% NEQ 0 (
echo "Error x64 @ Uninstall.exe" >> errorfile\.txt
set HAS_ERROR=TRUE
)
popd
set LFLAGS=/SUBSYSTEM:CONSOLE,"5.02"
@@ -98,7 +121,10 @@ set O=%~dp0out\Console
mkdir %O%
pushd %~dp0CPP\7zip\UI\Console
nmake %OPTS%
IF %errorlevel% NEQ 0 echo "Error x64 @ 7z.exe" >> errorfile.txt
IF %errorlevel% NEQ 0 (
echo "Error x64 @ 7z.exe" >> errorfile\.txt
set HAS_ERROR=TRUE
)
popd
@echo ^_^_ ^_
@@ -111,7 +137,10 @@ set O=%~dp0out\SFXCon
mkdir %O%
pushd %~dp0CPP\7zip\Bundles\SFXCon
nmake %OPTS%
IF %errorlevel% NEQ 0 echo "Error x64 @ 7zCon.sfx" >> errorfile.txt
IF %errorlevel% NEQ 0 (
echo "Error x64 @ 7zCon.sfx" >> errorfile\.txt
set HAS_ERROR=TRUE
)
popd
@echo ^_^_ ^_ ^_^_^_^_^_
@@ -124,11 +153,21 @@ set O=%~dp0out\Format7zF
mkdir %O%
pushd %~dp0CPP\7zip\Bundles\Format7zF
nmake %OPTS%
IF %errorlevel% NEQ 0 echo "Error x64 @ 7z.dll" >> errorfile.txt
IF %errorlevel% NEQ 0 (
echo "Error x64 @ 7z.dll" >> errorfile\.txt
set HAS_ERROR=TRUE
)
popd
powershell -Command Copy-Item .\out\*\*.exe,.\out\*\*.dll,.\out\*\*.pdb,.\out\*\*.sfx -Destination .\out\ -Verbose -Force
rem explorer.exe %~dp0out
rem clear errorlevel
type nul
if %HAS_ERROR% == TRUE (
echo HAS ERROR
echo HAS ERROR
echo HAS ERROR
echo HAS ERROR
exit /b 1
)
exit /b 0