Skip to content

Commit

Permalink
Debug
Browse files Browse the repository at this point in the history
Signed-off-by: Jose Luis Rivero <jrivero@honurobotics.com>
  • Loading branch information
j-rivero committed Dec 13, 2024
1 parent 8a27594 commit fdfc033
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 10 deletions.
10 changes: 6 additions & 4 deletions jenkins-scripts/lib/colcon-default-devel-windows.bat
Original file line number Diff line number Diff line change
Expand Up @@ -91,15 +91,17 @@ if defined USE_PIXI (


echo # BEGIN SECTION: pixi: custom environment variable for gz
set "OGRE_RESOURCE_PATH=%CONDA_PREFIX%\Library\bin"
if "%%CONDA_PREFIX%%"=="" (
if "!CONDA_PREFIX!"=="" (
echo # BEGIN SECTION: ERROR: CONDA_PREFIX is not set
echo CONDA_PREFIX variable was not set. Please set it before calling this script
echo # END SECTION
goto :error
)
set OGRE_RESOURCE_PATH=%%CONDA_PREFIX%%\Library\bin
set OGRE2_RESOURCE_PATH=%%CONDA_PREFIX%%\Library\bin\OGRE-Next
@echo on
set OGRE_RESOURCE_PATH=!CONDA_PREFIX!\Library\bin
set OGRE2_RESOURCE_PATH=!CONDA_PREFIX!\Library\bin\OGRE-Next
@echo off
echo "OGRE2_RESOURCE_PATH is %OGRE2_RESOURCE_PATH%"
echo # END SECTION
) else (
:: Call vcvarsall and all the friends
Expand Down
8 changes: 2 additions & 6 deletions jenkins-scripts/lib/windows_library.bat
Original file line number Diff line number Diff line change
Expand Up @@ -427,11 +427,7 @@ call hooks.bat
:: if errorlevel 1 exit EXTRA_EXIT_PARAM 1
popd
echo "End popd"
:: TODO: DBG_LAST_BUILD_FILE support for debugging only if local_build.bat
:: was called. Support the reproducible in Jenkins too
if defined DBG_LAST_BUILD_FILE (
echo call %PIXI_PROJECT_PATH%\hooks.bat > %DBG_LAST_BUILD_FILE%
)
echo "end function"
goto :EOF

:: ##################################
Expand All @@ -452,4 +448,4 @@ goto :EOF
:error - error routine
::
echo Failed in windows_library with error #%errorlevel%.
exit %EXTRA_EXIT_PARAM% %errorlevel%
exit %EXTRA_EXIT_PARAM% %errorlevel%

0 comments on commit fdfc033

Please sign in to comment.