Skip to content

Commit 71b07e8

Browse files
committed
issue=1094 remove cmake from build.sh
1 parent e709d15 commit 71b07e8

File tree

4 files changed

+21
-28
lines changed

4 files changed

+21
-28
lines changed

BUILD

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,17 @@ Pre-requisite
1010

1111
Operating System
1212
* Linux
13+
14+
Build Essential
15+
* GCC (4.8.2 or newer)
16+
https://gcc.gnu.org/
17+
* CMake (3.2.x or newer)
18+
https://cmake.org/
19+
* Python (2.7.x only)
20+
https://www.python.org/
21+
1322
Dependency Overview
14-
* sofa-pbrpc (1.1.0 or newer)
23+
* sofa-pbrpc (1.1.1 or newer)
1524
https://github.com/baidu/sofa-pbrpc/
1625
* Protocol Buffers (2.6.1 or newer)
1726
https://developers.google.com/protocol-buffers/
@@ -44,10 +53,6 @@ pre-installed. But if they are not, install them by yourself.
4453
* ncurses
4554
https://www.gnu.org/software/ncurses/
4655

47-
Some dependencies mentioned above may need cmake to build.
48-
* cmake (3.2.x or newer)
49-
https://cmake.org/
50-
5156
Basic Build
5257
===========
5358

BUILD-cn

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,17 @@ Tera构建手册
99

1010
操作系统
1111
* Linux系统
12+
13+
构建工具
14+
* GCC (4.8.2 or newer)
15+
https://gcc.gnu.org/
16+
* CMake (3.2.x or newer)
17+
https://cmake.org/
18+
* Python (2.7.x only)
19+
https://www.python.org/
20+
1221
第三方软件
13-
* sofa-pbrpc (1.1.0 or newer)
22+
* sofa-pbrpc (1.1.1 or newer)
1423
https://github.com/baidu/sofa-pbrpc/
1524
* Protocol Buffers (2.6.1 or newer)
1625
https://developers.google.com/protocol-buffers/
@@ -43,10 +52,6 @@ Tera构建手册
4352
* ncurses
4453
https://www.gnu.org/software/ncurses/
4554

46-
编译上述某些库时需要用到cmake,如果系统中没有预装,也需要自行安装。
47-
* cmake (3.2.x or newer)
48-
https://cmake.org/
49-
5055
编译步骤
5156
========
5257

