summaryrefslogtreecommitdiff
path: root/DEVELOPMENT
diff options
context:
space:
mode:
authorChristian Mollekopf <mollekopf@kolabsys.com>2012-03-09 19:22:29 (GMT)
committerChristian Mollekopf <mollekopf@kolabsys.com>2012-03-09 19:22:29 (GMT)
commit3621b8166463ec32cb769817a463b1f339000639 (patch)
treedc3bfbaa8b14489234fd01a19f2c9194daeba5a1 /DEVELOPMENT
parent03f560eff6b8c5091132af114db49eb1eec6b934 (diff)
downloadlibkolabxml-3621b8166463ec32cb769817a463b1f339000639.tar.gz
updated branch layout and versioning information.
Diffstat (limited to 'DEVELOPMENT')
-rw-r--r--DEVELOPMENT31
1 files changed, 11 insertions, 20 deletions
diff --git a/DEVELOPMENT b/DEVELOPMENT
index db795c3..ce42fff 100644
--- a/DEVELOPMENT
+++ b/DEVELOPMENT
@@ -12,36 +12,27 @@ For the python tests:
Make sure you have "nosetests" for python2 is installed (python2-nose on arch). Otherwise you will get an error that "PyInit__kolabformat" could not be found.
-For the library only, switch to the c++ directory and read the instructinos in there
+For the library only, switch to the c++ directory and read the instructions in there.
Branch layout:
master
- The latest and greatest, schema definitions only
+ The latest and greatest.
- <language>/master
+ v<minor>.<teeny>
- The latest and greatest language bindings (generated) and wrapper
- libraries (if appropriate) for <language>. For example, branch
-
- python/master
+ Version branch for the 3.<minor>.<teeny> product
+ series.
- is occassionally, regularly, merged with the master branch.
- Bindings are then generated, modifications are updated where
- necessary, test-cases executed, and naturally we hope all is well.
+ dev/*
- <major>.<minor>
+ Temporary development branches.
- Schema definitions developed for the <major>.<minor> product
- series.
+Versioning:
- Tracks towards a future <teeny> version release, using the
- x.y.z versioning schema.
+ According to http://wiki.kolab.org/KEP:5
- <language>/<major>.<minor>
+ <major>.<minor>.<teeny>
- Using the same schema definitions as <major>.<minor> schema
- definitions branch, generated bindings and modifications (if
- necessary) and wrapper libraries (if appropriate) for
- <language> are maintained in this branch.
+ Where major stands for the major format version. Minor are larger relaese and teeny bugfix releases.