lp:~hingo/drizzle/drizzle-the-version-is-7.1-not-a-date-and-certainly-not-7

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~drizzle-trunk/drizzle/development

Vijay Samuel: Needs Fixing on 2012-02-05

Mark Atwood: Needs Fixing on 2012-02-05

Drizzle Merge Team: Pending requested 2012-01-30

Diff: 304 lines (+50/-40)

15 files modified

.bzrignore (+2/-0)
Makefile.am (+1/-15)
client/drizzle.cc (+2/-2)
client/drizzledump.cc (+2/-2)
configure.ac (+2/-2)
docs/installing/redhat.rst (+3/-1)
drizzled/main.cc (+2/-2)
drizzled/sys_var.cc (+4/-4)
m4/pandora_vc_build.m4 (+23/-3)
plugin/auth_ldap/docs/index.rst (+3/-3)
plugin/innobase/xtrabackup/xtrabackup.cc (+1/-1)
support-files/drizzle.pc.in (+1/-1)
support-files/include.am (+1/-1)
tests/valgrind.supp (+2/-2)
win32/config.h (+1/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #913267: We are releasing 7.1 beta releases with the package name drizzle7	Undecided	Fix Released
Bug #913276: Tag releases as stable, rc, beta, alpha, milestone, snapshot	Undecided	Fix Released

Link a bug report

Related blueprints

2500. By Henrik Ingo on 2012-02-03

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 on 2012-01-30

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

Example:
bzr tag 7.1.31-beta
produces
drizzle-7.1.31-beta.tar.gz

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

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...)

Example
bzr tag 1.2.3

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

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 on 2012-01-29

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`:

drizzle-xx.yy.zz.revno.tar.gz

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 on 2012-01-29

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 on 2012-01-28

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.

2495. By Mark Atwood on 2012-01-22

merge lp:~hingo/drizzle/drizzle-rescue-drizzle_password_hash

2494. By Mark Atwood on 2012-01-21

merge lp:~daniel-nichter/drizzle/fix-bug-916567

2493. By Mark Atwood on 2012-01-16

merge lp:~stewart/drizzle/bug911643

2492. By Mark Atwood on 2012-01-14

merge lp:~brianaker/drizzle/shift-out-enum-libdrizle

2491. By Patrick Crews on 2012-01-14

Tagged 2012.01.30 release