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.

Sign up for GitHub

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

Jump to bottom

Fix ign server -s on Windows (take two) #52

Merged
merged 14 commits into from
Oct 20, 2022
Merged

Fix ign server -s on Windows (take two) #52

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
8bd13ae
Update enable_win_ign.patch
traversaro Oct 19, 2022
3e41d1d
Update meta.yaml
traversaro Oct 19, 2022
788ed28
Fix cmdmodel6.rb and cmdgazebo6.rb containing the same code
traversaro Oct 19, 2022
7d53cfd
Update conda-forge.yml
traversaro Oct 19, 2022
e0aac9c
MNT: Re-rendered with conda-build 3.22.0, conda-smithy 3.21.2, and co…
Oct 19, 2022
7dd43be
Update meta.yaml
traversaro Oct 20, 2022
71024cd
Create activate.msh
traversaro Oct 20, 2022
72fe1e3
Create deactivate.msh
traversaro Oct 20, 2022
cbfb8c7
Update bld.bat
traversaro Oct 20, 2022
3002096
Update meta.yaml
traversaro Oct 20, 2022
bafc5db
Update activate.msh
traversaro Oct 20, 2022
3647c71
Update deactivate.msh
traversaro Oct 20, 2022
cefae0a
Update activate.msh
traversaro Oct 20, 2022
e870c92
Update deactivate.msh
traversaro Oct 20, 2022
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
33 changes: 32 additions & 1 deletion .azure-pipelines/azure-pipelines-linux.yml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

33 changes: 32 additions & 1 deletion .azure-pipelines/azure-pipelines-osx.yml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

28 changes: 28 additions & 0 deletions .azure-pipelines/azure-pipelines-win.yml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

80 changes: 80 additions & 0 deletions .scripts/create_conda_build_artifacts.bat
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

113 changes: 113 additions & 0 deletions .scripts/create_conda_build_artifacts.sh
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions conda-forge.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,5 @@ github:
branch_name: main
tooling_branch_name: main
test: native_and_emulated
azure:
store_build_artifacts: true
11 changes: 11 additions & 0 deletions recipe/activate.msh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
if_(is_set("COMSPEC")).then_([
sys.list_append("IGN_GAZEBO_SYSTEM_PLUGIN_PATH", path.join(env("CONDA_PREFIX"), "Library\\lib\\ign-gazebo-6\\plugins")),
sys.list_append("IGN_GUI_PLUGIN_PATH", path.join(env("CONDA_PREFIX"), "Library\\lib\\ign-gazebo-6\\plugins\\gui")),
sys.list_append("IGN_GAZEBO_RESOURCE_PATH", path.join(env("CONDA_PREFIX"), "Library\\share\\ignition\\ignition-gazebo6\\worlds")),
sys.list_append("IGN_GAZEBO_PHYSICS_ENGINE_PATH", path.join(env("CONDA_PREFIX"), "Library\\lib\\ign-physics-5\\engine-plugins")),
]).else_([
sys.list_append("IGN_GAZEBO_SYSTEM_PLUGIN_PATH", path.join(env("CONDA_PREFIX"), "lib/ign-gazebo-6/plugins")),
sys.list_append("IGN_GUI_PLUGIN_PATH", path.join(env("CONDA_PREFIX"), "lib/ign-gazebo-6/plugins/gui")),
sys.list_append("IGN_GAZEBO_RESOURCE_PATH", path.join(env("CONDA_PREFIX"), "share/ignition/ignition-gazebo6/worlds")),
sys.list_append("IGN_GAZEBO_PHYSICS_ENGINE_PATH", path.join(env("CONDA_PREFIX"), "lib/ign-physics-5/engine-plugins")),
])
28 changes: 28 additions & 0 deletions recipe/bld.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,31 @@ if errorlevel 1 exit 1
:: Install.
cmake --build . --config Release --target install
if errorlevel 1 exit 1

setlocal EnableDelayedExpansion
:: Just on Windows, binary relocation is not working properly so we use environment variables
:: to specify the location of resources installed by ign-gazebo
:: Generate and copy the [de]activate scripts to %PREFIX%\etc\conda\[de]activate.d.
:: This will allow them to be run on environment activation.
for %%F in (activate deactivate) DO (
multisheller %RECIPE_DIR%\%%F.msh --output .\%%F

if not exist %PREFIX%\etc\conda\%%F.d mkdir %PREFIX%\etc\conda\%%F.d
copy %%F.bat %PREFIX%\etc\conda\%%F.d\%PKG_NAME%_%%F.bat
if %errorlevel% neq 0 exit /b %errorlevel%

copy %%F.sh %PREFIX%\etc\conda\%%F.d\%PKG_NAME%_%%F.sh
if %errorlevel% neq 0 exit /b %errorlevel%

copy %%F.bash %PREFIX%\etc\conda\%%F.d\%PKG_NAME%_%%F.bash
if %errorlevel% neq 0 exit /b %errorlevel%

copy %%F.ps1 %PREFIX%\etc\conda\%%F.d\%PKG_NAME%_%%F.ps1
if %errorlevel% neq 0 exit /b %errorlevel%

copy %%F.xsh %PREFIX%\etc\conda\%%F.d\%PKG_NAME%_%%F.xsh
if %errorlevel% neq 0 exit /b %errorlevel%

copy %%F.zsh %PREFIX%\etc\conda\%%F.d\%PKG_NAME%_%%F.zsh
if %errorlevel% neq 0 exit /b %errorlevel%
)
11 changes: 11 additions & 0 deletions recipe/deactivate.msh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
if_(is_set("COMSPEC")).then_([
sys.list_remove("IGN_GAZEBO_SYSTEM_PLUGIN_PATH", path.join(env("CONDA_PREFIX"), "Library\\lib\\ign-gazebo-6\\plugins")),
sys.list_remove("IGN_GUI_PLUGIN_PATH", path.join(env("CONDA_PREFIX"), "Library\\lib\\ign-gazebo-6\\plugins\\gui")),
sys.list_remove("IGN_GAZEBO_RESOURCE_PATH", path.join(env("CONDA_PREFIX"), "Library\\share\\ignition\\ignition-gazebo6\\worlds")),
sys.list_remove("IGN_GAZEBO_PHYSICS_ENGINE_PATH", path.join(env("CONDA_PREFIX"), "Library\\lib\\ign-physics-5\\engine-plugins")),
]).else_([
sys.list_remove("IGN_GAZEBO_SYSTEM_PLUGIN_PATH", path.join(env("CONDA_PREFIX"), "lib/ign-gazebo-6/plugins")),
sys.list_remove("IGN_GUI_PLUGIN_PATH", path.join(env("CONDA_PREFIX"), "lib/ign-gazebo-6/plugins/gui")),
sys.list_remove("IGN_GAZEBO_RESOURCE_PATH", path.join(env("CONDA_PREFIX"), "share/ignition/ignition-gazebo6/worlds")),
sys.list_remove("IGN_GAZEBO_PHYSICS_ENGINE_PATH", path.join(env("CONDA_PREFIX"), "lib/ign-physics-5/engine-plugins")),
])
Loading