From 6d197f69e4ac46939c0f44ea11c5441b2eac1c67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Garramu=C3=B1o?= Date: Mon, 29 Apr 2024 07:23:31 -0300 Subject: [PATCH] Made Windows build release by default, but Github Action build RelWithDebInfo. --- .github/workflows/full_win64.yml | 2 +- etc/parse_args.sh | 21 +++------------------ 2 files changed, 4 insertions(+), 19 deletions(-) diff --git a/.github/workflows/full_win64.yml b/.github/workflows/full_win64.yml index fcd80fd94..47f0e1b7b 100644 --- a/.github/workflows/full_win64.yml +++ b/.github/workflows/full_win64.yml @@ -64,7 +64,7 @@ jobs: - name: Build mrv2 run: | - ./runme_nolog.sh -t package -D TLRENDER_USD=OFF + ./runme_nolog.sh reldeb -t package -D TLRENDER_USD=OFF - name: Zip pdb files run: | diff --git a/etc/parse_args.sh b/etc/parse_args.sh index d4b621c17..d25c4d6c4 100755 --- a/etc/parse_args.sh +++ b/etc/parse_args.sh @@ -11,8 +11,8 @@ show_help() echo "$0 [debug|release|reldeb] [clean] [-v] [-j ] [-lgpl] [-gpl] [-D VAR=VALUE] [-t ] [-help]" echo "" echo "* debug builds a debug build." - echo "* release builds a release build. (default on Linux and macOS)" - echo "* reldeb builds a release build with debugging symbols. (default on Windows)" + echo "* release builds a release build. (default)" + echo "* reldeb builds a release build with debugging symbols." echo "* clean clears the directory before building -- use only with runme.sh" echo "* -j controls the threads to use when compiling. [default=$CPU_CORES]" echo "* -v builds verbosely. [default=off]" @@ -82,21 +82,6 @@ export CMAKE_TARGET="" ASK_TO_CONTINUE=0 -# -# In Windows, we always build with RelWithDebInfo so that we can check for -# crashes. On Linux and macOS we build with symbols when I am the user -# compiling it locally as GitHub Actions runs out of disk space. -# -build_with_symbols=0 -if [[ $KERNEL == *Msys* ]]; then - build_with_symbols=1 -fi - -if [[ $build_with_symbols == 1 ]]; then - export BUILD_TYPE_DIR="Release" - export CMAKE_BUILD_TYPE="RelWithDebInfo" -fi - for i in "$@"; do case $i in reldeb|RelWithDebInfo) @@ -105,7 +90,7 @@ for i in "$@"; do shift ;; release|Release) - export CMAKE_BUILD_TYPE="RelWithDebInfo" + export CMAKE_BUILD_TYPE="Release" export BUILD_TYPE_DIR="Release" shift ;;