build.conf

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ PROTOBUF_VERSION=2.6.1
1010
SNAPPY_VERSION=1.1.3
1111
SOFA_PBRPC_VERSION=1.1.1
1212
ZOOKEEPER_VERSION=3.4.9
13-
CMAKE_VERSION=3.2.1
1413
GFLAGS_VERSION=2.1.2
1514
GLOG_VERSION=0.3.3
1615
GTEST_VERSION=1.8.0
@@ -25,7 +24,6 @@ if [ $MIRROR == "china" ]; then
2524
SNAPPY_URL=http://mirrors.163.com/gentoo/distfiles/snappy-${SNAPPY_VERSION}.tar.gz
2625
SOFA_PBRPC_URL=https://github.com/baidu/sofa-pbrpc/archive/v${SOFA_PBRPC_VERSION}.tar.gz
2726
ZOOKEEPER_URL=http://mirrors.163.com/gentoo/distfiles/zookeeper-${ZOOKEEPER_VERSION}.tar.gz
28-
CMAKE_URL=https://github.com/Kitware/CMake/archive/v${CMAKE_VERSION}.tar.gz
2927
GFLAGS_URL=https://github.com/schuhschuh/gflags/archive/v${GFLAGS_VERSION}.tar.gz
3028
GLOG_URL=https://github.com/google/glog/archive/v${GLOG_VERSION}.tar.gz
3129
GTEST_URL=https://github.com/google/googletest/archive/release-${GTEST_VERSION}.tar.gz
@@ -39,21 +37,19 @@ elif [ $MIRROR == "origin" ]; then
3937
SNAPPY_URL=https://github.com/google/snappy/releases/download/${SNAPPY_VERSION}/snappy-${SNAPPY_VERSION}.tar.gz
4038
SOFA_PBRPC_URL=https://github.com/baidu/sofa-pbrpc/archive/v${SOFA_PBRPC_VERSION}.tar.gz
4139
ZOOKEEPER_URL=http://www-us.apache.org/dist/zookeeper/zookeeper-${ZOOKEEPER_VERSION}/zookeeper-${ZOOKEEPER_VERSION}.tar.gz
42-
CMAKE_URL=https://github.com/Kitware/CMake/archive/v${CMAKE_VERSION}.tar.gz
4340
GFLAGS_URL=https://github.com/schuhschuh/gflags/archive/v${GFLAGS_VERSION}.tar.gz
4441
GLOG_URL=https://github.com/google/glog/archive/v${GLOG_VERSION}.tar.gz
4542
GTEST_URL=https://github.com/google/googletest/archive/release-${GTEST_VERSION}.tar.gz
4643
LIBUNWIND_URL=http://download.savannah.gnu.org/releases/libunwind/libunwind-${LIBUNWIND_VERSION}.tar.gz
4744
GPERFTOOLS_URL=https://github.com/gperftools/gperftools/releases/download/gperftools-${GPERFTOOLS_VERSION}/gperftools-${GPERFTOOLS_VERSION}.tar.gz
4845
INS_URL=https://github.com/baidu/ins/archive/${INS_VERSION}.tar.gz
49-
NOSE_URL=http://mirrors.163.com/gentoo/distfiles/nose-${NOSE_VERSION}.tar.gz
46+
NOSE_URL=https://pypi.python.org/packages/58/a5/0dc93c3ec33f4e281849523a5a913fa1eea9a3068acfa754d44d88107a44/nose-${NOSE_VERSION}.tar.gz
5047
elif [ $MIRROR == "baidu" ]; then
5148
BOOST_URL=http://gitlab.baidu.com/baidups/third/raw/master/boost_${BOOST_VERSION}.tar.bz2
5249
PROTOBUF_URL=http://gitlab.baidu.com/baidups/third/raw/master/protobuf-${PROTOBUF_VERSION}.tar.bz2
5350
SNAPPY_URL=http://gitlab.baidu.com/baidups/third/raw/master/snappy-${SNAPPY_VERSION}.tar.gz
5451
SOFA_PBRPC_URL=http://gitlab.baidu.com/baidups/third/raw/master/sofa-pbrpc-${SOFA_PBRPC_VERSION}.tar.gz
5552
ZOOKEEPER_URL=http://gitlab.baidu.com/baidups/third/raw/master/zookeeper-${ZOOKEEPER_VERSION}.tar.gz
56-
CMAKE_URL=http://gitlab.baidu.com/baidups/third/raw/master/CMake-${CMAKE_VERSION}.tar.gz
5753
GFLAGS_URL=http://gitlab.baidu.com/baidups/third/raw/master/gflags-${GFLAGS_VERSION}.tar.gz
5854
GLOG_URL=http://gitlab.baidu.com/baidups/third/raw/master/glog-${GLOG_VERSION}.tar.gz
5955
GTEST_URL=http://gitlab.baidu.com/baidups/third/raw/master/googletest-release-${GTEST_VERSION}.tar.gz

build.sh

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -99,19 +99,6 @@ if [ ! -f "${FLAG_DIR}/zookeeper_${ZOOKEEPER_VERSION}" ] \
9999
touch "${FLAG_DIR}/zookeeper_${ZOOKEEPER_VERSION}"
100100
fi
101101

102-
# cmake for gflags
103-
if [ ! -f "${FLAG_DIR}/cmake_${CMAKE_VERSION}" ] \
104-
|| [ ! -f "${DEPS_PREFIX}/bin/cmake" ]; then
105-
wget --no-check-certificate -O CMake-${CMAKE_VERSION}.tar.gz ${CMAKE_URL}
106-
tar zxf CMake-${CMAKE_VERSION}.tar.gz --recursive-unlink
107-
cd CMake-${CMAKE_VERSION}
108-
./configure --prefix=${DEPS_PREFIX}
109-
make -j4
110-
make install
111-
cd -
112-
touch "${FLAG_DIR}/cmake_${CMAKE_VERSION}"
113-
fi
114-
115102
# gflags
116103
if [ ! -f "${FLAG_DIR}/gflags_${GFLAGS_VERSION}" ] \
117104
|| [ ! -f "${DEPS_PREFIX}/lib/libgflags.a" ] \

0 commit comments

Comments
 (0)