Skip to content

Commit

Permalink
Tie up loose ends
Browse files Browse the repository at this point in the history
Signed-off-by: Haris Gušić <[email protected]>
  • Loading branch information
veracioux committed Sep 24, 2021
1 parent 5a2a5c8 commit 0b99780
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[submodule "devlib"]
path = devlib
url = https://github.com/HarisGusic/siau-devlib
url = https://github.com/veracioux/siau-devlib
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ man:

install: man
mkdir -p _build/
$(CMAKE) -DTEMPLATE_DIR="$(DESTDIR)/$(PREFIX)/share/devconf" \
$(CMAKE) -DTEMPLATE_DIR="/$(PREFIX)/share/devconf" \
&& $(CMAKE_BUILD)
mkdir -p "$(DESTDIR)/$(PREFIX)"/{bin,share/devconf,share/man/man1}
mkdir -p "$(DESTDIR)/$(PREFIX)"/{bin,share/devconf,share/man/man1,lib}
cp ./_build/devconf "$(DESTDIR)/$(PREFIX)"/bin/
cp ./_build/devconf.1.gz "$(DESTDIR)/$(PREFIX)"/share/man/man1/
cp -r ./template/* "$(DESTDIR)/$(PREFIX)"/share/devconf/
Expand Down
2 changes: 1 addition & 1 deletion devlib
Submodule devlib updated 1 files
+14 −14 docs/api.rst
4 changes: 0 additions & 4 deletions docs/communication.rst
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,6 @@ Pri tome `lokacija` uređaja može predstavljati na primjer naziv sobe, a polje
naziv naziv :ref:`funkcije<functions>` koju uređaj treba izvršiti, ili
:ref:`podatka<data>` koji se čita sa uređaja.

.. todo:: Odrediti šta će se koristiti kao jedinstvena identifikacija uređaja. U
primjerima je korišten serijski broj, ali nismo se konačno odlučili da će
ostati tako.

.. _requestConnection:

Zahtjev za konekciju
Expand Down
2 changes: 2 additions & 0 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,8 @@
subprocess.call('umask 000', shell=True)

subprocess.call('make doxygen', shell=True)
subprocess.call('cmod -R 777 ./_intermediate/devlib/_build/doxygen',
shell=True)
subprocess.call('make prepare-man', shell=True)
subprocess.call('make mv-files', shell=True)
subprocess.call('make devlib', shell=True)
3 changes: 2 additions & 1 deletion docs/man/devconf.rst
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,8 @@ OPTIONS

`-m`, `--mbed`

Initialize an mbed workspace with all dependencies in the output directory.
Inicijalizira mbed workspace sa svim potrebnim bibliotekama u izlaznom
direktoriju.

`-h`, `--help`

Expand Down

0 comments on commit 0b99780

Please sign in to comment.