Merge pull request #5382 from aws-lumberyard-dev/Atom/TechArt/FixUp

Fixed .bat chain for launching maya for AtomContent gems

Gems/AtomContent/ReferenceMaterials/Tools/Launch_Cmd.bat

@@ -1,4 +1,6 @@
 @echo off
+:: Keep changes local
+SETLOCAL enableDelayedExpansion
 
 REM 
 REM Copyright (c) Contributors to the Open 3D Engine Project
@@ -13,7 +15,7 @@ REM
 :: Puts you in the CMD within the dev environment
 
 :: Set up window
-TITLE O3DE Asset Gem Cmd
+TITLE O3DE DCC Scripting Interface Cmd
 :: Use obvious color to prevent confusion (Grey with Yellow Text)
 COLOR 8E
 
@@ -21,15 +23,12 @@ COLOR 8E
 cd %~dp0
 PUSHD %~dp0
 
-:: Keep changes local
-SETLOCAL enableDelayedExpansion
-
 CALL %~dp0\Project_Env.bat
 
 echo.
 echo _____________________________________________________________________
 echo.
-echo ~    O3DE Asset Gem CMD ...
+echo ~    O3DE %O3DE_PROJECT% Asset Gem CMD ...
 echo _____________________________________________________________________
 echo.
 

Gems/AtomContent/ReferenceMaterials/Tools/Launch_Maya.bat

@@ -1,6 +1,3 @@
-:: Launches maya wityh a bunch of local hooks for Lumberyard
-:: ToDo: move all of this to a .json data driven boostrapping system
-
 @echo off
 
 REM 
@@ -37,7 +34,7 @@ echo     DCCSI_MAYA_VERSION = %DCCSI_MAYA_VERSION%
 IF EXIST "%~dp0Project_Env.bat" CALL %~dp0Project_Env.bat
 
 echo ________________________________
-echo Launching Maya %DCCSI_MAYA_VERSION% for Lumberyard...
+echo Launching Maya %DCCSI_MAYA_VERSION% for O3DE: %O3DE_PROJECT%...
 
 :::: Set Maya native project acess to this project
 ::set MAYA_PROJECT=%LY_PROJECT%
@@ -47,8 +44,10 @@ echo Launching Maya %DCCSI_MAYA_VERSION% for Lumberyard...
 Set MAYA_VP2_DEVICE_OVERRIDE = VirtualDeviceDx11
 
 :: Default to the right version of Maya if we can detect it... and launch
