Replace aw-server with aw-server-rust

snowy1220 · Feb 1, 2020 · 2ddeef5 · 2ddeef5
1 parent 5bfdb3d
commit 2ddeef5
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 11 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
diff --git a/aw-server-rust b/aw-server-rust