From 472eede10176a5e15bd528ff2a7482112c1bfac9 Mon Sep 17 00:00:00 2001
From: fszontagh <51741446+fszontagh@users.noreply.github.com>
Date: Sat, 09 Mar 2024 12:33:57 +0000
Subject: [PATCH] unified inno setup script
---
autobuild.bat | 102 ++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 81 insertions(+), 21 deletions(-)
diff --git a/autobuild.bat b/autobuild.bat
index 84dc3d6..cea35ce 100644
--- a/autobuild.bat
+++ b/autobuild.bat
@@ -39,16 +39,53 @@
IF NOT EXIST %installers_dir%\ (
mkdir %installers_dir%
)
-@echo off
-REM Get current date in the format YYYY-MM-DD
+
+REM A fájl elérési útvonala
+set "version_file=src\sd.cpp.gui.wx_avx\ui\ver.hpp"
+
+
+for /f tokens^=2^ delims^=^" %%a in ('type %version_file% ^| findstr /c:"SD_GUI_VERSION"') do (
+ set "SD_GUI_VERSION=%%~a"
+)
+
+set SD_GUI_VARIATION=avx
+set SD_GUI_VERSION=%SD_GUI_VERSION%
+echo SD GUI version: %SD_GUI_VERSION%
+echo SD GUI variation: %SD_GUI_VARIATION%
+
for /f "tokens=2 delims==" %%I in ('wmic os get localdatetime /value') do set datetime=%%I
set date=%datetime:~0,4%-%datetime:~4,2%-%datetime:~6,2%
-REM Run Inno Setup compiler with the specified output path
-%ISCC% /O "%installers_dir%/%date%" sd.gui.wx_avx.iss
-%ISCC% /O "%installers_dir%/%date%" sd.gui.wx_avx2.iss
-%ISCC% /O "%installers_dir%/%date%" sd.gui.wx_avx512.iss
-%ISCC% /O "%installers_dir%/%date%" sd.gui.wx_avx_CUDA.iss
+
+%ISCC% /O"%installers_dir%/%date%" sd.gui.wx.iss
+
+set SD_GUI_VARIATION=avx2
+set SD_GUI_VERSION=%SD_GUI_VERSION%
+echo SD GUI version: %SD_GUI_VERSION%
+echo SD GUI variation: %SD_GUI_VARIATION%
+
+%ISCC% /O"%installers_dir%/%date%" sd.gui.wx.iss
+
+
+set SD_GUI_VARIATION=avx512
+set SD_GUI_VERSION=%SD_GUI_VERSION%
+echo SD GUI version: %SD_GUI_VERSION%
+echo SD GUI variation: %SD_GUI_VARIATION%
+
+%ISCC% /O"%installers_dir%/%date%" sd.gui.wx.iss
+
+set SD_GUI_VARIATION=cuda
+set SD_GUI_VERSION=%SD_GUI_VERSION%
+echo SD GUI version: %SD_GUI_VERSION%
+echo SD GUI variation: %SD_GUI_VARIATION%
+
+%ISCC% /O"%installers_dir%/%date%" sd.gui.wx.iss
+
+REM %ISCC% /O"%installers_dir%/%date%" sd.gui.wx_avx2.iss
+REM %ISCC% /O"%installers_dir%/%date%" sd.gui.wx_avx512.iss
+REM %ISCC% /O"%installers_dir%/%date%" sd.gui.wx_avx_CUDA.iss
+
+pause
goto start
@@ -112,8 +149,12 @@
cls
cd %avx_dir%
powershell -Command "(gc vcpkg.json) -replace '\"cuda\"\,', '' | Out-File -encoding ASCII vcpkg.json"
-rmdir /s /q external\stable-diffusion
-rmdir /s /q build
+IF EXIST external\stable-diffusion\ (
+ rmdir /s /q external\stable-diffusion
+)
+IF EXIST build\ (
+ rmdir /s /q build
+)
cmake -B build/ -S . -DCMAKE_TOOLCHAIN_FILE=%vcpkg_root_dir%/scripts/buildsystems/vcpkg.cmake -DGGML_AVX512=OFF -DGGML_AVX2=OFF -DGGML_AVX=ON -DSD_CUBLAS=OFF
cmake --build build/ --config Release
cd %startdir%
@@ -129,15 +170,23 @@
cd %avx512_dir%
powershell -Command "(gc vcpkg.json) -replace '\"cuda\"\,', '' | Out-File -encoding ASCII vcpkg.json"
-rmdir /s /q external\stable-diffusion
-rmdir /s /q build
+IF EXIST external\stable-diffusion\ (
+ rmdir /s /q external\stable-diffusion
+)
+IF EXIST build\ (
+ rmdir /s /q build
+)
cmake -B build/ -S . -DCMAKE_TOOLCHAIN_FILE=%vcpkg_root_dir%/scripts/buildsystems/vcpkg.cmake -DGGML_AVX512=ON -DGGML_AVX2=ON -DGGML_AVX=ON -DSD_CUBLAS=OFF
cmake --build build/ --config Release
cd %startdir%
cd %CUDA_dir%
-rmdir /s /q external\stable-diffusion
-rmdir /s /q build
+IF EXIST external\stable-diffusion\ (
+ rmdir /s /q external\stable-diffusion
+)
+IF EXIST build\ (
+ rmdir /s /q build
+)
cmake -B build/ -S . -DCMAKE_TOOLCHAIN_FILE=%vcpkg_root_dir%/scripts/buildsystems/vcpkg.cmake -DSD_CUBLAS=ON
cmake --build build/ --config Release
cd %startdir%
@@ -146,20 +195,31 @@
:COPY
cls
-mkdir %compiled_dir%
-mkdir %compiled_dir%\sd.cpp.gui.wx_avx
+IF NOT EXIST %compiled_dir%\ (
+ mkdir %compiled_dir%
+)
+IF NOT EXIST %compiled_dir%\sd.cpp.gui.wx_avx\ (
+ mkdir %compiled_dir%\sd.cpp.gui.wx_avx
+)
xcopy /s /v /h /y %avx_dir%\build\Release %compiled_dir%\sd.cpp.gui.wx_avx\
-mkdir %compiled_dir%
-mkdir %compiled_dir%\sd.cpp.gui.wx_avx2
+
+IF NOT EXIST %compiled_dir%\sd.cpp.gui.wx_avx2\ (
+ mkdir %compiled_dir%\sd.cpp.gui.wx_avx2
+)
+
xcopy /s /v /h /y %avx2_dir%\build\Release %compiled_dir%\sd.cpp.gui.wx_avx2\
-mkdir %compiled_dir%
-mkdir %compiled_dir%\sd.cpp.gui.wx_avx512
+IF NOT EXIST %compiled_dir%\sd.cpp.gui.wx_avx512\ (
+ mkdir %compiled_dir%\sd.cpp.gui.wx_avx512
+)
xcopy /s /v /h /y %avx512_dir%\build\Release %compiled_dir%\sd.cpp.gui.wx_avx512\
-mkdir %compiled_dir%
-mkdir %compiled_dir%\sd.cpp.gui.wx_cuda
+
+IF NOT EXIST %compiled_dir%\sd.cpp.gui.wx_cuda\ (
+ mkdir %compiled_dir%\sd.cpp.gui.wx_cuda
+)
+
xcopy /s /v /h /y %CUDA_dir%\build\Release %compiled_dir%\sd.cpp.gui.wx_cuda\
goto :done
--
Gitblit v1.9.3