Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[21009] Do not require PYTHON_VERSION to be defined in .bat files (backport #4770) #4798

Merged
merged 1 commit into from
May 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Do not require PYTHON_VERSION to be defined in .bat files (#4770)
Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>
(cherry picked from commit 39e8957)
  • Loading branch information
Mario-DL authored and mergify[bot] committed May 17, 2024
commit 704946b03f46b1069dbfdcdcca93a3c0c78c4a9f
15 changes: 8 additions & 7 deletions tools/fastdds/fastdds.bat
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,13 @@ if not %ERRORLEVEL%==0 (
)

:: Python version in the form "Major.Minor"
if %PYTHON_VERSION%=="" (
echo error retrieving python version. Please, make sure python is installed and accessible.
exit /B 65
)
if not "%PYTHON_VERSION%" == "" (
:: Use launcher to profit from shebang hints on fastdds.py
:: Select the correct python version to source the appropriate paths
py -%PYTHON_VERSION% "%dir%\..\tools\fastdds\fastdds.py" %args%
) else (
:: Use launcher to profit from shebang hints on fastdds.py
:: Select latest available python version
py "%dir%\..\tools\fastdds\fastdds.py" %args%
)

:: Use launcher to profit from shebang hints on fastdds.py
:: Select the correct python version to source the appropriate paths
py -%PYTHON_VERSION% "%dir%\..\tools\fastdds\fastdds.py" %args%
15 changes: 8 additions & 7 deletions tools/fastdds/ros-discovery.bat
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,13 @@ if not %ERRORLEVEL%==0 (
)

:: Python version in the form "Major.Minor"
if %PYTHON_VERSION%=="" (
echo error retrieving python version. Please, make sure python is installed and accessible.
exit /B 65
)
if not "%PYTHON_VERSION%" == "" (
:: Use launcher to profit from shebang hints on fastdds.py
:: Select the correct python version to source the appropriate paths
py -%PYTHON_VERSION% "%dir%\..\tools\fastdds\fastdds.py" discovery %args%
) else (
:: Use launcher to profit from shebang hints on fastdds.py
:: Select latest available python version
py "%dir%\..\tools\fastdds\fastdds.py" discovery %args%
)

:: Use launcher to profit from shebang hints on fastdds.py
:: Select the correct python version to source the appropriate paths
py -%PYTHON_VERSION% "%dir%\..\tools\fastdds\fastdds.py" discovery %args%
Loading