Difference between revisions of "Development Practices"
m |
|||
Line 14: | Line 14: | ||
* '''Rule #2''': a single commit (changeset) must not be so large so as to discourage peer-review. | * '''Rule #2''': a single commit (changeset) must not be so large so as to discourage peer-review. | ||
* '''Rule #3''': if rules #1 and #2 come into conflict (i.e. it's impossible to make a series of small commits without disrupting the trunk), then the user should create a branch and commit a series of smaller changesets there. This allows peer-review without disrupting the stability of /trunk. | * '''Rule #3''': if rules #1 and #2 come into conflict (i.e. it's impossible to make a series of small commits without disrupting the trunk), then the user should create a branch and commit a series of smaller changesets there. This allows peer-review without disrupting the stability of /trunk. | ||
+ | * '''Rule #4''': if API is changed, old version in the trunk must be tagged, and version number of the trunk must be increased. If API changes break other trunk code, development must continue in its own branch. Change in an ontology is counted as major change (prevents using existing databases); new branch must be created. | ||
;Pros: /trunk is guaranteed to be stable at all times. The hassle of branching/merging is somewhat rare. | ;Pros: /trunk is guaranteed to be stable at all times. The hassle of branching/merging is somewhat rare. | ||
− | The word '''stable''' here implies mainly API stability but also functional stability. Functional stability must be enforced through both automatic and manual testing. If there are no test cases, functional stability becomes really hard to enforce. Therefore testing is key. | + | The word '''stable''' here implies mainly API stability but also functional stability. Functional stability must be enforced through both automatic and manual testing. If there are no test cases, functional stability becomes really hard to enforce. Therefore testing is key. |
+ | |||
+ | Violating these rules will result removal of your breaking commits from the SVN. | ||
=== Versioning === | === Versioning === |
Revision as of 14:24, 11 November 2010
Contents
Using version control
First things first, read through Subversion best practices.
Branching
In Simantics, only new major releases may contain breaking changes. Therefore in Simantics we strive to use a specialization of the Branch-When-Needed system, i.e. Branch-Every-Major-Change. This allows us to keep continuous builds (hudson) working with less disruption, and enables easier pre-release testing, migration and peer review.
The rules are:
- Users commit their day-to-day work on /trunk.
- Rule #1: /trunk must compile and pass regression tests at all times. Committers who violate this rule are publically humiliated.
- Rule #2: a single commit (changeset) must not be so large so as to discourage peer-review.
- Rule #3: if rules #1 and #2 come into conflict (i.e. it's impossible to make a series of small commits without disrupting the trunk), then the user should create a branch and commit a series of smaller changesets there. This allows peer-review without disrupting the stability of /trunk.
- Rule #4: if API is changed, old version in the trunk must be tagged, and version number of the trunk must be increased. If API changes break other trunk code, development must continue in its own branch. Change in an ontology is counted as major change (prevents using existing databases); new branch must be created.
- Pros
- /trunk is guaranteed to be stable at all times. The hassle of branching/merging is somewhat rare.
The word stable here implies mainly API stability but also functional stability. Functional stability must be enforced through both automatic and manual testing. If there are no test cases, functional stability becomes really hard to enforce. Therefore testing is key.
Violating these rules will result removal of your breaking commits from the SVN.
Versioning
In Eclipse/OSGi conventions, components (bundles, plug-ins) are versioned <major>.<minor>.<service>[.<qualifier>].
Our approach to component versioning is as follows:
- All components are in one of two states: incubation or production
- Incubation components: <major> = 0, API breakage is allowed between <minor> versions
- Production components: <major> ≥ 1, API breakage is allowed between <major> versions
Creating a new plugin
Before a release, the plugin is in incubation phase and there are no quality or other requirements. The repository https://www.simulationsite.net/svn/simantics-incubator may be used to share or co-develop the plugin with other developers, but the plugin must not be included in the features defined in https://www.simulationsite.net/svn/simantics repository.
If the new plugin is a result of refactoring some already existing plugin into two pieces or otherwise is closely related to an other plugin under development, the new plugin can be committed to the same branch of https://www.simulationsite.net/svn/simantics where the other plugin is developed in. However, unreleased plugins should not be committed to trunk.
Naming a plugin
If the plugin is intended to be part of the official Simantics release, its name should begin with org.simantics followed by a word that describes the plugin. If the functionality of the same domain is divided into multiple plugins, the name may have more parts. The following suffixes are used:
- .feature A plugin (?) defining a feature
- .product A plugin defining a product.
- <plugin>.ui Provides UI-functionality for <plugin>. Separating base functionality and UI (that depends on SWT) is usually recommendable so that headless applications do not have unnecessary dependencies.
- Example: org.simantics.simulation, org.simantics.simulation.ui
NOTE! If the the UI is light (e.g. wizards, dialogs, renderers, few external dependencies) the UI code can reside in <plugin>, a separate <plugin>.ui is not required. In such a case, the UI dependencies (to plugins such as org.eclipse.swt) are optional.
Publising a standalone plugin
- Ensure that the plugin satisfies the following quality requirements:
- The plugin contains no compilation errors (against which dependencies???)
- All public classes and interfaces are documented (javadoc)
- Each public package contains a package-info.java containing package-related comments and annotations (see [1] chapter 7.4)
- examples/
- unittests/
- Version information
- (optional) Build Script (targets: clean, build, clean-build)
- Create a homepage for the plugin in wiki (for example org.simantics.datatype) that contains:
- Development documentation that is not written in javadoc (basic concepts, components etc.) [We should discuss more about what and how to document] and links to user documentation if the plugin contributes new user interfaces.
- Change log
- Plugin roadmap
- Who are responsible for the plugin
- (optional) Download to artifacts created by Build script
- Commit the plugin to https://www.simulationsite.net/svn/simantics/<moduleName>/trunk
- Create a tag of the plugin to https://www.simulationsite.net/svn/simantics/<moduleName>/tags/<version>
- Inform other developers about the new plugin in [simantics-developers@simantics.org]. See also Mailing Lists.
Including a new plug-in to existing features
Inclusion of a plug-in in a feature must always be carefully considered. Consider the following before including anything:
- Cohesion: Does the plug-in logically belong in the considered feature.xml?
- Dependencies: What does the new plug-in depend on? Which dependencies are optional? Do the dependencies of the feature's other plug-ins intersect naturally with those of the new plug-in?
- Permission: do not add anything without permission from the feature maintainer or send a patch and hope it will be merged.
Note that it is not mandatory that each plug-in only resides in one feature. Having multiple features including the same plug-in will not break a PDE build.
Modifying a feature will most likely break:
- Hudson PDE builds that depend on the feature
- TODO: link to instructions for general hudson and pde build configuration
- Project sets
- FIX: add a line for the new plug-in in all project sets that include the modified feature
Releasing a new version of a plugin
- Increment version number, incl. plugin.xml, build.xml, homepage. Bug fixes increment minor number, API changes major number.
- Run test cases or test suite
- Check java docs are compiled without errors. Read Javadocs
- Update homepage
- (optional) run build.xml and upload generated artifacts to homepage
- Create SVN tag: trunk/ → tags/[version]
- Inform other developers [simantics-developers@simantics.org] (Mailing Lists).
Making refactorizations that affect other plugins
- Plan refactorization beforehand with the maintainers of all affected plugins
- Create a new branch for all affected plugins
- Refactor, different possibilities
- One person refactors all plugins
- Every maintainer refactors his/her own plugins
- Create rename scripts for other maintainers to help them
- Check that everything works
- If changes were large inform other developers in the mailing list
- Commit plugins to trunk
Developing and maintaining a released plugin
Generally, people need to be able to commit their changes continuously to the SVN location dedicated for a component. Often committing is necessary for transferring their changes to another machine or just to keep their code safe. We can't allow developers committing API changes or broken temporary code into SVN locations that other projects are using - those need to be stable to some degree. Hence, the active development and API breaking must occur in SVN locations that are documented to be unstable and modifiable only by component maintainer(s). These locations shall be released to the general public according to the roadmap of the component. For every release, a tag shall be created. For every release external dependencies need to be documented: component name, version to use (tag). Releases are versioned. Version numbers are composed of three (3) segments: 3 integers and a string respectively named major.minor.service. Read [2] and [3].
- the major segment indicates breakage in the API
- the minor segment indicates "externally visible" changes
- the service segment indicates bug fixes and the change of development stream (the semantics attached to development stream is new to this proposal, see below)
By default, the following SVN layout should be used for components:
- component/
- trunk/
- The main development branch, unstable by nature. This version should only be used by active developers of this component.
- branches/
- Branches should be created:
- when preparing for a release, for stabilizing the component while letting active development run along in trunk.
- for working on bug-fix releases.
- when working on a larger changes, trying out things or working with other developers. These kinds of branches should either be integrated back to where they were branched from or removed as obsolete.
- Branches should be created:
- tags/
- Released versions of the component. Other developers and project-sets should be using these for development if the component isn't already deployed into the target platform or it is necessary to have the code in your workspace for some other reason.
- trunk/
Developers may initially feel that creating tickets for every measly issue is too time consuming but it is necessary to make any kind of change tracking possible for releases. Obviously during the initial development of a component the code changes a lot and all the time. This is exactly why we have an incubator for starting projects that does not impose these strict rules but is more like a playground where the developer can freely "hack around" disregarding all these policies. When the developer feels his component is ready for consumption of the general public and the component passes peer review, it shall be ceremonially transferred from incubation into the official project. Each component should have documentation, unit tests and possibly examples or really good reasons for not having any.
Modifying the target platform
The target platform is a composition of features and plug-ins that contains all the bundles that you as a developer can build your code against when starting from a blank table. It is a mixture of the standard Eclipse RCP platform, other general Eclipse components and also some Simantics components.
It makes sense to deploy into the target platform only if your plug-ins:
- are general, i.e. reusable by many other components
- have little dependencies
- are stable, both by API and functionally
Deploying plug-ins into the target platform will most likely break:
- Hudson PDE builds that depend on the feature
- Remove the deployed plug-ins from the plugins/ directory of the build structure to take the deployed plug-ins from the target platform
- The target platform(s) used by the builds must be updated
- TODO: link to instructions for general hudson and PDE build configuration
- Project sets
- FIX: remove lines matching the plug-ins that were moved into the target platform
Deploying plug-ins for the target platform
- Standard Procedure
- Read the instructions below and deploy your plug-ins and features as P2 repositories
- Test your deployed components with the standard Simantics Workbench application (search for simantics-workbench.product in your development workspace)
- After testing your deployed versions, make your built P2 repository available on the internet and notify the target platform maintainer to grab your changes and update the official target platform.
There are two main ways of deploying for the target platform:
- deploying plug-ins and fragments directly
- deploying plug-ins and fragments through features
These steps can be performed using the Eclipse export wizard through the Plug-in Development/Deployable features and Plug-in Development/Deployable plug-ins and fragments wizards
When considering whether your component should have a feature or not, consider these points:
- Eclipse products/applications are always made up of either a set of features or a set of plug-ins. In order for someone to use your component in an product, either your features or your plug-ins need to be included somewhere in the product. If a product is using features and you don't provide one, the product either has to create a new feature and include it or include your plug-ins in his own features.
- Features can be used as a way to give a collective version all plug-ins of a component. The feature will identify the versions of its included plug-ins but these need not be identical to the feature version. Not all plug-ins have to change versions while a feature version changes each time a new release of the component is made.
- IMPORTANT: The feature deployment build will produce a P2 repository containing content.jar, artifacts.jar and two directories, features/ and plugins/. The features-directory will contain the feature as JAR files which is correct when used as a P2 repository. But if you want to install your deployed features into the current target platforms, the feature jars must be unpacked with the JAR file names as the directory names' Don't unpack directly into the features directory, the feature JARs do not contain a common parent folder. For example, if you've built your feature with an ID my.feature and version 1.0.0, the build will produce a file my.feature_1.0.0.jar. The contents of this jar must be unpacked into features/my.feature_1.0.0/. If you copied the JAR files into the features directory and unpack them there, do not leave the JARs in the features directory. This will also break the features.