Remove handwritten makefiles to keep only one build system (#576)

apache · May 13, 2022 · 518549f · 518549f
1 parent 6ab3ff4
commit 518549f
Show file tree

Hide file tree

Showing 17 changed files with 46 additions and 486 deletions.
diff --git a/.github/workflows/daily-ci.yaml b/.github/workflows/daily-ci.yaml
@@ -61,7 +61,6 @@ jobs:
 
       - name: Build
         run: |
-          git submodule init && git submodule update
           mkdir _build && cd _build
           cmake -DDISABLE_JEMALLOC=true -DCMAKE_BUILD_TYPE=Release ..
           make -j4 kvrocks kvrocks2redis
@@ -82,12 +81,13 @@ jobs:
 
       - name: Install Dependencies
         run: |
-          brew install snappy googletest gcc autoconf automake libtool
+          brew install cmake gcc autoconf automake libtool
           mkdir build
       - name: Build
         run: |
+          cd build
+          cmake ..
           make -j4
-          cp src/kvrocks build/kvrocks
       - name: Unit Test
         run: make test
 

diff --git a/.github/workflows/kvrocks.yaml b/.github/workflows/kvrocks.yaml
@@ -48,26 +48,24 @@ jobs:
           sudo apt-get update
           sudo apt-get install -y cppcheck
           sudo pip install cpplint==1.5.0
-          sudo apt-get install -y tar libsnappy-dev
+          sudo apt-get install -y tar cmake
           mkdir build
 
       - name: Lint
         run: |
-          make lint
+          ./cpplint.sh
+          ./cppcheck.sh
 
       - name: Build
         run: |
+          cd build
+          cmake ..
           make -j4
-          cp src/kvrocks build/kvrocks
+          cd ..
 
       - name: Unit Test
         run: |
-          wget https://github.com/google/googletest/archive/release-1.8.1.tar.gz
-          tar -zxvf release-1.8.1.tar.gz
-          cd googletest-release-1.8.1/
-          cmake CMakeLists.txt
-          make && sudo make install && cd -
-          make test
+          ./build/unittest
 
       - name: Redis Tcl Test
         run: |
@@ -79,28 +77,6 @@ jobs:
           cd tests/tcl && sh runtest
           sh runtest --single integration/redis-cli && cd -
 
-  build-on-ubuntu-with-cmake:
-    strategy:
-      matrix:
-        os: [ubuntu-18.04]
-    runs-on: ${{ matrix.os }}
-    needs: [license]
-    steps:
-      - name: Checkout Code Base
-        uses: actions/checkout@v2.3.4
-        with:
-          fetch-depth: 64
-
-      - name: Install Dependencies
-        run: |
-          sudo apt update
-          sudo apt-get install -y gcc g++ cmake
-          mkdir _build
-
-      - name: Build
-        run: |
-          sh build.sh _build
-
   build-on-macos-latest:
     runs-on: macos-11
     needs: [license]
@@ -112,8 +88,11 @@ jobs:
 
       - name: Install Dependencies
         run: |
-          brew install snappy googletest gcc autoconf automake libtool
+          brew install gcc autoconf automake libtool cmake
           mkdir build
 
       - name: Build
-        run: make -j4
+        run: |
+          cd build
+          cmake ..
+          make -j4
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -41,16 +41,19 @@ jobs:
 
       - name: Install Dependencies
         run: |
-          sudo apt-get install -y tar libsnappy-dev
+          sudo apt-get install -y tar cmake
           mkdir -p build/bin
           mkdir -p build/conf
 
       - name: Build
         run: |
+          cd build
+          cmake -DCMAKE_BUILD_TYPE=Release ..
           make -j4
-          cp src/kvrocks build/bin/
-          cp src/kvrocks2redis build/bin/
-          cp kvrocks.conf build/conf/
+          cp kvrocks bin/
+          cp kvrocks2redis bin/
+          cp ../kvrocks.conf conf/
+          cd ..
 
       - name: Set ENV
         run: |
@@ -101,7 +104,7 @@ jobs:
         run: |
           yum install -y epel-release
           yum install -y https://packages.endpointdev.com/rhel/7/os/x86_64/endpoint-repo.x86_64.rpm
-          yum install -y git gcc gcc-c++ make snappy snappy-devel autoconf automake libtool which gtest gtest-devel
+          yum install -y git gcc gcc-c++ make cmake autoconf automake libtool which
 
       - name: Checkout Code Base
         uses: actions/checkout@v2.3.4
@@ -110,12 +113,14 @@ jobs:
 
       - name: Build
         run: |
+          cd build
+          cmake -DCMAKE_BUILD_TYPE=Release
           make -j4
-          mkdir -p build/bin
-          mkdir -p build/conf
-          cp src/kvrocks build/bin/
-          cp src/kvrocks2redis build/bin/
-          cp kvrocks.conf build/conf/
+          mkdir -p bin
+          mkdir -p conf
+          cp kvrocks bin/
+          cp kvrocks2redis bin/
+          cp ../kvrocks.conf conf/
 
       - name: Set ENV
         run: |

diff --git a/.gitmodules b/.gitmodules
diff --git a/Dockerfile b/Dockerfile
@@ -17,19 +17,18 @@
 
 FROM ubuntu:22.04 as build
 
-RUN apt update && apt install -y make git autoconf libtool g++ libsnappy-dev
+RUN apt update && apt install -y cmake make git autoconf libtool g++
 WORKDIR /kvrocks
 
 COPY . .
-RUN make -j4
+RUN mkdir docker-build && ./build.sh docker-build
 
 
 FROM ubuntu:22.04
 
-RUN apt update && apt install -y libsnappy-dev
 WORKDIR /kvrocks
 
-COPY --from=build /kvrocks/src/kvrocks ./bin/
+COPY --from=build /kvrocks/docker-build/kvrocks ./bin/
 
 COPY ./kvrocks.conf  ./conf/
 RUN sed  -i -e 's|dir /tmp/kvrocks|dir /var/lib/kvrocks|g' ./conf/kvrocks.conf

diff --git a/Makefile b/Makefile
diff --git a/README.md b/README.md
@@ -43,44 +43,44 @@ Kvrocks has the following key features:
 
 #### requirements
 * g++ (required by c++11, version >= 4.8)
-* autoconf automake libtool snappy
+* autoconf automake libtool cmake
 
 #### Build
 
-***NOTE: You should install the snappy first:***
-
 ```shell
 # Centos/Redhat
-sudo yum install -y epel-release && sudo yum install -y git gcc gcc-c++ make snappy snappy-devel autoconf automake libtool which gtest gtest-devel
+sudo yum install -y epel-release && sudo yum install -y git gcc gcc-c++ make cmake autoconf automake libtool which
 
 # Ubuntu/Debian
 sudo apt update
-sudo apt-get install gcc g++ make libsnappy-dev autoconf automake libtool googletest libgtest-dev
+sudo apt-get install gcc g++ make cmake autoconf automake libtool
 
 # MACOSX
-brew install autoconf automake libtool snappy googletest
+brew install autoconf automake libtool cmake
 ```
 
 It is as simple as:
 
 ```shell
-$ git clone --recursive https://github.com/apache/incubator-kvrocks.git
+$ git clone https://github.com/apache/incubator-kvrocks.git
 $ cd kvrocks
-$ make -j4
+$ mkdir build
+$ ./build.sh build # manually run CMake if you want to build Debug version or add some build options
 ```
 
 ### Running kvrocks
 
 ```shell
-$ ./src/kvrocks -c kvrocks.conf
+$ ./build/kvrocks -c kvrocks.conf
 ```
 
 ### Running test cases
 
-***NOTE: You should install the googletest first***
-
 ```shell
-make test
+$ # make sure CMake was executed in ./build
+$ cd build
+$ make unittest
+$ ./unittest
 ```
 
 ### Supported platforms