diff --git a/.gitignore b/.gitignore index 563746118..37c91958a 100644 --- a/.gitignore +++ b/.gitignore @@ -40,7 +40,6 @@ daemon.ini lokinet-win32.exe lokinet lokinet.exe -rapidjson/ .gradle/ diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 15b8f79b6..6a9b687a7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -11,9 +11,9 @@ build:linux: - linux stage: build before_script: - - apk add --update g++ make cmake linux-headers libcap-dev rapidjson + - apk add --update g++ make cmake linux-headers libcap-dev script: - - make + - make artifacts: paths: - "lokinet" diff --git a/docker/debian.Dockerfile b/docker/debian.Dockerfile index d66204fd1..1ba7cb007 100644 --- a/docker/debian.Dockerfile +++ b/docker/debian.Dockerfile @@ -1,7 +1,7 @@ FROM debian:stable RUN apt update && \ - apt install -y build-essential cmake git libcap-dev curl rapidjson-dev ninja-build + apt install -y build-essential cmake git libcap-dev curl ninja-build WORKDIR /src/ diff --git a/docker/fedora.Dockerfile b/docker/fedora.Dockerfile index 524bfd5ee..647c18948 100644 --- a/docker/fedora.Dockerfile +++ b/docker/fedora.Dockerfile @@ -2,7 +2,7 @@ FROM fedora:latest RUN dnf update -y && \ dnf upgrade -y && \ - dnf install -y cmake make git gcc gcc-c++ libcap-devel curl rapidjson-devel + dnf install -y cmake make git gcc gcc-c++ libcap-devel curl WORKDIR /src/ diff --git a/docker/loki-svc-kubernetes.Dockerfile b/docker/loki-svc-kubernetes.Dockerfile index 7e6893caf..aee2a9018 100644 --- a/docker/loki-svc-kubernetes.Dockerfile +++ b/docker/loki-svc-kubernetes.Dockerfile @@ -1,7 +1,7 @@ FROM debian:stable RUN apt update && \ - apt install -y build-essential cmake git libcap-dev curl rapidjson-dev python3-dev python3-setuptools libsodium-dev + apt install -y build-essential cmake git libcap-dev curl python3-dev python3-setuptools libsodium-dev WORKDIR /src/ @@ -9,4 +9,4 @@ COPY . /src/ RUN make -j 8 SHARED_LIB=ON JSONRPC=ON && make kubernetes-install -ENTRYPOINT [ "/usr/bin/python3", "-m", "pylokinet"] \ No newline at end of file +ENTRYPOINT [ "/usr/bin/python3", "-m", "pylokinet"] diff --git a/docker/ubuntu.Dockerfile b/docker/ubuntu.Dockerfile index 031515e2b..9c94ea923 100644 --- a/docker/ubuntu.Dockerfile +++ b/docker/ubuntu.Dockerfile @@ -1,7 +1,7 @@ FROM ubuntu:latest RUN apt update && \ - apt install -y build-essential cmake git libcap-dev curl rapidjson-dev ninja-build + apt install -y build-essential cmake git libcap-dev curl ninja-build WORKDIR /src/ diff --git a/readme.md b/readme.md index 713cf97cb..6041a2859 100644 --- a/readme.md +++ b/readme.md @@ -15,14 +15,13 @@ Build requirements: * GNU Make * CMake * C++ 17 capable C++ compiler -* rapidjson (if enabling jsonrpc server) * gcovr (if generating test coverage with gcc) ### Linux build: - $ sudo apt install build-essential cmake git libcap-dev wget rapidjson-dev + $ sudo apt install build-essential cmake git libcap-dev wget $ git clone https://github.com/loki-project/loki-network $ cd loki-network $ make -j8 @@ -49,7 +48,7 @@ install (root): build (where `$ARCH` is your platform - `i686` or `x86_64`): - $ pacman -Sy base-devel mingw-w64-$ARCH-toolchain git libtool autoconf mingw-w64-$ARCH-cmake mingw-w64-$ARCH-rapidjson + $ pacman -Sy base-devel mingw-w64-$ARCH-toolchain git libtool autoconf mingw-w64-$ARCH-cmake $ git clone https://github.com/loki-project/loki-network.git $ cd loki-network $ mkdir -p build; cd build