-IF EXIST "%MAYA_LOCATION%\bin\Maya.exe" (
+echo     MAYA_BIN_PATH = %MAYA_BIN_PATH%
-   start "" "%MAYA_LOCATION%\bin\Maya.exe" %*
+
+IF EXIST "%MAYA_BIN_PATH%\Maya.exe" (
+   start "" "%MAYA_BIN_PATH%\Maya.exe" %*
 ) ELSE (
    Where maya.exe 2> NUL
    IF ERRORLEVEL 1 (

Gems/AtomContent/ReferenceMaterials/Tools/Project_Env.bat

@@ -29,23 +29,23 @@ PUSHD %~dp0
 set ABS_PATH=%~dp0
 
 :: project name as a str tag
-IF "%LY_PROJECT_NAME%"=="" (
+IF "%O3DE_PROJECT%"=="" (
-    for %%I in ("%~dp0.") do for %%J in ("%%~dpI.") do set LY_PROJECT_NAME=%%~nxJ
+    for %%I in ("%~dp0.") do for %%J in ("%%~dpI.") do set O3DE_PROJECT=%%~nxJ
     )
 
 echo.
 echo _____________________________________________________________________
 echo.
-echo ~    Setting up O3DE %LY_PROJECT_NAME% Environment ...
+echo ~    Setting up O3DE %O3DE_PROJECT% Environment ...
 echo _____________________________________________________________________
 echo.
-echo     LY_PROJECT_NAME = %LY_PROJECT_NAME%
+echo     O3DE_PROJECT = %O3DE_PROJECT%
 
 :: if the user has set up a custom env call it
 :: this should allow the user to locally
-:: set env hooks like LY_DEV or LY_PROJECT
+:: set env hooks like O3DE_DEV or O3DE_PROJECT_PATH
 IF EXIST "%~dp0User_Env.bat" CALL %~dp0User_Env.bat
-echo     LY_DEV = %LY_DEV%
+echo     O3DE_DEV = %O3DE_DEV%
 
 :: Constant Vars (Global)
 :: global debug flag (propogates)
@@ -74,23 +74,20 @@ echo     DCCSI_LOGLEVEL = %DCCSI_LOGLEVEL%
 IF "%DCCSI_MAYA_VERSION%"=="" (set DCCSI_MAYA_VERSION=2020)
 echo     DCCSI_MAYA_VERSION = %DCCSI_MAYA_VERSION%
 
-:: LY_PROJECT is ideally treated as a full path in the env launchers
+:: O3DE_PROJECT_PATH is ideally treated as a full path in the env launchers
 :: do to changes in o3de, external engine/project/gem folder structures, etc.
-IF "%LY_PROJECT%"=="" (
+IF "%O3DE_PROJECT_PATH%"=="" (
-    for %%i in ("%~dp0..") do set "LY_PROJECT=%%~fi"
+    for %%i in ("%~dp0..") do set "O3DE_PROJECT_PATH=%%~fi"
     )
-echo     LY_PROJECT = %LY_PROJECT%
+echo     O3DE_PROJECT_PATH = %O3DE_PROJECT_PATH%
 
-:: this is here for archaic reasons, WILL DEPRECATE
+:: Change to root O3DE dev dir
-IF "%LY_PROJECT_PATH%"=="" (set LY_PROJECT_PATH=%LY_PROJECT%)
+IF "%O3DE_DEV%"=="" echo     ~ You must set O3DE_DEV in a User_Env.bat to match your local engine repo!
-echo     LY_PROJECT_PATH = %LY_PROJECT_PATH%
+IF "%O3DE_DEV%"=="" echo     ~ Using default O3DE_DEV=C:\Depot\o3de-engine
+IF "%O3DE_DEV%"=="" (set O3DE_DEV=C:\Depot\o3de-engine)
+echo     O3DE_DEV = %O3DE_DEV%
 
-:: Change to root Lumberyard dev dir
+CALL %O3DE_DEV%\Gems\AtomLyIntegration\TechnicalArt\DccScriptingInterface\Tools\Dev\Windows\Env_Maya.bat
-:: You must set this in a User_Env.bat to match youe engine repo location!
-IF "%LY_DEV%"=="" (set LY_DEV=C:\Depot\o3de-engine)
-echo     LY_DEV = %LY_DEV%
-
-CALL %LY_DEV%\Gems\AtomLyIntegration\TechnicalArt\DccScriptingInterface\Launchers\Windows\Env_Maya.bat
 
 :: Restore original directory
 popd

Gems/AtomContent/Sponza/Tools/Launch_Cmd.bat

@@ -1,4 +1,6 @@
 @echo off
+:: Keep changes local
+SETLOCAL enableDelayedExpansion
 
 REM 
 REM Copyright (c) Contributors to the Open 3D Engine Project
@@ -21,15 +23,12 @@ COLOR 8E
 cd %~dp0
 PUSHD %~dp0
 
-:: Keep changes local
-SETLOCAL enableDelayedExpansion
-
 CALL %~dp0\Project_Env.bat
 
 echo.
 echo _____________________________________________________________________
 echo.
-echo ~    LY DCC Scripting Interface CMD ...
+echo ~    O3DE %O3DE_PROJECT% Asset Gem CMD ...
 echo _____________________________________________________________________
 echo.
 

Gems/AtomContent/Sponza/Tools/Launch_Maya.bat

@@ -34,7 +34,7 @@ echo     DCCSI_MAYA_VERSION = %DCCSI_MAYA_VERSION%
 IF EXIST "%~dp0Project_Env.bat" CALL %~dp0Project_Env.bat
 
 echo ________________________________
-echo Launching Maya %DCCSI_MAYA_VERSION% for Lumberyard...
+echo Launching Maya %DCCSI_MAYA_VERSION% for O3DE: %O3DE_PROJECT%...
 
 :::: Set Maya native project acess to this project
 ::set MAYA_PROJECT=%LY_PROJECT%
@@ -44,8 +44,10 @@ echo Launching Maya %DCCSI_MAYA_VERSION% for Lumberyard...
 Set MAYA_VP2_DEVICE_OVERRIDE = VirtualDeviceDx11
 
 :: Default to the right version of Maya if we can detect it... and launch
-IF EXIST "%MAYA_LOCATION%\bin\Maya.exe" (
+echo     MAYA_BIN_PATH = %MAYA_BIN_PATH%
-   start "" "%MAYA_LOCATION%\bin\Maya.exe" %*
+
+IF EXIST "%MAYA_BIN_PATH%\Maya.exe" (
+   start "" "%MAYA_BIN_PATH%\Maya.exe" %*
 ) ELSE (
    Where maya.exe 2> NUL
    IF ERRORLEVEL 1 (

Gems/AtomContent/Sponza/Tools/Project_Env.bat

@@ -29,23 +29,23 @@ PUSHD %~dp0
 set ABS_PATH=%~dp0
 
 :: project name as a str tag
-IF "%LY_PROJECT_NAME%"=="" (
+IF "%O3DE_PROJECT%"=="" (
-    for %%I in ("%~dp0.") do for %%J in ("%%~dpI.") do set LY_PROJECT_NAME=%%~nxJ
+    for %%I in ("%~dp0.") do for %%J in ("%%~dpI.") do set O3DE_PROJECT=%%~nxJ
     )
 
 echo.
 echo _____________________________________________________________________
 echo.
-echo ~    Setting up O3DE %LY_PROJECT_NAME% Environment ...
+echo ~    Setting up O3DE %O3DE_PROJECT% Environment ...
 echo _____________________________________________________________________
 echo.
-echo     LY_PROJECT_NAME = %LY_PROJECT_NAME%
+echo     O3DE_PROJECT = %O3DE_PROJECT%
 
 :: if the user has set up a custom env call it
 :: this should allow the user to locally
-:: set env hooks like LY_DEV or LY_PROJECT
+:: set env hooks like O3DE_DEV or O3DE_PROJECT_PATH
 IF EXIST "%~dp0User_Env.bat" CALL %~dp0User_Env.bat
-echo     LY_DEV = %LY_DEV%
+echo     O3DE_DEV = %O3DE_DEV%
 
 :: Constant Vars (Global)
 :: global debug flag (propogates)
@@ -74,23 +74,20 @@ echo     DCCSI_LOGLEVEL = %DCCSI_LOGLEVEL%
 IF "%DCCSI_MAYA_VERSION%"=="" (set DCCSI_MAYA_VERSION=2020)
 echo     DCCSI_MAYA_VERSION = %DCCSI_MAYA_VERSION%
 
-:: LY_PROJECT is ideally treated as a full path in the env launchers
+:: O3DE_PROJECT_PATH is ideally treated as a full path in the env launchers
 :: do to changes in o3de, external engine/project/gem folder structures, etc.
-IF "%LY_PROJECT%"=="" (
+IF "%O3DE_PROJECT_PATH%"=="" (
-    for %%i in ("%~dp0..") do set "LY_PROJECT=%%~fi"
+    for %%i in ("%~dp0..") do set "O3DE_PROJECT_PATH=%%~fi"
     )
-echo     LY_PROJECT = %LY_PROJECT%
+echo     O3DE_PROJECT_PATH = %O3DE_PROJECT_PATH%
 
-:: this is here for archaic reasons, WILL DEPRECATE
+:: Change to root O3DE dev dir
-IF "%LY_PROJECT_PATH%"=="" (set LY_PROJECT_PATH=%LY_PROJECT%)
+IF "%O3DE_DEV%"=="" echo     ~ You must set O3DE_DEV in a User_Env.bat to match your local engine repo!
-echo     LY_PROJECT_PATH = %LY_PROJECT_PATH%
+IF "%O3DE_DEV%"=="" echo     ~ Using default O3DE_DEV=C:\Depot\o3de-engine
+IF "%O3DE_DEV%"=="" (set O3DE_DEV=C:\Depot\o3de-engine)
+echo     O3DE_DEV = %O3DE_DEV%
 
-:: Change to root Lumberyard dev dir
+CALL %O3DE_DEV%\Gems\AtomLyIntegration\TechnicalArt\DccScriptingInterface\Tools\Dev\Windows\Env_Maya.bat
-:: You must set this in a User_Env.bat to match youe engine repo location!
-IF "%LY_DEV%"=="" (set LY_DEV=C:\Depot\o3de-engine)
-echo     LY_DEV = %LY_DEV%
-
-CALL %LY_DEV%\Gems\AtomLyIntegration\TechnicalArt\DccScriptingInterface\Launchers\Windows\Env_Maya.bat
 
 :: Restore original directory
 popd

Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Tools/Dev/Windows/Env_Maya.bat

@@ -46,7 +46,7 @@ echo     DCCSI_PY_VERSION_RELEASE = %DCCSI_PY_VERSION_RELEASE%
 echo     DCCSI_MAYA_VERSION = %DCCSI_MAYA_VERSION%
 
 :::: Set Maya native project acess to this project
-IF "%MAYA_PROJECT%"=="" (set MAYA_PROJECT=%O3DE_PROJECT%)
+IF "%MAYA_PROJECT%"=="" (set MAYA_PROJECT=%O3DE_PROJECT_PATH%)
 echo     MAYA_PROJECT = %MAYA_PROJECT%
 
 :: maya sdk path