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

Sierra indigo issue73 #74

Closed
wants to merge 24 commits into from
Closed

Sierra indigo issue73 #74

Changes from 4 commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
622c54a
Five fixes for compiling indigo with Sierra 10.12 and XCode 8.1.
lloydc99 Dec 3, 2016
d97f72d
Add some switches for sierra and indigo.
lloydc99 Dec 3, 2016
c3d3c9c
Re-use sierra if
lloydc99 Dec 3, 2016
f2b7cfa
Figure out version for matplotlib link.
lloydc99 Dec 3, 2016
96405c2
Fork cartr's qt4 formula and add a bottle.
lloydc99 Dec 5, 2016
2d72816
Debug info for Sierra actions.
lloydc99 Dec 5, 2016
ae396ea
Invert version string comparison.
lloydc99 Dec 5, 2016
3265c06
Revert pyqt skip logic and add Xcode8.1 test to Travis
lloydc99 Dec 5, 2016
cd8a413
Fix typo in travis config.
lloydc99 Dec 5, 2016
371b30a
Mis-read diff, skip is not required for non-sierra. Fixed qt deps.
lloydc99 Dec 5, 2016
3dc7d97
Tap my repo copy instead of installing one piece.
lloydc99 Dec 5, 2016
39924e8
Add custom qt for 10.11 and remove cache for travis.
lloydc99 Dec 6, 2016
a2722e5
Add El Capitan bottles.
Dec 7, 2016
f9971ad
Try with all the bottles now.
lloydc99 Dec 8, 2016
0708517
Change to supported version.
lloydc99 Dec 8, 2016
91603ea
Try to remove f2py cruft in travis bulid and only rebuild the failing…
lloydc99 Dec 9, 2016
6b48342
Remove with prejudice
lloydc99 Dec 9, 2016
0a39a2f
Try this fix from homebrew simulation to deal with long build times.
lloydc99 Dec 18, 2016
c15b1d9
See if new bottles fix some travis errors.
lloydc99 Jan 2, 2017
d9b46af
Explicitly use cartr/qt4 and custom simulation.
lloydc99 Jan 29, 2017
b300e5a
Fix spurious c++ include in /usr/local
lloydc99 Jan 29, 2017
a00351c
Try a smaller build.
lloydc99 Feb 6, 2017
5aadb70
Clean up deps for reorged repos.
lloydc99 Mar 12, 2017
f0e9564
Add custom repo for gazebo, remove ros comm patch.
lloydc99 Apr 6, 2017
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
28 changes: 26 additions & 2 deletions install
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,13 @@ do_install()
# Homebrew python gets us bottles for numpy, scipy, etc.
brew tap homebrew/python

# Sierra no longer has a working qt4 so use this private version until the issue is resolved.
if [[ `sw_vers -productVersion` > "10.11" ]]
then
brew install cartr/qt4/qt
SKIP_KEYS="--skip-keys=pyqt"
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My preference would be to handle this via a rosdep override, if possible.

@wjwwood Is rosdep able to tell apart different versions of OS X the way it can different versions of Ubuntu?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm guessing you mean putting the brew in a rosdep.
I think I still need the SKIP_KEYS.

Would you want to switch the rosdep override based on osx version here in the script?

fi

# ROS infrastructure tools
brew install libyaml || true
pip install -U setuptools rosdep rosinstall_generator wstool rosinstall catkin_tools bloom empy sphinx pycurl
Expand Down Expand Up @@ -140,8 +147,24 @@ do_install()
popd
fi

# Fix header problem in ros_comm until patch is pushed into indigo.
# https://github.com/ros/ros_comm/commit/74674c49a64abbdcdd5aeea016997af2959c6f05
if [ "$ROS_DISTRO" == "indigo" ]; then
echo "Fix header problem in ros_comm indigo until patch is pushed."
if [ -d src/ros_comm/rosconsole ]; then
pushd src/ros_comm/rosconsole
curl https://gist.githubusercontent.com/lloydc99/da3b16f8afe49dd5b059dcf19f79ddc6/raw/ec566b0aac2e914164d2262f72182f9a171c3f94/ros_comm_vector.patch | patch -p1
popd
fi
fi

# Package dependencies.
rosdep install --from-paths src --ignore-src --rosdistro ${ROS_DISTRO} -y --as-root pip:no --skip-keys=python-qt-bindings-qwt5
rosdep install --from-paths src --ignore-src --rosdistro ${ROS_DISTRO} -y --as-root pip:no --skip-keys=python-qt-bindings-qwt5 ${SKIP_KEYS}

# Fix for strange lack of nosetests in osx, kindof hackish
if [ -z `which nosetests` ]; then
ln -s /usr/local/Cellar/matplotlib/$(python -c "import matplotlib; print matplotlib.__version__")/libexec/bin/nosetests /usr/local/bin
fi

# Clean out or create the install directory.
if [ -d ${ROS_INSTALL_DIR} ]; then
Expand All @@ -154,6 +177,7 @@ do_install()

# Parallel build.
catkin config --install --install-space ${ROS_INSTALL_DIR} --cmake-args \
-DCMAKE_FIND_FRAMEWORK=LAST \
-DCATKIN_ENABLE_TESTING=1 \
-DCMAKE_BUILD_TYPE=Release \
-DPYTHON_LIBRARY=$(python -c "import sys; print sys.prefix")/lib/libpython2.7.dylib \
Expand All @@ -165,7 +189,7 @@ do_install()
echo
echo " source ${ROS_INSTALL_DIR}/setup.bash"
echo

# Check for SIP if on OSX/macOS 10.11 (El Capitan) or later
if [[ `sw_vers -productVersion` > "10.10" ]]
then
Expand Down