Skip to content

Commit

Permalink
Chore: Dissolve using Git submodules
Browse files Browse the repository at this point in the history
- Don't use `git clone --recursive` any longer.
- Remove corresponding documentation.
  • Loading branch information
amotl committed May 28, 2023
1 parent b008b6a commit 7751442
Show file tree
Hide file tree
Showing 10 changed files with 12 additions and 54 deletions.
5 changes: 2 additions & 3 deletions README.rst
Expand Up @@ -46,10 +46,9 @@ Setup

Source code
===========
Get source code with all dependency libraries and tools::

git clone --recursive https://github.com/hiveeyes/arduino
Acquire source code repository::

git clone https://github.com/hiveeyes/arduino

Toolchain
=========
Expand Down
45 changes: 2 additions & 43 deletions doc/source/development.rst
Expand Up @@ -11,6 +11,7 @@ Development
****
Todo
****

Have a look at the agenda at :ref:`todo`.


Expand All @@ -19,6 +20,7 @@ Have a look at the agenda at :ref:`todo`.
*******
Hacking
*******

For hacking on the repository, there are some guidelines.

Initialize a new firmware flavour
Expand All @@ -32,49 +34,6 @@ The following steps are needed to initialize a new project inside the multivaria
cp generic/{Makefile,platformio.ini} purpose-transport-protocol/


Libraries as git submodules
===========================
Dependency libraries are organized as git submodules inside the ``libraries/`` folder.
This avoids redundancy and delivers a coherent sandbox environment without too much
overhead on artifact maintenance.


Sync submodules
---------------
To sync newly added libraries, do::

git submodule update --recursive --init


Add library
-----------
To add a new library as a submodule, do the following::

git submodule add https://mightbegithub.com/author/repo-name libraries/repo-name


Update library
--------------
To update submodules to the latest commit available from their remote::

# Change to the submodule directory
cd submodule_dir

# Checkout desired branch
git checkout master

# Update
git pull

# Get back to your project root
cd ..

# Now the submodule is in the state you want, so
git commit -am "Pulled update to submodule_dir"

.. seealso:: https://stackoverflow.com/questions/5828324/update-git-submodule-to-latest-commit-on-origin/5828396#5828396


.. _simulation:

**********
Expand Down
2 changes: 1 addition & 1 deletion gateway-rfm69-csv-sdcard/README.rst
Expand Up @@ -39,7 +39,7 @@ Build on your workstation
::

# Get hold of the source code repository including all dependencies
git clone --recursive https://github.com/hiveeyes/arduino
git clone https://github.com/hiveeyes/arduino

# Select this firmware
cd gateway-rfm69-csv-sdcard
Expand Down
2 changes: 1 addition & 1 deletion gateway-rfm69-csv-uart/README.rst
Expand Up @@ -41,7 +41,7 @@ Build on your workstation
::

# Get hold of the source code repository including all dependencies
git clone --recursive https://github.com/hiveeyes/arduino
git clone https://github.com/hiveeyes/arduino

# Select this firmware
cd gateway-rfm69-csv-uart
Expand Down
2 changes: 1 addition & 1 deletion generic/README.rst
Expand Up @@ -106,7 +106,7 @@ Build on your workstation
::

# Acquire the source code repository including all dependencies.
git clone --recursive https://github.com/hiveeyes/arduino
git clone https://github.com/hiveeyes/arduino

# Select this firmware.
cd generic
Expand Down
2 changes: 1 addition & 1 deletion libraries/TerkinData/README.rst
Expand Up @@ -190,7 +190,7 @@ Build for embedded targets
::

# Get source code.
git clone --recursive https://github.com/hiveeyes/arduino
git clone https://github.com/hiveeyes/arduino
cd arduino/libraries/TerkinData/examples

# Build examples for all embedded platforms.
Expand Down
2 changes: 1 addition & 1 deletion node-gprs-http/README.rst
Expand Up @@ -71,7 +71,7 @@ Clone git repository
::

# Get hold of the source code repository including all dependencies
git clone --recursive https://github.com/hiveeyes/arduino
git clone https://github.com/hiveeyes/arduino

# Select this firmware
cd node-gprs-http
Expand Down
2 changes: 1 addition & 1 deletion node-rfm69-csv/README.rst
Expand Up @@ -39,7 +39,7 @@ Build on your workstation
::

# Get hold of the source code repository including all dependencies
git clone --recursive https://github.com/hiveeyes/arduino
git clone https://github.com/hiveeyes/arduino

# Select this firmware
cd node-rfm69-csv
Expand Down
2 changes: 1 addition & 1 deletion node-wifi-mqtt/README.rst
Expand Up @@ -81,7 +81,7 @@ Clone git repository
::

# Get hold of the source code repository including all dependencies
git clone --recursive https://github.com/hiveeyes/arduino
git clone https://github.com/hiveeyes/arduino

# Select this firmware
cd node-wifi-mqtt
Expand Down
2 changes: 1 addition & 1 deletion node-yun-http/README.rst
Expand Up @@ -71,7 +71,7 @@ Clone git repository
::

# Get hold of the source code repository including all dependencies
git clone --recursive https://github.com/hiveeyes/arduino
git clone https://github.com/hiveeyes/arduino

# Select this firmware
cd node-yun-http
Expand Down

0 comments on commit 7751442

Please sign in to comment.