From bc36e253a028df5cf9bfdd2cb0bba39d546eff5b Mon Sep 17 00:00:00 2001 From: Carlos Tadeu Panato Junior Date: Wed, 9 Jun 2021 12:03:19 +0200 Subject: [PATCH] windows: updates based on tests for gitlab (#546) --- Makefile | 3 ++- win-wpf/build.bat | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 7e38eb162..966a9e4ee 100644 --- a/Makefile +++ b/Makefile @@ -166,7 +166,8 @@ mac-app: server-mac webapp cd mac/dist; zip -r focalboard-mac.zip Focalboard.app MIT-COMPILED-LICENSE.md NOTICE.txt webapp-NOTICE.txt win-wpf-app: server-dll webapp - cd win-wpf && ./build.bat && ./package.bat + cd win-wpf && ./build.bat + cd win-wpf && ./package.bat cd win-wpf && ./package-zip.bat linux-app: webapp diff --git a/win-wpf/build.bat b/win-wpf/build.bat index e26b11009..4f3013b41 100644 --- a/win-wpf/build.bat +++ b/win-wpf/build.bat @@ -3,6 +3,9 @@ WHERE msbuild.exe > nul 2>&1 IF %ERRORLEVEL% NEQ 0 set PATH=%PATH%;C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\MSBuild\Current\Bin +WHERE msbuild.exe > nul 2>&1 +IF %ERRORLEVEL% NEQ 0 set PATH=%PATH%;C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\MSBuild\Current\Bin + WHERE msbuild.exe > nul IF %ERRORLEVEL% NEQ 0 echo msbuild.exe not found; exit /b 1