Created by Henrik Ingo and last modified
Get this branch:
bzr branch lp:~hingo/drizzle/drizzle-the-version-is-7.1-not-a-date-and-certainly-not-7
Only Henrik Ingo can upload to this branch. If you are Henrik Ingo please log in for upload directions.

Branch merges

Related bugs

Related blueprints

Branch information

Henrik Ingo

Recent revisions

2500. By Henrik Ingo

Changing the version information for symbols was a mistake and
causes grief especially in debian packaging. We will continue
to call the ABI as "DRIZZLE7" for now.

2499. By Henrik Ingo

1) Add support for using the descriptive appendixes -stable, -rc, -beta,
-alpha and -milestone in bzr tags used to tag releases.

bzr tag 7.1.31-beta

In particular, a later non-release build from the bzr source tree will
correctly remove the appendix to produce a version like:

Oh yes, non-release builds automatically append -snapshot.

If you continue to do non-appendix tags like 7.1.31 then things will
also just continue to work.

2) Allow to use single digit minor version (2) and build number (3).
(I also allow you to use single digit major version (1) but there is
no code that does anything special about that...)

bzr tag 1.2.3

Will produce PANDORA_RELEASE_ID 10203
which in turn will make this value appear in the drizzled variable

Previously the version numbers had to always be the same amount of
digits, we used yyyy.mm.bb

This is important since release id's without the prepended zeroes
would have been ambiguous:
1.2.34 -> 1234
1.23.4 -> 1234

It is still allowed to continue using always double digit versions:
bzr tag 1.02.03
We should be consistent in always using either or.

2498. By Henrik Ingo

Pandora-build is designed to create release version numbers with
3 levels: xx.yy.zz. A tarball with such a release number is created
automatically if a bzr tag with such a number is present:

bzr tag xx.yy.zz
config/autorun.sh && ./configure && make dist

...would generate drizzle-xx.yy.zz.tar.gz

Our process then goes on to test this tarball, publish it,
commit the tag and push it to trunk.

In particular, xx.yy.zz is taken from the output of

bzr tags -r-1

If no tag is present in the current uncommitted working tree, then
a four-level version number is generated, with the last number being
the output of `bzr revno`:


This commit adds support for an alternative use case: If you have a bzr
branch where the most recent commit includes the tag, and you haven't
done any changes to the branch (brz diff outputs nothing), then make
dist will also generate a 3 level version numbered tar ball.

This enables a process where we use Jenkins to do our source releases:

 - Check that latest runs in Jenkins are all passing.
 - Do bzr tag xx.yy.zz, commit and push to trunk.
 - Have a coffee while Jenkins creates a tar ball.
 - Take a copy of the tar ball from Jenkins and publish it.

2497. By Henrik Ingo

Previous sweep seems to work bueno. Just update .bzrignore with 2 new
filenames and we are done with the first step.

2496. By Henrik Ingo

First sweep: Move any occurence of drizzle7 in any kind of file to
just drizzle, and the same for drizzled7 to drizzled. Then do the same for
filenames. In the makefile some symlinking of drizzled vs drizzled7 can
simply be removed now.

This commit doesn't include any testing yet.

2491. By Patrick Crews

Tagged 2012.01.30 release

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
Stacked on:
This branch contains Public information 
Everyone can see this information.