From 5bfdb3d1708a3edcfc1e9630abc165c6943d964d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johan=20Bj=C3=A4reholt?= Date: Mon, 6 Jan 2020 17:00:16 +0100 Subject: [PATCH 1/6] aw-watcher-window: Update submodule --- aw-watcher-window | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aw-watcher-window b/aw-watcher-window index 0c14d77d..d3360ad1 160000 --- a/aw-watcher-window +++ b/aw-watcher-window @@ -1 +1 @@ -Subproject commit 0c14d77d338836e2933c0f879914d469e7d93a95 +Subproject commit d3360ad1662b39927a52e8899f915d952f5ec5b5 From 2ddeef52440d013eaeeacaa5047793d18203e859 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johan=20Bj=C3=A4reholt?= Date: Mon, 6 Jan 2020 16:59:42 +0100 Subject: [PATCH 2/6] Replace aw-server with aw-server-rust --- .appveyor.yml | 7 +++++++ .gitmodules | 6 +++--- .travis.yml | 3 +++ Makefile | 11 ++++------- aw-server | 1 - aw-server-rust | 1 + 6 files changed, 18 insertions(+), 11 deletions(-) delete mode 160000 aw-server create mode 160000 aw-server-rust diff --git a/.appveyor.yml b/.appveyor.yml index d7ec1ca3..54307862 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -48,6 +48,13 @@ install: # not already installed. - ps: if (-not(Test-Path($env:PYTHON))) { & scripts\ci\install_python.ps1 } + # Install Rust nightly and add it to PATH + - appveyor DownloadFile https://win.rustup.rs/ -FileName rustup-init.exe + - rustup-init -yv --default-toolchain nightly + - set PATH=%PATH%;%USERPROFILE%\.cargo\bin + - rustc -vV + - cargo -vV + # Required in order to get `make` to work - "copy C:\\MinGW\\bin\\mingw32-make.exe C:\\MinGW\\bin\\make.exe" diff --git a/.gitmodules b/.gitmodules index 62c994da..9b4eb0bb 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,9 +4,6 @@ [submodule "aw-client"] path = aw-client url = https://github.com/ActivityWatch/aw-client.git -[submodule "aw-server"] - path = aw-server - url = https://github.com/ActivityWatch/aw-server.git [submodule "aw-watcher-afk"] path = aw-watcher-afk url = https://github.com/ActivityWatch/aw-watcher-afk.git @@ -16,3 +13,6 @@ [submodule "aw-watcher-window"] path = aw-watcher-window url = https://github.com/ActivityWatch/aw-watcher-window.git +[submodule "aw-server-rust"] + path = aw-server-rust + url = https://github.com/ActivityWatch/aw-server-rust.git diff --git a/.travis.yml b/.travis.yml index b30258d6..657e1d7d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -70,6 +70,9 @@ before_install: fi # Upgrade pip - python3 -m pip install --upgrade pip wheel; + # Install Rust + - curl https://build.travis-ci.org/files/rustup-init.sh -sSf | sh -s -- -y --default-toolchain nightly + - export PATH="$HOME/.cargo/bin:$PATH"; # Print version used - python3 --version - pip3 --version diff --git a/Makefile b/Makefile index 44bdc94d..aabde5df 100644 --- a/Makefile +++ b/Makefile @@ -37,15 +37,13 @@ build: # make --directory=aw-core build DEV=$(DEV) make --directory=aw-client build DEV=$(DEV) - make --directory=aw-server build DEV=$(DEV) make --directory=aw-watcher-afk build DEV=$(DEV) make --directory=aw-watcher-window build DEV=$(DEV) + make --directory=aw-server-rust build make --directory=aw-qt build DEV=$(DEV) # The below is needed due to: https://github.com/ActivityWatch/activitywatch/issues/173 make --directory=aw-client build DEV=$(DEV) make --directory=aw-core build DEV=$(DEV) -# - python3 -c "import aw_server; print(aw_server.__version__)" # Install @@ -97,7 +95,6 @@ lint: aw-core/aw_transform/ \ aw-core/aw_analysis/ \ aw-client/aw_client/ \ - aw-server/aw_server/ \ aw-watcher-window/aw_watcher_window/ \ aw-watcher-afk/aw_watcher_afk/ \ aw-qt/aw_qt/ @@ -116,7 +113,7 @@ uninstall: test: make --directory=aw-core test make --directory=aw-client test - make --directory=aw-server test + make --directory=aw-server-rust test make --directory=aw-qt test test-integration: @@ -160,8 +157,8 @@ package: make --directory=aw-watcher-window package cp -r aw-watcher-window/dist/aw-watcher-window dist/activitywatch # - make --directory=aw-server package - cp -r aw-server/dist/aw-server dist/activitywatch + make --directory=aw-server-rust package + cp -r aw-server-rust/target/package/* dist/activitywatch # make --directory=aw-qt package cp -r aw-qt/dist/aw-qt/. dist/activitywatch diff --git a/aw-server b/aw-server deleted file mode 160000 index c2fdfe1f..00000000 --- a/aw-server +++ /dev/null @@ -1 +0,0 @@ -Subproject commit c2fdfe1f3ac85081b45c6780437c61b78f072be0 diff --git a/aw-server-rust b/aw-server-rust new file mode 160000 index 00000000..5d96975e --- /dev/null +++ b/aw-server-rust @@ -0,0 +1 @@ +Subproject commit 5d96975e96ccf6c0b272af8517c13ea1be584620 From cbdc3b4dd921005909c651791e7f7c7b4e68a562 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Erik=20Bj=C3=A4reholt?= Date: Tue, 7 Jan 2020 13:51:34 +0100 Subject: [PATCH 3/6] readded aw-server-python --- .gitmodules | 3 +++ Makefile | 8 ++++++++ aw-client | 2 +- aw-core | 2 +- aw-server | 1 + 5 files changed, 14 insertions(+), 2 deletions(-) create mode 160000 aw-server diff --git a/.gitmodules b/.gitmodules index 9b4eb0bb..2bb7019c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,6 +4,9 @@ [submodule "aw-client"] path = aw-client url = https://github.com/ActivityWatch/aw-client.git +[submodule "aw-server"] + path = aw-server + url = https://github.com/ActivityWatch/aw-server.git [submodule "aw-watcher-afk"] path = aw-watcher-afk url = https://github.com/ActivityWatch/aw-watcher-afk.git diff --git a/Makefile b/Makefile index aabde5df..61d371b9 100644 --- a/Makefile +++ b/Makefile @@ -37,6 +37,7 @@ build: # make --directory=aw-core build DEV=$(DEV) make --directory=aw-client build DEV=$(DEV) + make --directory=aw-server build DEV=$(DEV) make --directory=aw-watcher-afk build DEV=$(DEV) make --directory=aw-watcher-window build DEV=$(DEV) make --directory=aw-server-rust build @@ -44,6 +45,8 @@ build: # The below is needed due to: https://github.com/ActivityWatch/activitywatch/issues/173 make --directory=aw-client build DEV=$(DEV) make --directory=aw-core build DEV=$(DEV) +# Needed to ensure that the server has the correct version set + python3 -c "import aw_server; print(aw_server.__version__)" # Install @@ -95,6 +98,7 @@ lint: aw-core/aw_transform/ \ aw-core/aw_analysis/ \ aw-client/aw_client/ \ + aw-server/aw_server/ \ aw-watcher-window/aw_watcher_window/ \ aw-watcher-afk/aw_watcher_afk/ \ aw-qt/aw_qt/ @@ -113,6 +117,7 @@ uninstall: test: make --directory=aw-core test make --directory=aw-client test + make --directory=aw-server test make --directory=aw-server-rust test make --directory=aw-qt test @@ -156,6 +161,9 @@ package: # make --directory=aw-watcher-window package cp -r aw-watcher-window/dist/aw-watcher-window dist/activitywatch +# + make --directory=aw-server package + cp -r aw-server/dist/aw-server dist/activitywatch # make --directory=aw-server-rust package cp -r aw-server-rust/target/package/* dist/activitywatch diff --git a/aw-client b/aw-client index 2e11d4b5..6846551b 160000 --- a/aw-client +++ b/aw-client @@ -1 +1 @@ -Subproject commit 2e11d4b50484cbe53e37a327eb487f487837f90e +Subproject commit 6846551b0c91ab37b79435a79e5b2a6bc34d3be6 diff --git a/aw-core b/aw-core index 4f4b4b24..f43bbf47 160000 --- a/aw-core +++ b/aw-core @@ -1 +1 @@ -Subproject commit 4f4b4b241d2d9873c85af81be30ad2770d0d1fc0 +Subproject commit f43bbf47d2f192e1d104babff94e2aa8f9f5f226 diff --git a/aw-server b/aw-server new file mode 160000 index 00000000..47a208ba --- /dev/null +++ b/aw-server @@ -0,0 +1 @@ +Subproject commit 47a208ba513e1e921a7389282757de3455623a36 From 50346bd8971a3a13e09225c90c3e3a760fcff701 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Erik=20Bj=C3=A4reholt?= Date: Tue, 7 Jan 2020 14:18:55 +0100 Subject: [PATCH 4/6] correctly placed aw-server-rust module in subdirectory, updated aw-server-rust submodule to correctly name executable as aw-server-rust --- Makefile | 3 ++- aw-server-rust | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 61d371b9..4aed9cc8 100644 --- a/Makefile +++ b/Makefile @@ -166,7 +166,8 @@ package: cp -r aw-server/dist/aw-server dist/activitywatch # make --directory=aw-server-rust package - cp -r aw-server-rust/target/package/* dist/activitywatch + mkdir dist/activitywatch/aw-server-rust + cp -r aw-server-rust/target/package/* dist/activitywatch/aw-server-rust # make --directory=aw-qt package cp -r aw-qt/dist/aw-qt/. dist/activitywatch diff --git a/aw-server-rust b/aw-server-rust index 5d96975e..2f3f31db 160000 --- a/aw-server-rust +++ b/aw-server-rust @@ -1 +1 @@ -Subproject commit 5d96975e96ccf6c0b272af8517c13ea1be584620 +Subproject commit 2f3f31db0d298e9e67ab50ad31da9be0239bef9b From 865b7e4b7b1f2e6ef32d6c812c9115ce58a9dec0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Erik=20Bj=C3=A4reholt?= Date: Tue, 14 Jan 2020 21:21:58 +0100 Subject: [PATCH 5/6] updated aw-server-rust --- aw-server-rust | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aw-server-rust b/aw-server-rust index 2f3f31db..b36c4214 160000 --- a/aw-server-rust +++ b/aw-server-rust @@ -1 +1 @@ -Subproject commit 2f3f31db0d298e9e67ab50ad31da9be0239bef9b +Subproject commit b36c421406d0129f1e9bed0cb1dfc90634cb74ed From 2ca1e6e691fb407c2c016c6b394b5c1a2bb0bb1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johan=20Bj=C3=A4reholt?= Date: Sat, 1 Feb 2020 12:53:54 +0100 Subject: [PATCH 6/6] Update aw-qt submodule --- aw-qt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aw-qt b/aw-qt index 565892a6..9d77022c 160000 --- a/aw-qt +++ b/aw-qt @@ -1 +1 @@ -Subproject commit 565892a6ef84a2b89eb4166485ec22b874dc785d +Subproject commit 9d77022ceaa29008dc2b39f34d76526fa972efc5