diff --git a/Makefile b/Makefile index 6e903c9..ff90cc9 100644 --- a/Makefile +++ b/Makefile @@ -1,51 +1,14 @@ -all: rocksdb libuv +all: @g++ -O2 -std=c++11 $(FLAGS) \ - -DROCKSDB_VERSION="\"4.13"\" \ -DSERVER_VERSION="\"0.1.0"\" \ - -DLIBUV_VERSION="\"1.10.1"\" \ - -Isrc/rocksdb-4.13/include/ \ - -Isrc/libuv-1.10.1/build/include/ \ -pthread \ - -o rocksdb-server \ src/server.cc src/client.cc src/exec.cc src/match.cc src/util.cc \ - src/rocksdb-4.13/librocksdb.a \ - src/rocksdb-4.13/libbz2.a \ - src/rocksdb-4.13/libz.a \ - src/rocksdb-4.13/libsnappy.a \ - src/libuv-1.10.1/build/lib/libuv.a + -o rocksdb-server \ + -lrocksdb \ + -luv clean: rm -f rocksdb-server - rm -rf src/libuv-1.10.1/ - rm -rf src/rocksdb-4.13/ install: all cp rocksdb-server /usr/local/bin uninstall: rm -f /usr/local/bin/rocksdb-server - -# libuv -libuv: src/libuv-1.10.1/build/lib/libuv.a -src/libuv-1.10.1/build/lib/libuv.a: - cd src && tar xf libuv-1.10.1.tar.gz - cd src/libuv-1.10.1 && sh autogen.sh - mkdir -p src/libuv-1.10.1/build - cd src/libuv-1.10.1/build && ../configure --prefix=$$(pwd) - make -C src/libuv-1.10.1/build install - - -# rocksdb -rocksdb: src/rocksdb-4.13 \ - src/rocksdb-4.13/librocksdb.a \ - src/rocksdb-4.13/libz.a \ - src/rocksdb-4.13/libbz2.a \ - src/rocksdb-4.13/libsnappy.a -src/rocksdb-4.13: - cd src && tar xf rocksdb-4.13.tar.gz -src/rocksdb-4.13/librocksdb.a: - DEBUG_LEVEL=0 make -C src/rocksdb-4.13 static_lib -src/rocksdb-4.13/libz.a: - DEBUG_LEVEL=0 make -C src/rocksdb-4.13 libz.a -src/rocksdb-4.13/libbz2.a: - DEBUG_LEVEL=0 make -C src/rocksdb-4.13 libbz2.a -src/rocksdb-4.13/libsnappy.a: - DEBUG_LEVEL=0 make -C src/rocksdb-4.13 libsnappy.a - diff --git a/README.md b/README.md index af2520d..f45eab4 100644 --- a/README.md +++ b/README.md @@ -22,10 +22,20 @@ Please let me know if you run into build problems. Requires `libtool` and `automake`. Ubuntu users: + +``` +$ apt-get install build-essential libtool automake make +``` + +In case `libuv`, `rocksdb`, or `git` are not installed: + + ``` -$ apt-get install build-esstential libtool automake +$ apt-get install git libuv1-dev librocksdb-dev ``` + + To build everything simply: ``` diff --git a/src/libuv-1.10.1.tar.gz b/src/libuv-1.10.1.tar.gz deleted file mode 100644 index 9928955..0000000 Binary files a/src/libuv-1.10.1.tar.gz and /dev/null differ diff --git a/src/rocksdb-4.13.tar.gz b/src/rocksdb-4.13.tar.gz deleted file mode 100644 index 119ced2..0000000 Binary files a/src/rocksdb-4.13.tar.gz and /dev/null differ diff --git a/src/server.cc b/src/server.cc index 05c3191..ce59bb7 100644 --- a/src/server.cc +++ b/src/server.cc @@ -134,11 +134,12 @@ int main(int argc, char **argv) { if (strcmp(argv[i], "-h")==0|| strcmp(argv[i], "--help")==0|| strcmp(argv[i], "-?")==0){ - fprintf(stdout, "RocksDB version " ROCKSDB_VERSION ", Libuv version " LIBUV_VERSION ", Server version " SERVER_VERSION "\n"); + fprintf(stdout, "RocksDB version %d.%d.%d, Libuv version %s, Server version " SERVER_VERSION "\n", ROCKSDB_MAJOR, ROCKSDB_MINOR, ROCKSDB_PATCH, uv_version_string()); fprintf(stdout, "usage: %s [-d data_path] [-p tcp_port] [--sync] [--inmem]\n", argv[0]); return 0; }else if (strcmp(argv[i], "--version")==0){ - fprintf(stdout, "RocksDB version " ROCKSDB_VERSION ", Libuv version " LIBUV_VERSION ", Server version " SERVER_VERSION "\n"); + fprintf(stdout, "RocksDB version %d.%d.%d, Libuv version %s, Server version " SERVER_VERSION "\n", ROCKSDB_MAJOR, ROCKSDB_MINOR, ROCKSDB_PATCH, uv_version_string()); + fprintf(stdout, "Server version " SERVER_VERSION "\n"); return 0; }else if (strcmp(argv[i], "-d")==0){ if (i+1 == argc){ @@ -166,7 +167,7 @@ int main(int argc, char **argv) { return 1; } } - log('#', "Server started, RocksDB version " ROCKSDB_VERSION ", Libuv version " LIBUV_VERSION ", Server version " SERVER_VERSION); + log('#', "Server started, RocksDB version %d.%d.%d, Libuv version %s, Server version " SERVER_VERSION "\n", ROCKSDB_MAJOR, ROCKSDB_MINOR, ROCKSDB_PATCH, uv_version_string()); opendb(); uv_tcp_t server; diff --git a/src/server.h b/src/server.h index e931eff..7a7a6fd 100644 --- a/src/server.h +++ b/src/server.h @@ -7,6 +7,7 @@ #include #include #include +#include extern rocksdb::DB* db; extern bool nosync;