Skip to content

Commit

Permalink
Invoke 'git' in batch build scripts as 'call git', to properly work i…
Browse files Browse the repository at this point in the history 
…n environments (like Google depot_tools) where git is provided as git.bat wrapper around real git.exe.

Both approaches works for git.exe, but for git.bat calling it simply as 'git' will replace and stop execution of the parent batch script, but 'call git' will properly nest execution
  • Loading branch information
@eugenegff
eugenegff authored and Eugene Golushkov committed Dec 20, 2024
1 parent f372883 commit 633999a
Show file tree
Hide file tree
Showing 11 changed files with 21 additions and 21 deletions.
2 changes: 1 addition & 1 deletion Scripts/BuildScripts/build_ci_windows.bat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ echo %PYTHONPATH%
IF NOT EXIST %BUILD_FOLDER%\..\ogre-next-deps (
mkdir %BUILD_FOLDER%\..\ogre-next-deps
echo --- Cloning ogre-next-deps ---
git clone --recurse-submodules --shallow-submodules https://github.com/OGRECave/ogre-next-deps %BUILD_FOLDER%\..\ogre-next-deps
call git clone --recurse-submodules --shallow-submodules https://github.com/OGRECave/ogre-next-deps %BUILD_FOLDER%\..\ogre-next-deps

mkdir %BUILD_FOLDER%\..\ogre-next-deps\build
cd %BUILD_FOLDER%\..\ogre-next-deps\build
Expand Down
4 changes: 2 additions & 2 deletions Scripts/BuildScripts/build_ogre.bat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ cd Ogre
IF NOT EXIST ogre-next-deps (
mkdir ogre-next-deps
echo --- Cloning ogre-next-deps ---
git clone --recurse-submodules --shallow-submodules https://github.com/OGRECave/ogre-next-deps
call git clone --recurse-submodules --shallow-submodules https://github.com/OGRECave/ogre-next-deps
) ELSE (
echo --- ogre-next-deps repo detected. Cloning skipped ---
)
Expand All @@ -45,7 +45,7 @@ echo --- Building ogre-next-deps ---
cd ../../
IF NOT EXIST ogre-next (
echo --- Cloning Ogre {0} ---
git clone --branch %OGRE_BRANCH_NAME% https://github.com/OGRECave/ogre-next
call git clone --branch %OGRE_BRANCH_NAME% https://github.com/OGRECave/ogre-next
)
cd ogre-next
IF NOT EXIST Dependencies (
Expand Down
4 changes: 2 additions & 2 deletions Scripts/BuildScripts/output/build_ogre_Visual_Studio_14_2015_Win32.bat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ cd Ogre
IF NOT EXIST ogre-next-deps (
mkdir ogre-next-deps
echo --- Cloning ogre-next-deps ---
git clone --recurse-submodules --shallow-submodules https://github.com/OGRECave/ogre-next-deps
call git clone --recurse-submodules --shallow-submodules https://github.com/OGRECave/ogre-next-deps
) ELSE (
echo --- ogre-next-deps repo detected. Cloning skipped ---
)
Expand All @@ -45,7 +45,7 @@ echo --- Building ogre-next-deps ---
cd ../../
IF NOT EXIST ogre-next (
echo --- Cloning Ogre master ---
git clone --branch %OGRE_BRANCH_NAME% https://github.com/OGRECave/ogre-next
call git clone --branch %OGRE_BRANCH_NAME% https://github.com/OGRECave/ogre-next
)
cd ogre-next
IF NOT EXIST Dependencies (
Expand Down
4 changes: 2 additions & 2 deletions Scripts/BuildScripts/output/build_ogre_Visual_Studio_14_2015_x64.bat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ cd Ogre
IF NOT EXIST ogre-next-deps (
mkdir ogre-next-deps
echo --- Cloning ogre-next-deps ---
git clone --recurse-submodules --shallow-submodules https://github.com/OGRECave/ogre-next-deps
call git clone --recurse-submodules --shallow-submodules https://github.com/OGRECave/ogre-next-deps
) ELSE (
echo --- ogre-next-deps repo detected. Cloning skipped ---
)
Expand All @@ -45,7 +45,7 @@ echo --- Building ogre-next-deps ---
cd ../../
IF NOT EXIST ogre-next (
echo --- Cloning Ogre master ---
git clone --branch %OGRE_BRANCH_NAME% https://github.com/OGRECave/ogre-next
call git clone --branch %OGRE_BRANCH_NAME% https://github.com/OGRECave/ogre-next
)
cd ogre-next
IF NOT EXIST Dependencies (
Expand Down
4 changes: 2 additions & 2 deletions Scripts/BuildScripts/output/build_ogre_Visual_Studio_15_2017_Win32.bat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ cd Ogre
IF NOT EXIST ogre-next-deps (
mkdir ogre-next-deps
echo --- Cloning ogre-next-deps ---
git clone --recurse-submodules --shallow-submodules https://github.com/OGRECave/ogre-next-deps
call git clone --recurse-submodules --shallow-submodules https://github.com/OGRECave/ogre-next-deps
) ELSE (
echo --- ogre-next-deps repo detected. Cloning skipped ---
)
Expand All @@ -45,7 +45,7 @@ echo --- Building ogre-next-deps ---
cd ../../
IF NOT EXIST ogre-next (
echo --- Cloning Ogre master ---
git clone --branch %OGRE_BRANCH_NAME% https://github.com/OGRECave/ogre-next
call git clone --branch %OGRE_BRANCH_NAME% https://github.com/OGRECave/ogre-next
)
cd ogre-next
IF NOT EXIST Dependencies (
Expand Down
4 changes: 2 additions & 2 deletions Scripts/BuildScripts/output/build_ogre_Visual_Studio_15_2017_x64.bat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ cd Ogre
IF NOT EXIST ogre-next-deps (
mkdir ogre-next-deps
echo --- Cloning ogre-next-deps ---
git clone --recurse-submodules --shallow-submodules https://github.com/OGRECave/ogre-next-deps
call git clone --recurse-submodules --shallow-submodules https://github.com/OGRECave/ogre-next-deps
) ELSE (
echo --- ogre-next-deps repo detected. Cloning skipped ---
)
Expand All @@ -45,7 +45,7 @@ echo --- Building ogre-next-deps ---
cd ../../
IF NOT EXIST ogre-next (
echo --- Cloning Ogre master ---
git clone --branch %OGRE_BRANCH_NAME% https://github.com/OGRECave/ogre-next
call git clone --branch %OGRE_BRANCH_NAME% https://github.com/OGRECave/ogre-next
)
cd ogre-next
IF NOT EXIST Dependencies (
Expand Down
4 changes: 2 additions & 2 deletions Scripts/BuildScripts/output/build_ogre_Visual_Studio_16_2019_Win32.bat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ cd Ogre
IF NOT EXIST ogre-next-deps (
mkdir ogre-next-deps
echo --- Cloning ogre-next-deps ---
git clone --recurse-submodules --shallow-submodules https://github.com/OGRECave/ogre-next-deps
call git clone --recurse-submodules --shallow-submodules https://github.com/OGRECave/ogre-next-deps
) ELSE (
echo --- ogre-next-deps repo detected. Cloning skipped ---
)
Expand All @@ -45,7 +45,7 @@ echo --- Building ogre-next-deps ---
cd ../../
IF NOT EXIST ogre-next (
echo --- Cloning Ogre master ---
git clone --branch %OGRE_BRANCH_NAME% https://github.com/OGRECave/ogre-next
call git clone --branch %OGRE_BRANCH_NAME% https://github.com/OGRECave/ogre-next
)
cd ogre-next
IF NOT EXIST Dependencies (
Expand Down
4 changes: 2 additions & 2 deletions Scripts/BuildScripts/output/build_ogre_Visual_Studio_16_2019_x64.bat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ cd Ogre
IF NOT EXIST ogre-next-deps (
mkdir ogre-next-deps
echo --- Cloning ogre-next-deps ---
git clone --recurse-submodules --shallow-submodules https://github.com/OGRECave/ogre-next-deps
call git clone --recurse-submodules --shallow-submodules https://github.com/OGRECave/ogre-next-deps
) ELSE (
echo --- ogre-next-deps repo detected. Cloning skipped ---
)
Expand All @@ -45,7 +45,7 @@ echo --- Building ogre-next-deps ---
cd ../../
IF NOT EXIST ogre-next (
echo --- Cloning Ogre master ---
git clone --branch %OGRE_BRANCH_NAME% https://github.com/OGRECave/ogre-next
call git clone --branch %OGRE_BRANCH_NAME% https://github.com/OGRECave/ogre-next
)
cd ogre-next
IF NOT EXIST Dependencies (
Expand Down
4 changes: 2 additions & 2 deletions Scripts/BuildScripts/output/build_ogre_Visual_Studio_17_2022_ARM64.bat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ cd Ogre
IF NOT EXIST ogre-next-deps (
mkdir ogre-next-deps
echo --- Cloning ogre-next-deps ---
git clone --recurse-submodules --shallow-submodules https://github.com/OGRECave/ogre-next-deps
call git clone --recurse-submodules --shallow-submodules https://github.com/OGRECave/ogre-next-deps
) ELSE (
echo --- ogre-next-deps repo detected. Cloning skipped ---
)
Expand All @@ -45,7 +45,7 @@ echo --- Building ogre-next-deps ---
cd ../../
IF NOT EXIST ogre-next (
echo --- Cloning Ogre master ---
git clone --branch %OGRE_BRANCH_NAME% https://github.com/OGRECave/ogre-next
call git clone --branch %OGRE_BRANCH_NAME% https://github.com/OGRECave/ogre-next
)
cd ogre-next
IF NOT EXIST Dependencies (
Expand Down
4 changes: 2 additions & 2 deletions Scripts/BuildScripts/output/build_ogre_Visual_Studio_17_2022_Win32.bat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ cd Ogre
IF NOT EXIST ogre-next-deps (
mkdir ogre-next-deps
echo --- Cloning ogre-next-deps ---
git clone --recurse-submodules --shallow-submodules https://github.com/OGRECave/ogre-next-deps
call git clone --recurse-submodules --shallow-submodules https://github.com/OGRECave/ogre-next-deps
) ELSE (
echo --- ogre-next-deps repo detected. Cloning skipped ---
)
Expand All @@ -45,7 +45,7 @@ echo --- Building ogre-next-deps ---
cd ../../
IF NOT EXIST ogre-next (
echo --- Cloning Ogre master ---
git clone --branch %OGRE_BRANCH_NAME% https://github.com/OGRECave/ogre-next
call git clone --branch %OGRE_BRANCH_NAME% https://github.com/OGRECave/ogre-next
)
cd ogre-next
IF NOT EXIST Dependencies (
Expand Down
4 changes: 2 additions & 2 deletions Scripts/BuildScripts/output/build_ogre_Visual_Studio_17_2022_x64.bat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ cd Ogre
IF NOT EXIST ogre-next-deps (
mkdir ogre-next-deps
echo --- Cloning ogre-next-deps ---
git clone --recurse-submodules --shallow-submodules https://github.com/OGRECave/ogre-next-deps
call git clone --recurse-submodules --shallow-submodules https://github.com/OGRECave/ogre-next-deps
) ELSE (
echo --- ogre-next-deps repo detected. Cloning skipped ---
)
Expand All @@ -45,7 +45,7 @@ echo --- Building ogre-next-deps ---
cd ../../
IF NOT EXIST ogre-next (
echo --- Cloning Ogre master ---
git clone --branch %OGRE_BRANCH_NAME% https://github.com/OGRECave/ogre-next
call git clone --branch %OGRE_BRANCH_NAME% https://github.com/OGRECave/ogre-next
)
cd ogre-next
IF NOT EXIST Dependencies (
Expand Down

0 comments on commit 633999a

Please sign in to comment.