On Friday 21 November 2008, Jan Janak wrote:
On 21-11 03:46, Andrei Pelinescu-Onciul wrote:
Note that lib/sr_dbk includes all the history
from kamailio/openser
(if you run git log on lib/sr_dbk you'll see all the commits from svn
that touched db/).
I've also created a script that automatically converts a kamailio module
to sip-router. It adds -DKAMAILIO_MOD_INTERFACE to the Makefile and if
the module uses DB, it automatically fixes all the includes and adds the
link with libsk_dbk makefile magic.
(attached, it might make sense to have it on git, but I can't think of
a good place for it)
I just commited the stuff that I created. Basically it is the same
approach as yours, except that I went a bit further and added both db api
versions as libraries.
Furthermore I took both ser and kamailio mysql modules and integrated
them into a single db_mysql module which supports both versions of the db
API and links with both libraries.
[..]
Hi Jan,
unfortunally i was not able to take a closer look to the stuff you commited,
i'll try to comment later today. As already suggested i'd also think that we
should perhaps try to reduce the number of branches, otherwise its hard to
understand where the most up to date version is, what should be reviewed and
tested..
Don't worry, my version is pretty much the same as Andrei's and what has
already been described on the mailing list. The extra stuff that I did was
unifying the mysql driver module so that it exports both interfaces.
The point of this discussion was namely to agree on naming convertions
whether or not we want to go down that road. It seems to me that we have
consensus here so I will proceed a bit further.
Regarding git and branches, IMHO this kind of independent concurrent
development is one of the things git is really strong in. It does not really
matter how many branches each of us have, the only really important branch
at the moment is the master branch and all other features and developments
done on other (private) branches is nothing more than just experimenting.
So right now there is nothing really like the most up-to-date version of
proposed database changes. There will be once something is merged into the
master and then we will have something to try and test.
Jan.