Skip to content

Commit

Permalink
updated submodules, docs, codecomment
Browse files Browse the repository at this point in the history
  • Loading branch information
ErikBjare committed Oct 20, 2017
1 parent a715822 commit 1ed8d34
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

.PHONY: build install test docs clean clean_all

# TODO: Currently no way to do a `setup.py develop`/`pip install --editable`
# When `make build DEV=true` is used all `pip install` commands will be run with `--editable` for easier development
build:
make --directory=aw-core build DEV=$(DEV)
make --directory=aw-client build DEV=$(DEV)
Expand All @@ -21,7 +21,7 @@ install:
make --directory=aw-qt install
# Installation is already happening in the `make build` step currently.
# We might want to change this.
# We should also add some option to install as user (pip3 install --user) or editable (pip3 install --editable)
# We should also add some option to install as user (pip3 install --user)

uninstall:
./scripts/uninstall.sh
Expand Down
2 changes: 1 addition & 1 deletion aw-watcher-window
Submodule aw-watcher-window updated 1 files
+1 −0 .travis.yml
2 changes: 1 addition & 1 deletion aw-webui
2 changes: 1 addition & 1 deletion docs/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@ Welcome to the ActivityWatch documentation!
:maxdepth: 3
:caption: Developer documentation

development
architecture
event-model
installing-from-source
api-reference
development
writing-watchers
rest
changelog
Expand Down

0 comments on commit 1ed8d34

Please sign in to comment.