Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build: do not build python server if rust server is specified #755

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

build: do not build python server if rust server is specified #755

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ build:
make --directory=aw-client build
make --directory=aw-watcher-afk build
make --directory=aw-watcher-window build
make --directory=aw-server build SKIP_WEBUI=$(SKIP_WEBUI)
ifndef SKIP_SERVER_RUST # Skip building aw-server-rust if SKIP_SERVER_RUST is defined
echo 'Looking for rust...'
if (which cargo); then \
Expand All @@ -48,14 +47,17 @@ ifndef SKIP_SERVER_RUST # Skip building aw-server-rust if SKIP_SERVER_RUST is d
else \
echo 'Rust not found, skipping aw-server-rust!'; \
fi
else
make --directory=aw-server build SKIP_WEBUI=$(SKIP_WEBUI)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This will break CI, which should build both (and building both should be the default).

endif
make --directory=aw-qt build
# The below is needed due to: https://github.com/ActivityWatch/activitywatch/issues/173
make --directory=aw-client build
make --directory=aw-core build
ifdef SKIP_SERVER_RUST
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You mean ifndef, right?

# Needed to ensure that the server has the correct version set
python -c "import aw_server; print(aw_server.__version__)"

endif

# Install
# -------
Expand Down Expand Up @@ -95,7 +97,7 @@ lint:
#
# Uninstalls all the Python modules.
uninstall:
modules=$$(pip3 list --format=legacy | grep 'aw-' | grep -o '^aw-[^ ]*'); \
modules=$$(pip3 list --format=columns | grep 'aw-' | grep -o '^aw-[^ ]*'); \
for module in $$modules; do \
echo "Uninstalling $$module"; \
pip3 uninstall -y $$module; \
Expand Down