Make release split build as default

`-y release` now becomes the default option for ./build.sh.

Fix a conflict with clean options (-c or -C) as split build will always
be executed for clean options otherwise.

Fix web build as it hasn't wired up with split build yet.

Author: z3moon

CMakeLists.txt

@@ -834,16 +834,14 @@ if (FILAMENT_IMPORT_PREBUILT_EXECUTABLES_DIR)
    set(IMPORT_EXECUTABLES_DIR ${FILAMENT_IMPORT_PREBUILT_EXECUTABLES_DIR})
 endif()
 
-if (WASM)
-    set(IMPORT_EXECUTABLES ${FILAMENT}/${IMPORT_EXECUTABLES_DIR}/ImportExecutables-Release.cmake)
+if (FILAMENT_EXPORT_PREBUILT_EXECUTABLES OR FILAMENT_IMPORT_PREBUILT_EXECUTABLES)
+    set(IMPORT_EXECUTABLES_BUILD_TYPE Prebuilt)
+elseif (WASM)
+    set(IMPORT_EXECUTABLES_BUILD_TYPE Release)
 else()
-    if (FILAMENT_EXPORT_PREBUILT_EXECUTABLES OR FILAMENT_IMPORT_PREBUILT_EXECUTABLES)
-        set(IMPORT_EXECUTABLES_BUILD_TYPE Prebuilt)
-    else()
-        set(IMPORT_EXECUTABLES_BUILD_TYPE ${CMAKE_BUILD_TYPE})
-    endif()
-    set(IMPORT_EXECUTABLES ${FILAMENT}/${IMPORT_EXECUTABLES_DIR}/ImportExecutables-${IMPORT_EXECUTABLES_BUILD_TYPE}.cmake)
+    set(IMPORT_EXECUTABLES_BUILD_TYPE ${CMAKE_BUILD_TYPE})
 endif()
+set(IMPORT_EXECUTABLES ${FILAMENT}/${IMPORT_EXECUTABLES_DIR}/ImportExecutables-${IMPORT_EXECUTABLES_BUILD_TYPE}.cmake)
 
 # ==================================================================================================
 # Common Functions

build.sh

@@ -83,6 +83,7 @@ function print_help {
     echo "        Build the filament dependent tools (matc, resgen) separately from the project. This will set"
     echo "        the tools as prebuilts that filament target will then use to build. The built_type option"
     echo "        (debug|release) is meant to indicate the type of build of the resulting prebuilts."
+    echo "        Defaults to 'release' (tools are always prebuilt as release unless overridden)."
     echo ""
     echo "Build types:"
     echo "    release"
@@ -223,8 +224,8 @@ OSMESA_OPTION=""
 IOS_BUILD_SIMULATOR=false
 BUILD_UNIVERSAL_LIBRARIES=false
 
-ISSUE_SPLIT_BUILD=false
-SPLIT_BUILD_TYPE=""
+ISSUE_SPLIT_BUILD=true
+SPLIT_BUILD_TYPE="release"
 PREBUILT_TOOLS_DIR=""
 IMPORT_EXECUTABLES_DIR_OPTION="-DIMPORT_EXECUTABLES_DIR=out"
 
@@ -1132,13 +1133,6 @@ done
 
 validate_build_command
 
-if [[ "${ISSUE_SPLIT_BUILD}" == "true" ]]; then
-    # Capitalize first letter of SPLIT_BUILD_TYPE
-    SPLIT_BUILD_TYPE_CAPITALIZED="$(echo ${SPLIT_BUILD_TYPE:0:1} | tr '[:lower:]' '[:upper:]')${SPLIT_BUILD_TYPE:1}"
-    build_tools_for_split_build "${SPLIT_BUILD_TYPE_CAPITALIZED}"
-    IMPORT_EXECUTABLES_DIR_OPTION="-DFILAMENT_IMPORT_PREBUILT_EXECUTABLES_DIR=${PREBUILT_TOOLS_DIR}"
-fi
-
 if [[ "${ISSUE_CLEAN}" == "true" ]]; then
     build_clean
 fi
@@ -1147,6 +1141,16 @@ if [[ "${ISSUE_CLEAN_AGGRESSIVE}" == "true" ]]; then
     build_clean_aggressive
 fi
 
+# Only runs the split build for tools if an actual debug or release build is requested.
+# This prevents the split build from being triggered when a clean (-c or -C) is requested.
+if [[ "${ISSUE_SPLIT_BUILD}" == "true" ]] && \
+   [[ "${ISSUE_DEBUG_BUILD}" == "true" || "${ISSUE_RELEASE_BUILD}" == "true" ]]; then
+    # Capitalize first letter of SPLIT_BUILD_TYPE
+    SPLIT_BUILD_TYPE_CAPITALIZED="$(echo ${SPLIT_BUILD_TYPE:0:1} | tr '[:lower:]' '[:upper:]')${SPLIT_BUILD_TYPE:1}"
+    build_tools_for_split_build "${SPLIT_BUILD_TYPE_CAPITALIZED}"
+    IMPORT_EXECUTABLES_DIR_OPTION="-DFILAMENT_IMPORT_PREBUILT_EXECUTABLES_DIR=${PREBUILT_TOOLS_DIR}"
+fi
+
 if [[ "${ISSUE_DESKTOP_BUILD}" == "true" ]]; then
     check_debug_release_build build_desktop
 fi