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

Merge master into develop #6530

Merged
merged 2 commits into from
Apr 3, 2024
Merged

Merge master into develop #6530

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4553b96
Removed installation of unused dependencies (#6529)
omichel Apr 2, 2024
ba21c2d
Merge branch 'develop' into sync-master-4553b962a
omichel Apr 3, 2024
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
8 changes: 0 additions & 8 deletions scripts/install/bash_profile.windows
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,6 @@ export WEBOTS_DISABLE_SAVE_SCREEN_PERSPECTIVE_ON_CLOSE=1 # If defined, Webots w
export WEBOTS_ALLOW_MODIFY_INSTALLATION=1 # If defined, you are allowed to modify files in the Webots home using Webots.


############################################################################
# These aliases are useful in combination with the Atom source code editor #
############################################################################

alias atom="PATH=/mingw64/bin:/usr/bin:/C/WINDOWS/system32 /C/Users/$USER/AppData/Local/atom/bin/atom.cmd"
alias reset_atom="edit --clear-window-state"


####################################################################################################
# These aliases / environment variables allow to easily switch between a two webots source folders #
####################################################################################################
Expand Down
3 changes: 0 additions & 3 deletions scripts/install/msys64_installer.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,7 @@ declare -a OPTIONAL_PACKAGES=(
"git" # Distribution script (check_submodules_update.sh)
"pacman-contrib" # Distribution script (pactree)
"swig" # Python and Java API wrappers
"mingw-w64-x86_64-libssh" # Robotis OP2 robot window
"mingw-w64-x86_64-libzip" # Robotis OP2 robot window
"mingw-w64-x86_64-boost" # to recompile ROS controller
"mingw-w64-x86_64-cmake" # Thymio II dashel library
"mingw-w64-x86_64-python-pip" # Useful for advanced python usage
)

Expand Down
Loading