2014-07-09 10:43:10 +00:00
|
|
|
Development Basics
|
|
|
|
|
==================
|
|
|
|
|
|
|
|
|
|
Gluon's source is kept in `git repositories`_ at GitHub.
|
|
|
|
|
|
|
|
|
|
.. _git repositories: https://github.com/freifunk-gluon
|
|
|
|
|
|
|
|
|
|
Bug Tracker
|
|
|
|
|
-----------
|
|
|
|
|
|
|
|
|
|
The `main repo`_ does have issues enabled.
|
|
|
|
|
|
|
|
|
|
.. _main repo: https://github.com/freifunk-gluon/gluon
|
|
|
|
|
|
|
|
|
|
IRC
|
|
|
|
|
---
|
|
|
|
|
|
2019-02-07 00:53:18 +00:00
|
|
|
Gluon's developers frequent the IRC chatroom `#gluon`_ on `hackint`_.
|
|
|
|
|
There is a `webchat`_ that allows for easy access from within your
|
|
|
|
|
webbrowser. You're welcome to join us!
|
2014-07-09 10:43:10 +00:00
|
|
|
|
2019-02-07 00:53:18 +00:00
|
|
|
.. _#gluon: ircs://irc.hackint.org/#gluon
|
|
|
|
|
.. _hackint: https://hackint.org/
|
|
|
|
|
.. _webchat: https://webirc.hackint.org/#irc://irc.hackint.org/#gluon
|
2014-07-09 10:43:10 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
Working with repositories
|
|
|
|
|
-------------------------
|
|
|
|
|
|
|
|
|
|
To update the repositories used by Gluon, just adjust the commit IDs in `modules` and
|
|
|
|
|
rerun
|
|
|
|
|
|
|
|
|
|
::
|
|
|
|
|
|
|
|
|
|
make update
|
|
|
|
|
|
|
|
|
|
`make update` also applies the patches that can be found in the directories found in
|
|
|
|
|
`patches`; the resulting branch will be called `patched`, while the commit specified in `modules`
|
2019-03-10 19:15:25 +00:00
|
|
|
can be referred to by the branch `base`.
|
2014-07-09 10:43:10 +00:00
|
|
|
|
2019-03-10 19:15:25 +00:00
|
|
|
After new patches have been committed on top of the `patched` branch (or existing commits
|
2014-07-09 10:43:10 +00:00
|
|
|
since the base commit have been edited or removed), the patch directories can be regenerated
|
|
|
|
|
using
|
|
|
|
|
|
|
|
|
|
::
|
|
|
|
|
|
|
|
|
|
make update-patches
|
|
|
|
|
|
|
|
|
|
If applying a patch fails because you have changed the base commit, the repository will be reset to the old `patched` branch
|
|
|
|
|
and you can try rebasing it onto the new `base` branch yourself and after that call `make update-patches` to fix the problem.
|
|
|
|
|
|
|
|
|
|
Always call `make update-patches` after making changes to a module repository as `make update` will overwrite your
|
|
|
|
|
commits, making `git reflog` the only way to recover them!
|
2016-11-29 19:45:25 +00:00
|
|
|
|
|
|
|
|
Development Guidelines
|
|
|
|
|
----------------------
|
2019-06-24 02:41:02 +00:00
|
|
|
Lua should be used instead of sh whenever sensible. The following criteria
|
2016-11-29 19:45:25 +00:00
|
|
|
should be considered:
|
|
|
|
|
|
2019-06-24 02:41:02 +00:00
|
|
|
- Is the script doing more than just executing external commands? if so, use Lua
|
|
|
|
|
- Is the script parsing/editing json-data? If so, use Lua for speed
|
2016-12-08 22:56:43 +00:00
|
|
|
- When using sh, use jsonfilter instead of json_* functions for speed
|
2016-11-29 19:45:25 +00:00
|
|
|
|
2016-12-08 22:56:43 +00:00
|
|
|
Code formatting may sound like a topic for the pedantic, however it helps if
|
2019-06-24 02:41:02 +00:00
|
|
|
the code in the project is formatted in the same way. The following basic rules
|
2016-12-08 22:56:43 +00:00
|
|
|
apply:
|
|
|
|
|
|
|
|
|
|
- use tabs instead of spaces
|
|
|
|
|
- trailing whitespaces must be eliminated
|
2019-06-24 02:41:02 +00:00
|
|
|
|
|
|
|
|
If you add Lua scripts to gluon, check formatting with ``luacheck``.
|
