Merge pull request #31 from nextcloud/buildUpdaterqt-5.12.8

Add BUILD_UPDATER option to build the Updater

3 files changed, 15 insertions, 2 deletions

diff --git a/README.md b/README.md
index aa7e57e7c..cb86635ba 100644
--- a/README.md
+++ b/README.md
@@ -2,6 +2,14 @@
 
 This allows you to easily build the desktop client for 64-bit and 32-bit Windows.
 
+## Update: 2020-07-16
+
+Added new option to build the Updater (disabled by default):
+
+```
+BUILD_UPDATER=ON ./build.bat Release
+```
+
 ## Update: 2020-06-20
 
 When building from a tag it is best to set PULL_DESKTOP to 0:
diff --git a/defaults.inc.bat b/defaults.inc.bat
index 338e02291..c2af73b99 100644
--- a/defaults.inc.bat
+++ b/defaults.inc.bat
@@ -102,6 +102,9 @@ if "%USE_BRANDING%" == "1" (
     set CHECKOUT_DESKTOP=0
 )
 
+Rem Updater: ON = build, OFF = don't build (default)
+if "%BUILD_UPDATER%" == ""                  set BUILD_UPDATER=OFF
+
 Rem ************************************************************************************************************************************************************************************
 Rem Installer Options: 1 = build (default), 0 = don't build
 if "%BUILD_INSTALLER%" == ""                set BUILD_INSTALLER=1
@@ -128,7 +131,7 @@ Rem Upload build: 1 = enable (default), 0 = disable
 if "%UPLOAD_BUILD%" == ""                   set UPLOAD_BUILD=1
 
 Rem Delete build after successful upload: 1 = delete, 0 = keep (default)
-if "%UPLOAD_DELETE%" == ""                   set UPLOAD_DELETE=0
+if "%UPLOAD_DELETE%" == ""                  set UPLOAD_DELETE=0
 
 Rem: Note: Storing SFTP_PATH outside in Windows's env leads to trouble due to the preceding slash!
 if "%SFTP_PATH%" == ""                      set SFTP_PATH=/var/www/html/desktop/daily/Windows
diff --git a/single-build-desktop.bat b/single-build-desktop.bat
index cde9143d9..f952b5cfb 100644
--- a/single-build-desktop.bat
+++ b/single-build-desktop.bat
@@ -48,6 +48,7 @@ echo "* VERSION_SUFFIX %VERSION_SUFFIX%"
 echo "* TAG %TAG%"
 echo "* PULL_DESKTOP %PULL_DESKTOP%"
 echo "* CHECKOUT_DESKTOP %CHECKOUT_DESKTOP%"
+echo "* BUILD_UPDATER %BUILD_UPDATER%"
 
 echo "* MY_REPO=%MY_REPO%"
 echo "* MY_BUILD_PATH=%MY_BUILD_PATH%"
@@ -78,6 +79,7 @@ call :testEnv OPENSSL_LIBRARIES
 call :testEnv ZLIB_INCLUDE_DIR
 call :testEnv ZLIB_LIBRARY
 call :testEnv BUILD_DATE
+call :testEnv BUILD_UPDATER
 call :testEnv TAG
 
 if %ERRORLEVEL% neq 0 goto onError
@@ -147,7 +149,7 @@ if %ERRORLEVEL% neq 0 goto onError
 del "%PROJECT_PATH%"\tmp
 
 echo "* Run cmake with CMAKE_INSTALL_PREFIX and CMAKE_BUILD_TYPE set at %MY_BUILD_PATH%."
-start "cmake.." /D "%MY_BUILD_PATH%" /B /wait cmake "-G%CMAKE_GENERATOR%" -DCMAKE_GENERATOR_PLATFORM="%CMAKE_GENERATOR_PLATFORM%" .. -DMIRALL_VERSION_SUFFIX="%VERSION_SUFFIX%" -DWITH_CRASHREPORTER=OFF -DMIRALL_VERSION_BUILD="%BUILD_DATE%" -DCMAKE_INSTALL_PREFIX="%MY_INSTALL_PATH%" -DCMAKE_BUILD_TYPE="%BUILD_TYPE%" -DNO_SHIBBOLETH=1 -DPng2Ico_EXECUTABLE="%Png2Ico_EXECUTABLE%" -DQTKEYCHAIN_LIBRARY="%QTKEYCHAIN_LIBRARY%" -DQTKEYCHAIN_INCLUDE_DIR="%QTKEYCHAIN_INCLUDE_DIR%" -DOPENSSL_ROOT_DIR="%OPENSSL_ROOT_DIR%" -DOPENSSL_INCLUDE_DIR="%OPENSSL_INCLUDE_DIR%" -DOPENSSL_LIBRARIES="%OPENSSL_LIBRARIES%" -DZLIB_INCLUDE_DIR="%ZLIB_INCLUDE_DIR%" -DZLIB_LIBRARY="%ZLIB_LIBRARY%" %CMAKE_EXTRA_FLAGS_DESKTOP%
+start "cmake.." /D "%MY_BUILD_PATH%" /B /wait cmake "-G%CMAKE_GENERATOR%" -DCMAKE_GENERATOR_PLATFORM="%CMAKE_GENERATOR_PLATFORM%" .. -DMIRALL_VERSION_SUFFIX="%VERSION_SUFFIX%" -DWITH_CRASHREPORTER=OFF -DBUILD_UPDATER=%BUILD_UPDATER% -DMIRALL_VERSION_BUILD="%BUILD_DATE%" -DCMAKE_INSTALL_PREFIX="%MY_INSTALL_PATH%" -DCMAKE_BUILD_TYPE="%BUILD_TYPE%" -DNO_SHIBBOLETH=1 -DPng2Ico_EXECUTABLE="%Png2Ico_EXECUTABLE%" -DQTKEYCHAIN_LIBRARY="%QTKEYCHAIN_LIBRARY%" -DQTKEYCHAIN_INCLUDE_DIR="%QTKEYCHAIN_INCLUDE_DIR%" -DOPENSSL_ROOT_DIR="%OPENSSL_ROOT_DIR%" -DOPENSSL_INCLUDE_DIR="%OPENSSL_INCLUDE_DIR%" -DOPENSSL_LIBRARIES="%OPENSSL_LIBRARIES%" -DZLIB_INCLUDE_DIR="%ZLIB_INCLUDE_DIR%" -DZLIB_LIBRARY="%ZLIB_LIBRARY%" %CMAKE_EXTRA_FLAGS_DESKTOP%
 if %ERRORLEVEL% neq 0 goto onError
 
 echo "* Run cmake to compile and install."