From e4f94dc99fc7bf3614d07cff2467e08ce1d01c84 Mon Sep 17 00:00:00 2001 From: hunbernd Date: Sat, 23 May 2020 22:17:49 +0200 Subject: [PATCH] Pack webui --- build_scripts/Windows-msys2/build/env-base.bat | 2 +- build_scripts/Windows-msys2/build/pack.bat | 13 +++++++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/build_scripts/Windows-msys2/build/env-base.bat b/build_scripts/Windows-msys2/build/env-base.bat index 4f1236fb7..8f80e8681 100644 --- a/build_scripts/Windows-msys2/build/env-base.bat +++ b/build_scripts/Windows-msys2/build/env-base.bat @@ -86,7 +86,7 @@ exit /B 0 :usage echo. -echo Usage: 32^|64 release^|debug [version autologin plugins] +echo Usage: 32^|64 release^|debug [version autologin plugins webui] echo. echo Mandatory parameter echo 32^|64 32-bit or 64-bit Version diff --git a/build_scripts/Windows-msys2/build/pack.bat b/build_scripts/Windows-msys2/build/pack.bat index b023f5d5b..e759b7980 100644 --- a/build_scripts/Windows-msys2/build/pack.bat +++ b/build_scripts/Windows-msys2/build/pack.bat @@ -166,10 +166,15 @@ copy "%SourcePath%\retroshare-gui\src\changelog.txt" "%RsDeployPath%" %Quite% echo copy buildinfo.txt copy "%RsBuildPath%\buildinfo.txt" "%RsDeployPath%" %Quite% -if exist "%SourcePath%\libresapi\src\webui" ( - echo copy webui - mkdir "%RsDeployPath%\webui" - xcopy /S "%SourcePath%\libresapi\src\webui" "%RsDeployPath%\webui" %Quite% +if "%ParamWebui%"=="1" ( + if exist "%RsWebuiPath%\webui" ( + echo copy webui + mkdir "%RsDeployPath%\webui" + xcopy /S "%RsWebuiPath%\webui" "%RsDeployPath%\webui" %Quite% + ) else ( + %cecho% error "Webui is enabled, but no webui data found at %RsWebuiPath%\webui" + goto error + ) ) if "%ParamTor%"=="1" (