ros-gbp / bfl-release

Release of Bayesian Filtering Library for ROS
25 stars 20 forks source link

hydro system release broken #4

Closed piyushk closed 11 years ago

piyushk commented 11 years ago

The current hydro system release of bfl is broken. The patches from groovy need to be ported over to hydro. The process is explained here: http://answers.ros.org/question/63186/how-do-i-release-a-3rd-party-library-to-hydro-with-the-same-patches-as-groovy/

@wjwwood If I am not mistaken, I should be able to port the patches on a fork and submit a pull request for the releases/hydro/bfl branch. Do you foresee any problems? This would just mean that only git-bloom-patch and git-bloom-release should be left to be run.

wjwwood commented 11 years ago

@piyushk You would need to modify two branches, I am fixing it right now.

wjwwood commented 11 years ago

https://github.com/ros/rosdistro/pull/1128

wjwwood commented 11 years ago

Comment here if that doesn't fix your problem.

piyushk commented 11 years ago

Awesome! I can compile navigation in Hydro against releases/hydro/bfl. Could you comment on what 2 branches were required to be modified? I can see that you merged in patches that were committed to releases/groovy/bfl. What was the other branch that needed to be changed? All the other changes appear automated.

I'll document this on the bloom 3rd party release page.

wjwwood commented 11 years ago

Well you need to move the patches to the hydro patch branch and then you need to import them to the corresponding release branch, otherwise they will get overwritten. This is what I did:

$ git checkout patches/release/groovy/bfl
$ mkdir /tmp/bfl_patches
$ cp *.patch /tmp/bfl_patches
$ git checkout patches/release/hydro/bfl
$ cp /tmp/bfl_patches/* ./
$ git add .
$ git commit -m "Importing patches from groovy release branch"
$ git checkout release/hydro/bfl
$ git-bloom-patch import
$ git push --all
$ git push --tags

Then I did a normal bloom-release:

$ bloom-release -t hydro -r hydro bfl
piyushk commented 11 years ago

Thanks. I've documented this at http://ros.org/wiki/bloom/Tutorials/ReleaseThirdParty