fix glitch, moved code.

Signed-off-by: Patrick Bergeron <[email protected]>

Author: pbergeron-adsk

rvcmds.sh

@@ -135,21 +135,6 @@ __rv_env_shell() {
   fi
 }
 
-# VARIABLES
-RV_HOME="${RV_HOME:-$SCRIPT_HOME}"
-RV_BUILD_PARALLELISM="${RV_BUILD_PARALLELISM:-$(python3 -c 'import os; print(os.cpu_count())')}"
-
-
-# Capture current build type before any variable declarations
-INIT_BUILD_TYPE="$RV_BUILD_TYPE"
-
-# Build configuration variables (initialized by rvrelease at end of script)
-RV_BUILD_TYPE=""
-RV_BUILD_DIR=""
-RV_INST_DIR=""
-RV_APP_DIR=""
-RV_PATH_SUFFIX=""
-
 # Update all path variables based on current RV_PATH_SUFFIX
 __rv_update_paths() {
   RV_BUILD_DIR="${RV_HOME}/_build${RV_PATH_SUFFIX}"
@@ -160,31 +145,6 @@ __rv_update_paths() {
   fi
 }
 
-# Deactivate virtual environment if active when sourcing
-if [ -n "$VIRTUAL_ENV" ]; then
-  deactivate
-fi
-
-# Capture clean prompt before any RV modifications (only if not already set)
-if [ -z "$RV_CLEAN_PROMPT" ]; then
-  RV_CLEAN_PROMPT="$PS1"
-fi
-
-# Single set of aliases using current build variables
-# Note: Single quotes preserve variables for expansion at execution time
-alias rvenv='__rv_env_shell'
-alias rvsetup='rvenv && SETUPTOOLS_USE_DISTUTILS=${SETUPTOOLS_USE_DISTUTILS} python3 -m pip install --upgrade -r ${RV_HOME}/requirements.txt'
-alias rvcfg='rvenv && cmake -B ${RV_BUILD_DIR} -G "${CMAKE_GENERATOR}" ${RV_TOOLCHAIN} ${CMAKE_WIN_ARCH} -DCMAKE_BUILD_TYPE=${RV_BUILD_TYPE} -D${RV_DEPS_QT_LOCATION}=${QT_HOME} -DRV_VFX_PLATFORM=${RV_VFX_PLATFORM} -DRV_DEPS_WIN_PERL_ROOT=${WIN_PERL}'
-alias rvbuildt='rvenv && cmake --build ${RV_BUILD_DIR} --config ${RV_BUILD_TYPE} -v --parallel=${RV_BUILD_PARALLELISM} --target '
-alias rvbuild='rvenv && rvbuildt main_executable'
-alias rvtest='rvenv && ctest --test-dir ${RV_BUILD_DIR} --extra-verbose'
-alias rvinst='rvenv && cmake --install ${RV_BUILD_DIR} --prefix ${RV_INST_DIR} --config ${RV_BUILD_TYPE}'
-alias rvclean='__rv_clean_build'
-alias rvappdir='cd ${RV_APP_DIR}'
-alias rvhomedir='cd ${RV_HOME}'
-alias rvhome='cd ${RV_HOME}'
-alias rvmk='rvcfg && rvbuild'
-alias rvbootstrap='rvsetup && rvmk'
 
 # Set initial prompt when not in virtual environment
 __rv_set_first_prompt() {
@@ -258,6 +218,48 @@ rvrelease() {
   __rv_switch_config
 }
 
+
+# VARIABLES
+RV_HOME="${RV_HOME:-$SCRIPT_HOME}"
+RV_BUILD_PARALLELISM="${RV_BUILD_PARALLELISM:-$(python3 -c 'import os; print(os.cpu_count())')}"
+
+# Capture current build type before any variable declarations
+INIT_BUILD_TYPE="$RV_BUILD_TYPE"
+
+# Build configuration variables (initialized by rvrelease at end of script)
+RV_BUILD_TYPE=""
+RV_BUILD_DIR=""
+RV_INST_DIR=""
+RV_APP_DIR=""
+RV_PATH_SUFFIX=""
+
+
+# Deactivate virtual environment if active when sourcing
+if [ -n "$VIRTUAL_ENV" ]; then
+  deactivate
+fi
+
+# Capture clean prompt before any RV modifications (only if not already set)
+if [ -z "$RV_CLEAN_PROMPT" ]; then
+  RV_CLEAN_PROMPT="$PS1"
+fi
+
+# Single set of aliases using current build variables
+# Note: Single quotes preserve variables for expansion at execution time
+alias rvenv='__rv_env_shell'
+alias rvsetup='rvenv && SETUPTOOLS_USE_DISTUTILS=${SETUPTOOLS_USE_DISTUTILS} python3 -m pip install --upgrade -r ${RV_HOME}/requirements.txt'
+alias rvcfg='rvenv && cmake -B ${RV_BUILD_DIR} -G "${CMAKE_GENERATOR}" ${RV_TOOLCHAIN} ${CMAKE_WIN_ARCH} -DCMAKE_BUILD_TYPE=${RV_BUILD_TYPE} -D${RV_DEPS_QT_LOCATION}=${QT_HOME} -DRV_VFX_PLATFORM=${RV_VFX_PLATFORM} -DRV_DEPS_WIN_PERL_ROOT=${WIN_PERL}'
+alias rvbuildt='rvenv && cmake --build ${RV_BUILD_DIR} --config ${RV_BUILD_TYPE} -v --parallel=${RV_BUILD_PARALLELISM} --target '
+alias rvbuild='rvenv && rvbuildt main_executable'
+alias rvtest='rvenv && ctest --test-dir ${RV_BUILD_DIR} --extra-verbose'
+alias rvinst='rvenv && cmake --install ${RV_BUILD_DIR} --prefix ${RV_INST_DIR} --config ${RV_BUILD_TYPE}'
+alias rvclean='__rv_clean_build'
+alias rvappdir='cd ${RV_APP_DIR}'
+alias rvhomedir='cd ${RV_HOME}'
+alias rvhome='cd ${RV_HOME}'
+alias rvmk='rvcfg && rvbuild'
+alias rvbootstrap='rvsetup && rvmk'
+
 echo "Please ensure you have installed any required dependencies from doc/build_system/config_[os]"
 echo
 echo "CMake parameters:"
@@ -272,11 +274,10 @@ if [[ "$OSTYPE" == "msys"* || "$OSTYPE" == "cygwin"* ]]; then echo "WIN_PERL is
 
 echo "To override any of them do unset [name]; export [name]=value; source $SCRIPT"
 echo
-echo
 echo "Use 'rvrelease' (default) or 'rvdebug' to switch between build configurations."
-echo "Call 'rvbootstrap' if its your first time building or after calling rvclean."
 echo
-echo "After rvbootstrap, you can do incremental builds using 'rvbuild' or 'rvmk'."
+echo "Call 'rvbootstrap' if its your first time building or after calling rvclean."
+echo "After 'rvbootstrap', use 'rvbuild' or 'rvmk' for incremental builds."
 echo
 
 # Initialize with appropriate build mode (after sourcing, if we were in debug, stay in debug)