diff --git a/LICENSE.txt b/LICENSE.txt index 7525f35dda027a..f32aad56f59d1f 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -412,12 +412,20 @@ be/src/olap/new_status.cpp : BSD-style license Copyright (c) 2011 The LevelDB Authors. All rights reserved. Use of this source code is governed by a BSD-style license that can be found in the LICENSE file. See the AUTHORS file for names of contributors. + +-------------------------------------------------------------------------------- + +be/src/util/murmur_hash3.h : licensed under the following terms: + + MurmurHash3 was written by Austin Appleby, and is placed in the public + domain. The author hereby disclaims copyright to this source code. + -------------------------------------------------------------------------------- be/src/util/murmur_hash3.cpp : licensed under the following terms: MurmurHash3 was written by Austin Appleby, and is placed in the public - omain. The author hereby disclaims copyright to this source code. + domain. The author hereby disclaims copyright to this source code. -------------------------------------------------------------------------------- @@ -449,7 +457,7 @@ webroot/static/jquery.js : MIT license -------------------------------------------------------------------------------- -jquery.dataTables.js and webroot/static/datatables*: MIT license +webroot/static/jquery.dataTables.js and webroot/static/datatables*: MIT license Copyright (C) 2008-2015, SpryMedia Ltd. diff --git a/README.md b/README.md index 456648135eb859..d01d9b2c202ebf 100644 --- a/README.md +++ b/README.md @@ -20,8 +20,7 @@ The simplicity (of developing, deploying and using) and meeting many data servin ## 4. Compile and install -Currently support Docker environment and Linux OS: -Docker (Linux / Windows / Mac), Ubuntu and CentOS. +Currently only supports Docker environment and Linux OS, such as Ubuntu and CentOS. ### 4.1 For Docker @@ -70,25 +69,15 @@ sh build.sh After successfully building, it will install binary files in the directory output/. -### 4.2 For Linux +### 4.2 For Linux OS #### Prerequisites -GCC 5.3.1+, Oracle JDK 1.8+, Python 2.7+, Apache Maven 3.5+, CMake 3.4.3+ - -* For Ubuntu: - -``` -sudo apt-get install g++ cmake zip byacc flex automake libtool binutils-dev libiberty-dev bison python2.7 libncurses5-dev -sudo updatedb -``` +You must be install following softwares: -* For CentOS: +GCC 5.3.1+, Oracle JDK 1.8+, Python 2.7+, Apache Maven 3.5+, CMake 3.4.3+ -``` -sudo yum install gcc-c++ libstdc++-static cmake byacc flex automake libtool binutils-devel bison ncurses-devel -sudo updatedb -``` +After you installed above all, you also must be set them to environment variable PATH and set JAVA_HOME. If your GCC version is less than 5.3.1, you can run: @@ -98,7 +87,6 @@ sudo yum install devtoolset-4-toolchain -y and then, set the path of GCC (e.g /opt/rh/devtoolset-4/root/usr/bin) to the environment variable PATH. - #### Compile and install Run following script, it will compile thirdparty libraries and build whole Doris. diff --git a/env.sh b/env.sh index 367ba5e09cc7e2..2bbe6853cd1036 100755 --- a/env.sh +++ b/env.sh @@ -21,6 +21,14 @@ if [[ -z ${DORIS_HOME} ]]; then exit 1 fi +# check OS type +if [[ ! -z "$OSTYPE" ]]; then + if [[ "$OSTYPE" != "linux-gnu" ]]; then + echo "Error: Unsupported OS type: $OSTYPE" + exit 1 + fi +fi + # include custom environment variables if [[ -f ${DORIS_HOME}/custom_env.sh ]]; then . ${DORIS_HOME}/custom_env.sh