From 2ef40bf14b71e88420959852808b75492303385f Mon Sep 17 00:00:00 2001 From: N00MKRAD Date: Tue, 1 Jun 2021 20:24:13 +0200 Subject: [PATCH] new build packaging script --- Build/Build-Distributable-SlimOnly.bat | 44 ----------------- Build/Build-Distributable.bat | 51 ------------------- Build/PackageBuild.bat | 68 ++++++++++++++++++++++++++ Build/ReadMeFirst!!.txt | 17 ------- 4 files changed, 68 insertions(+), 112 deletions(-) delete mode 100644 Build/Build-Distributable-SlimOnly.bat delete mode 100644 Build/Build-Distributable.bat create mode 100644 Build/PackageBuild.bat delete mode 100644 Build/ReadMeFirst!!.txt diff --git a/Build/Build-Distributable-SlimOnly.bat b/Build/Build-Distributable-SlimOnly.bat deleted file mode 100644 index 9030e4f..0000000 --- a/Build/Build-Distributable-SlimOnly.bat +++ /dev/null @@ -1,44 +0,0 @@ -@echo off - -echo =============================== -echo == NMKD'S FLOWFRAMES BUILDER == -echo =============================== -echo. -echo This script makes a build ready for distribution by creating three 7z archives, without python, with pytorch for Turing, and with pytorch for Ampere. -echo. - -set "ver=16" -set /p ver="Enter the version number: " - -cd ..\Code\bin\x64\Release - -rmdir /s/q FlowframesApp%ver% -mkdir "FlowframesApp%ver%" -mkdir "FlowframesApp%ver%/FlowframesData" -mkdir "FlowframesApp%ver%/FlowframesData/pkgs" - -rem xcopy "../../../../pkgs" "FlowframesApp%ver%/FlowframesData\pkgs\" /E -xcopy "../../../../pkgs/av" "FlowframesApp%ver%/FlowframesData\pkgs\av" /E /I -xcopy "../../../../pkgs/dain-ncnn" "FlowframesApp%ver%/FlowframesData\pkgs\dain-ncnn" /E /I -xcopy "../../../../pkgs/licenses" "FlowframesApp%ver%/FlowframesData\pkgs\licenses" /E /I -xcopy "../../../../pkgs/rife-cuda" "FlowframesApp%ver%/FlowframesData\pkgs\rife-cuda" /E /I -xcopy "../../../../pkgs/rife-ncnn" "FlowframesApp%ver%/FlowframesData\pkgs\rife-ncnn" /E /I -xcopy "../../../../pkgs/flavr-cuda" "FlowframesApp%ver%/FlowframesData\pkgs\flavr-cuda" /E /I - -echo %ver% >> "FlowframesApp%ver%/FlowframesData/ver.ini" - -xcopy Flowframes.exe "FlowframesApp%ver%" - -cd ../../../../Build - -rmdir /s/q ..\Code\bin\x64\Release\FlowframesApp%ver%\FlowframesData\logs -del ..\Code\bin\x64\Release\FlowframesApp%ver%\FlowframesData\config.ini - - -7za.exe a FF-%ver%-Slim.7z -m0=flzma2 -mx5 "..\Code\bin\x64\Release\FlowframesApp%ver%" - - -rmdir /s/q ..\Code\bin\x64\Release\FlowframesApp%ver% - - -rem pause \ No newline at end of file diff --git a/Build/Build-Distributable.bat b/Build/Build-Distributable.bat deleted file mode 100644 index 86cc84f..0000000 --- a/Build/Build-Distributable.bat +++ /dev/null @@ -1,51 +0,0 @@ -@echo off - -echo =============================== -echo == NMKD'S FLOWFRAMES BUILDER == -echo =============================== -echo. -echo This script makes a build ready for distribution by creating three 7z archives, without python, with pytorch for Turing, and with pytorch for Ampere. -echo. - -set "ver=16" -set /p ver="Enter the version number: " - -cd ..\Code\bin\x64\Release - -rmdir /s/q FlowframesApp%ver% -mkdir "FlowframesApp%ver%" -mkdir "FlowframesApp%ver%/FlowframesData" -mkdir "FlowframesApp%ver%/FlowframesData/pkgs" - -rem xcopy "../../../../pkgs" "FlowframesApp%ver%/FlowframesData\pkgs\" /E -xcopy "../../../../pkgs/av" "FlowframesApp%ver%/FlowframesData\pkgs\av" /E /I -xcopy "../../../../pkgs/dain-ncnn" "FlowframesApp%ver%/FlowframesData\pkgs\dain-ncnn" /E /I -xcopy "../../../../pkgs/licenses" "FlowframesApp%ver%/FlowframesData\pkgs\licenses" /E /I -xcopy "../../../../pkgs/rife-cuda" "FlowframesApp%ver%/FlowframesData\pkgs\rife-cuda" /E /I -xcopy "../../../../pkgs/rife-ncnn" "FlowframesApp%ver%/FlowframesData\pkgs\rife-ncnn" /E /I -xcopy "../../../../pkgs/flavr-cuda" "FlowframesApp%ver%/FlowframesData\pkgs\flavr-cuda" /E /I - -echo %ver% >> "FlowframesApp%ver%/FlowframesData/ver.ini" - -xcopy Flowframes.exe "FlowframesApp%ver%" - -cd ../../../../Build - -rmdir /s/q ..\Code\bin\x64\Release\FlowframesApp%ver%\FlowframesData\logs -del ..\Code\bin\x64\Release\FlowframesApp%ver%\FlowframesData\config.ini - - -7za.exe a FF-%ver%-Slim.7z -m0=flzma2 -mx5 "..\Code\bin\x64\Release\FlowframesApp%ver%" - -xcopy "../pkgs/py-tu" "..\Code\bin\x64\Release\FlowframesApp%ver%\FlowframesData\pkgs\py-tu" /E /I -7za.exe a FF-%ver%-Full.7z -m0=flzma2 -mx7 "..\Code\bin\x64\Release\FlowframesApp%ver%" - -rmdir /s/q ..\Code\bin\x64\Release\FlowframesApp%ver%\FlowframesData\pkgs\py-tu -xcopy "../pkgs/py-amp" "..\Code\bin\x64\Release\FlowframesApp%ver%\FlowframesData\pkgs\py-amp" /E /I -7za.exe a FF-%ver%-Full-RTX3000.7z -m0=flzma2 -mx7 "..\Code\bin\x64\Release\FlowframesApp%ver%" - - -rmdir /s/q ..\Code\bin\x64\Release\FlowframesApp%ver% - - -rem pause \ No newline at end of file diff --git a/Build/PackageBuild.bat b/Build/PackageBuild.bat new file mode 100644 index 0000000..c657822 --- /dev/null +++ b/Build/PackageBuild.bat @@ -0,0 +1,68 @@ +@echo off + +echo ============================================ +echo ==== NMKD'S FLOWFRAMES PACKAGING SCRIPT ==== +echo ============================================ +echo. + +set /p ver="Enter the version number: " +set /p packSlim="Package Slim (no Pytorch) archive? (Y/N) " +set /p packFull="Package Full (Pytorch for Turing and older) archive? (Y/N) " +set /p packFull3000="Package Full-RTX3000 (Pytorch for Ampere and older) archive? (Y/N) " +set /p packWebBase="Package web installer (base.7z) file? (Y/N) " + +cd ..\Code\bin\x64\Release + +rmdir /s/q FlowframesApp%ver% +mkdir "FlowframesApp%ver%" +mkdir "FlowframesApp%ver%/FlowframesData" +mkdir "FlowframesApp%ver%/FlowframesData/pkgs" + +rem xcopy "../../../../pkgs" "FlowframesApp%ver%/FlowframesData\pkgs\" /E +xcopy "../../../../pkgs/av" "FlowframesApp%ver%/FlowframesData\pkgs\av" /E /I +xcopy "../../../../pkgs/dain-ncnn" "FlowframesApp%ver%/FlowframesData\pkgs\dain-ncnn" /E /I +xcopy "../../../../pkgs/licenses" "FlowframesApp%ver%/FlowframesData\pkgs\licenses" /E /I +xcopy "../../../../pkgs/rife-cuda" "FlowframesApp%ver%/FlowframesData\pkgs\rife-cuda" /E /I +xcopy "../../../../pkgs/rife-ncnn" "FlowframesApp%ver%/FlowframesData\pkgs\rife-ncnn" /E /I +xcopy "../../../../pkgs/flavr-cuda" "FlowframesApp%ver%/FlowframesData\pkgs\flavr-cuda" /E /I + +echo %ver% >> "FlowframesApp%ver%/FlowframesData/ver.ini" + +xcopy Flowframes.exe "FlowframesApp%ver%" + +cd ../../../../Build + +rmdir /s/q ..\Code\bin\x64\Release\FlowframesApp%ver%\FlowframesData\logs +del ..\Code\bin\x64\Release\FlowframesApp%ver%\FlowframesData\config.ini + + +IF /I "%packSlim%"=="Y" ( + rem PACK SLIM + 7za.exe a FF-%ver%-Slim.7z -m0=flzma2 -mx5 "..\Code\bin\x64\Release\FlowframesApp%ver%" +) + +echo 1 +IF /I "%packWebBase%"=="Y" ( + echo 2 + rem PACK WEB BASE + rem mkdir "WebInstaller/%ver%/base.7z" + 7za.exe a "WebInstaller/%ver%/base.7z" -m0=flzma2 -mx7 "..\Code\bin\x64\Release\FlowframesApp%ver%\*" +) + +IF /I "%packFull%"=="Y" ( + rem PACK FULL + xcopy "../pkgs/py-tu" "..\Code\bin\x64\Release\FlowframesApp%ver%\FlowframesData\pkgs\py-tu" /E /I + 7za.exe a FF-%ver%-Full.7z -m0=flzma2 -mx7 "..\Code\bin\x64\Release\FlowframesApp%ver%" + rmdir /s/q ..\Code\bin\x64\Release\FlowframesApp%ver%\FlowframesData\pkgs\py-tu +) + +IF /I "%packFull3000%"=="Y" ( + xcopy "../pkgs/py-amp" "..\Code\bin\x64\Release\FlowframesApp%ver%\FlowframesData\pkgs\py-amp" /E /I + 7za.exe a FF-%ver%-Full-RTX3000.7z -m0=flzma2 -mx7 "..\Code\bin\x64\Release\FlowframesApp%ver%" + rmdir /s/q ..\Code\bin\x64\Release\FlowframesApp%ver%\FlowframesData\pkgs\py-amp +) + +rmdir /s/q ..\Code\bin\x64\Release\FlowframesApp%ver% + + +rem pause \ No newline at end of file diff --git a/Build/ReadMeFirst!!.txt b/Build/ReadMeFirst!!.txt deleted file mode 100644 index 9ac1674..0000000 --- a/Build/ReadMeFirst!!.txt +++ /dev/null @@ -1,17 +0,0 @@ -1) Download... - - FF-Slim if you have an AMD/Intel graphics card, or if you have an Nvidia GPU and Pytorch already installed - - FF-Full if you have an Nvidia Turing (RTX 2000) or older card - - FF-Full-RTX3000 if you have an Nvidia Ampere (RTX 3000) card. Also compatible with older card, but has bigger filesize than Full. - -2) Extract the 7z file using 7zip or any other program that supports it - -3) Run Flowframes.exe - - - - -If you updated from an older version, you can optionally copy "FlowframesData/config.ini" to your new installation if you want to keep your settings. -You can delete your old installation after updating. - -IT IS NOT RECOMMENDED TO OVERWRITE YOUR OLD INSTALLATION! -Instead, delete it first or install the new one to a different/empty folder. \ No newline at end of file