User Tools

Site Tools


content:servalmesh:development

Differences

This shows you the differences between two versions of the page.

Link to this comparison view

Both sides previous revision Previous revision
Next revision
Previous revision
Next revision Both sides next revision
content:servalmesh:development [22/08/2013 01:27]
Andrew Bettison more links to version numbering page
content:servalmesh:development [11/03/2014 18:21]
Andrew Bettison [Instructions for developing Serval Mesh] change title
Line 1: Line 1:
-====== Instructions for developing Serval Mesh ======+====== Serval Mesh development ======
  
 ==== Overview ==== ==== Overview ====
Line 17: Line 17:
 ==== Source code ==== ==== Source code ====
  
-The Batphone source code and accompanying technical documentation is held in the [[https://github.com/servalproject/batphone|Batphone GitHub repository]], which references the [[https://github.com/servalproject/serval-dna|Serval DNA]] repository as a [[http://git-scm.com/book/en/Git-Tools-Submodules|Git submodule]].+The Batphone source code and accompanying [[:content:dev:techdoc|technical documentation]] are controlled using [[:content:dev:git]] and held in the [[Batphone Git repository]], which contains two main branches: 
 +  - The head of the [[Git master branch]] is always the [[.:release:|latest public release]].  Each release is tagged with its [[version numbering|version number]], for example [[https://github.com/servalproject/batphone/tree/0.08|0.08]][[https://github.com/servalproject/batphone/tree/0.90|0.90]]. 
 +  - The [[Git development branch]] holds code that is intended for the next release.  All commits on this branch should build cleanly (no warnings), and install and run okay.
  
-  * The **Batphone [[https://github.com/servalproject/batphone/tree/master|master]]** branch is always the [[.:release:|latest public release]].  Each release is tagged with its [[version numbering|version number]], for example [[https://github.com/servalproject/batphone/tree/0.08|0.08]], [[https://github.com/servalproject/batphone/tree/0.90|0.90]]. +Large-scale code changes that break the build, installation or execution of Serval Mesh are performed in [[http://nvie.com/posts/a-successful-git-branching-model/|“feature” branches]], which are [[Git development branch|merged into the development branch]] and deleted once complete.
- +
-  * The **Batphone [[https://github.com/servalproject/batphone/tree/development|development]]** branch holds the latest unreleased code.  All commits on this branch should build cleanly (no warnings), and install and run okay.  +
- +
-  * Large-scale code changes that break the build, installation or execution of Serval Mesh are performed in [[http://nvie.com/posts/a-successful-git-branching-model/|“feature” branches]], which are merged into the **development** branch and deleted once complete.+
  
 ==== Technical documentation ==== ==== Technical documentation ====
Line 50: Line 48:
 ==== Releasing ==== ==== Releasing ====
  
-Follow the **[[.:release:|release procedure]]** to make a new release of the Serval Mesh software. +Follow the **[[.:release:|Serval Mesh release procedure]]** to make a new release of the Serval Mesh app.
- +
-Learn about about Serval Mesh [[version numbering|version numbering]].+
  
-See the [[:content:servalmesh:releases:|full list of Serval Mesh releases]].+  * Learn about about Serval Mesh [[version numbering|version numbering]]. 
 +  * See the [[:content:servalmesh:releases:|full list of Serval Mesh releases]].
  
 ==== Bug tracking ==== ==== Bug tracking ====
content/servalmesh/development.txt · Last modified: 14/02/2016 19:14 by Andrew Bettison