Skip to content

Commit

Permalink
default BUILD_TYPE to Release and allow override via environment
Browse files Browse the repository at this point in the history
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
mgallien committed Dec 4, 2024
1 parent 4bf1369 commit ad1ebfc
Showing 2 changed files with 7 additions and 6 deletions.
7 changes: 2 additions & 5 deletions defaults.inc.bat
Original file line number Diff line number Diff line change
@@ -2,11 +2,6 @@ Rem ****************************************************************************
rem "Build defaults - environment Variables"
Rem ************************************************************************************************************************************************************************************

rem Release or Debug
set BUILD_TYPE=Release

if "%~1" == "Debug" (set BUILD_TYPE=%~1)

Rem ************************************************************************************************************************************************************************************
rem "CUSTOMIZE HERE:"
Rem ************************************************************************************************************************************************************************************
@@ -25,6 +20,8 @@ if "%APP_NAME_SANITIZED%" == "" set APP_NAME_SANITIZED=Nextcloud

if "%USE_BRANDING%" == "" set USE_BRANDING=0

if "%BUILD_TYPE%" == "" set BUILD_TYPE=Release

Rem ************************************************************************************************************************************************************************************
Rem Build environment

6 changes: 5 additions & 1 deletion single-build-installer-collect.bat
Original file line number Diff line number Diff line change
@@ -126,8 +126,12 @@ if exist "%MY_BUILD_PATH%/src/gui/%APP_NAME_SANITIZED%.ico" (
)
if %ERRORLEVEL% neq 0 goto onError

if "%BUILD_TYPE%" == "RelWithDebInfo" (
set "PDB_OPTION=--pdb"
)

echo "* run windeployqt "%MY_COLLECT_PATH%/%APP_NAME_SANITIZED%.exe."
start "run windeployqt" /D "%MY_COLLECT_PATH%/" /B /wait windeployqt --compiler-runtime --qmldir "%MY_REPO%\src" --release --force --verbose 2 "%MY_COLLECT_PATH%/%APP_NAME_SANITIZED%.exe" "%MY_COLLECT_PATH%/%APP_NAME_SANITIZED%_csync.dll" "%MY_COLLECT_PATH%/%APP_NAME_SANITIZED%cmd.exe" "%MY_COLLECT_PATH%/%APP_NAME_SANITIZED%sync.dll"
start "run windeployqt" /D "%MY_COLLECT_PATH%/" /B /wait windeployqt %PDB_OPTION% --compiler-runtime --qmldir "%MY_REPO%\src" --pdb --release --force --verbose 2 "%MY_COLLECT_PATH%/%APP_NAME_SANITIZED%.exe" "%MY_COLLECT_PATH%/%APP_NAME_SANITIZED%_csync.dll" "%MY_COLLECT_PATH%/%APP_NAME_SANITIZED%cmd.exe" "%MY_COLLECT_PATH%/%APP_NAME_SANITIZED%sync.dll"
if %ERRORLEVEL% neq 0 goto onError

Rem Remove Qt bearer plugins, they seem to cause issues on Windows

0 comments on commit ad1ebfc

Please sign in to comment.