1.. _rfc-3: 2 3================================ 4RFC 3: GDAL Committer Guildlines 5================================ 6 7Author: Frank Warmerdam 8 9Contact: warmerdam@pobox.com 10 11Status: Adopted 12 13Purpose 14------- 15 16To formalize SVN (or CVS) commit access, and specify some guidelines for 17SVN committers. 18 19Election to SVN Commit Access 20----------------------------- 21 22Permission for SVN commit access shall be provided to new developers 23only if accepted by the GDAL/OGR Project Steering Committee. A proposal 24should be written to the PSC for new committers and voted on normally. 25It is not necessary to write an RFC document for these votes, a proposal 26to gdal-dev is sufficient. 27 28Removal of SVN commit access should be handled by the same process. 29 30The new committer should have demonstrated commitment to GDAL/OGR and 31knowledge of the GDAL/OGR source code and processes to the committee's 32satisfaction, usually by reporting bugs, submitting patches, and/or 33actively participating in the GDAL/OGR mailing list(s). 34 35The new committer should also be prepared to support any new feature or 36changes that he/she commits to the GDAL/OGR source tree in future 37releases, or to find someone to which to delegate responsibility for 38them if he/she stops being available to support the portions of code 39that he/she is responsible for. 40 41All committers should also be a member of the gdal-dev mailing list so 42they can stay informed on policies, technical developments and release 43preparation. 44 45New committers are responsible for having read, and understood this 46document. 47 48Committer Tracking 49------------------ 50 51A list of all project committers will be kept in the main gdal directory 52(called COMMITTERS) listing for each SVN committer: 53 54- Userid: the id that will appear in the SVN logs for this person. 55- Full name: the users actual name. 56- Email address: A current email address at which the committer can be 57 reached. It may be altered in normal ways to make it harder to 58 auto-harvest. 59- A brief indication of areas of responsibility. 60 61SVN Administrator 62----------------- 63 64One member of the Project Steering Committee will be designed the SVN 65Administrator. That person will be responsible for giving SVN commit 66access to folks, updating the COMMITTERS file, and other SVN related 67management. That person will need login access on the SVN server of 68course. 69 70Initially Frank Warmerdam will be the SVN Administrator. 71 72SVN Commit Practices 73-------------------- 74 75The following are considered good SVN commit practices for the GDAL/OGR 76project. 77 78- Use meaningful descriptions for SVN commit log entries. 79- Add a bug reference like "(#1232)" at the end of SVN commit log 80 entries when committing changes related to a ticket in Trac. The '#' 81 character enables Trac to create a hyperlink from the changeset to 82 the mentioned ticket. 83- After committing changes related to a ticket in Trac, write the tree 84 and revision in which it was fixed in the ticket description. Such as 85 "Fixed in trunk (r12345) and in branches/1.7 (r12346)". The 'r' 86 character enables Trac to create a hyperlink from the ticket to the 87 changeset. 88- Changes should not be committed in stable branches without a 89 corresponding bug id. Any change worth pushing into the stable 90 version is worth a bug entry. 91- Never commit new features to a stable branch without permission of 92 the PSC or release manager. Normally only fixes should go into stable 93 branches. 94- New features go in the main development trunk. 95- Only bug fixes should be committed to the code during pre-release 96 code freeze, without permission from the PSC or release manager. 97- Significant changes to the main development version should be 98 discussed on the gdal-dev list before you make them, and larger 99 changes will require a RFC approved by the PSC. 100- Do not create new branches without the approval of the PSC. Release 101 managers are assumed to have permission to create a branch. 102- All source code in SVN should be in Unix text format as opposed to 103 DOS text mode. 104- When committing new features or significant changes to existing 105 source code, the committer should take reasonable measures to insure 106 that the source code continues to build and work on the most commonly 107 supported platforms (currently Linux and Windows), either by testing 108 on those platforms directly, running [wiki:Buildbot] tests, or by 109 getting help from other developers working on those platforms. If new 110 files or library dependencies are added, then the configure.in, 111 Makefile.in, Makefile.vc and related documentations should be kept up 112 to date. 113 114Relationship with other upstream projects imported in GDAL/OGR code base 115------------------------------------------------------------------------ 116 117Some parts of the GDAL/OGR code base are regularly refreshed from other 118upstream projects. So changes in those areas should go first into those 119upstream projects, otherwise they may be lost during a later refresh. 120Note that those directories may contain a mix of GDAL specific files and 121upstream files. This has to be checked on a case-by-case basis (any file 122with CVS changelog at its beginning is a good candidate for belonging to 123the upstream project) 124 125Currently the list of those areas is : 126 127- frmts/gtiff/libtiff : from libtiff CVS 128 (`http://www.remotesensing.org/libtiff/ <http://www.remotesensing.org/libtiff/>`__) 129- frmts/gtiff/libgeotiff : from libgeotiff SVN 130 (`http://trac.osgeo.org/geotiff/ <http://trac.osgeo.org/geotiff/>`__) 131- frmts/jpeg/libjpeg : from libjpeg project 132 (`http://sourceforge.net/projects/libjpeg/ <http://sourceforge.net/projects/libjpeg/>`__) 133- frmts/png/libpng : from libpng project 134 (`http://www.libpng.org/pub/png/libpng.html <http://www.libpng.org/pub/png/libpng.html>`__) 135- frmts/gif/giflib : from giflib project 136 (`http://sourceforge.net/projects/giflib <http://sourceforge.net/projects/giflib>`__) 137- frmts/zlib : from zlib project 138 (`http://www.zlib.net/ <http://www.zlib.net/>`__) 139- ogr/ogrsf_frmts/mitab : from MITAB CVS 140 (`http://mitab.maptools.org/ <http://mitab.maptools.org/>`__) 141- ogr/ogrsf_frmts/avc : from AVCE00 CVS 142 (`http://avce00.maptools.org/ <http://avce00.maptools.org/>`__) 143- ogr/ogrsf_frmts/shape/[dbfopen.c, shpopen.c, shptree.c, shapefil.h] : 144 from shapelib project 145 (`http://shapelib.maptools.org/ <http://shapelib.maptools.org/>`__) 146- data/ : some .csv files related to CRS come from libgeotiff 147 148Legal 149----- 150 151Committers are the front line gatekeepers to keep the code base clear of 152improperly contributed code. It is important to the GDAL/OGR users, 153developers and the OSGeo foundation to avoid contributing any code to 154the project without it being clearly licensed under the project license. 155 156Generally speaking the key issues are that those providing code to be 157included in the repository understand that the code will be released 158under the MIT/X license, and that the person providing the code has the 159right to contribute the code. For the committer themselves understanding 160about the license is hopefully clear. For other contributors, the 161committer should verify the understanding unless the committer is very 162comfortable that the contributor understands the license (for instance 163frequent contributors). 164 165If the contribution was developed on behalf of an employer (on work 166time, as part of a work project, etc) then it is important that an 167appropriate representative of the employer understand that the code will 168be contributed under the MIT/X license. The arrangement should be 169cleared with an authorized supervisor/manager, etc. 170 171The code should be developed by the contributor, or the code should be 172from a source which can be rightfully contributed such as from the 173public domain, or from an open source project under a compatible 174license. 175 176All unusual situations need to be discussed and/or documented. 177 178Committers should adhere to the following guidelines, and may be 179personally legally liable for improperly contributing code to the source 180repository: 181 182- Make sure the contributor (and possibly employer) is aware of the 183 contribution terms. 184- Code coming from a source other than the contributor (such as adapted 185 from another project) should be clearly marked as to the original 186 source, copyright holders, license terms and so forth. This 187 information can be in the file headers, but should also be added to 188 the project licensing file if not exactly matching normal project 189 licensing (gdal/LICENSE.txt). 190- Existing copyright headers and license text should never be stripped 191 from a file. If a copyright holder wishes to give up copyright they 192 must do so in writing to the foundation before copyright messages are 193 removed. If license terms are changed it has to be by agreement 194 (written in email is ok) of the copyright holders. 195- Code with licenses requiring credit, or disclosure to users should be 196 added to /trunk/gdal/LICENSE.TXT. 197- When substantial contributions are added to a file (such as 198 substantial patches) the author/contributor should be added to the 199 list of copyright holders for the file. 200- If there is uncertainty about whether a change it proper to 201 contribute to the code base, please seek more information from the 202 project steering committee, or the foundation legal counsel. 203 204Bootstraping 205------------ 206 207The following existing committers will be considered authorized GDAL/OGR 208committers as long as they each review the committer guidelines, and 209agree to adhere to them. The SVN administrator will be responsible for 210checking with each person. 211 212- Daniel Morissette 213- Frank Warmerdam 214- Gillian Walter 215- Andrey Kiselev 216- Alessandro Amici 217- Kor de Jong 218- Howard Butler 219- Lichun Wang 220- Norman Vine 221- Ken Melero 222- Kevin Ruland 223- Marek Brudka 224- Pirmin Kalberer 225- Steve Soule 226- Frans van der Bergh 227- Denis Nadeau 228- Oleg Semykin 229- Julien-Samuel Lacroix 230- Daniel Wallner 231- Charles F. I. Savage 232- Mateusz Loskot 233- Peter Nagy 234- Simon Perkins 235- Radim Blazek 236- Steve Halasz 237- Nacho Brodin 238- Benjamin Collins 239- Ivan Lucena 240- Ari Jolma 241- Tamas Szekeres 242 243-------------- 244 245- `COMMITTERS <http://trac.osgeo.org/gdal/browser/trunk/gdal/COMMITTERS>`__ 246 file 247- `Edit GDAL Subversion 248 Group <https://www.osgeo.org/cgi-bin/auth/ldap_group.py?group=gdal>`__ 249