Re: problem with compiling jstar

[Radu Grigore]

On Wed, Jan 26, 2011 at 12:37 PM, Matko Botincan <mb...@cam.ac.uk> wrote:
> Another guess at the earlier context -- which version of ocaml are you
> running?
> Support for native dynlink in ocaml build is a 3.12.0 feature.

So we change the requirements to OCaml >=3.12?

[Radu Grigore]

On Wed, Jan 26, 2011 at 9:49 AM, Dino Distefano
<dino.di...@eecs.qmul.ac.uk> wrote:
> What do you guys think? Time to release?

I created a release branch, after discussing with Dino. Please merge
into it only bug-fixes, so that at the end of February we can release
what's in there. This should not place much strain on how you usually
work: You need to make sure that you commit bug-fixes separately (not
bundled with other code changes) and you need to cherry pick the
bug-fix commits into the release branch. More bla-bla here [1], but
only if you have time to waste.

Git stuff:
0. Track the release branch:
git branch --track origin/release-2011-02
1. Work in your branch as usual. When you fix a bug use "git gui" to
commit exactly the code related to the fix. Write down the COMMIT_ID
of the bug fix. Go on and commit your other stuff.
2. Cherry pick into the release branch:
git checkout release-2011-02
git cherry-pick COMMIT_ID
3. Test. If the fix doesn't work in this branch the easiest thing is
to put the cherries back in the tree.
git --hard reset HEAD^
The other option is to think about what's going wrong.

I'll do the boring packaging stuff.

regards,
radu

[1] http://producingoss.com/en/producingoss.html#release-branches