Merge pull request #12 from zjyjer/master · 826ac6df5c · 码云极速下载/PaxosStore

码云极速下载 / PaxosStore

finished .travis.yml for paxoskv

dengos 提交于 2017-09-18 11:19 master

commit 826ac6df5cd2417b734c2c3069c887ce302771f5

12 文件发生了变化, 影响行数: +53 -42

.gitmodules +9 -0
.travis.yml +8 -2
certain/Makefile +1 -1
paxoskv/cmake/modules/Findleveldb.cmake -> paxoskv/cmake/modules/FindLevelDB.cmake +1 -1
paxoskv/cmake/modules/Findsnappy.cmake -> paxoskv/cmake/modules/FindSnappy.cmake +11 -3
paxoskv/dependency_tools/install_dependencies.sh +6 -0
paxoskv/dependency_tools/install_leveldb.sh +4 -12
paxoskv/dependency_tools/install_protobuf.sh +4 -12
paxoskv/dependency_tools/install_snappy.sh +6 -11
paxoskv/leveldb +1 -0
paxoskv/protobuf +1 -0
paxoskv/snappy +1 -0

		[submodule "paxoskv/googletest"]
		path = paxoskv/googletest
		url = https://github.com/google/googletest
		+[submodule "paxoskv/leveldb"]
		+ path = paxoskv/leveldb
		+ url = https://github.com/google/leveldb
		+[submodule "paxoskv/snappy"]
		+ path = paxoskv/snappy
		+ url = https://github.com/google/snappy
		[submodule "paxoskv/libco"]
		path = paxoskv/libco
		url = https://github.com/Tencent/libco
		@@ -18,3 +24,6 @@
		path = certain/third/googletest
		url = https://github.com/google/googletest
		ignore = dirty
		+[submodule "paxoskv/protobuf"]
		+ path = paxoskv/protobuf
		+ url = https://github.com/google/protobuf

		@@ -6,13 +6,19 @@ language: cpp
		compiler: g++

		git:
		- submodules: false
		+ submodules: true
		+
		+install:
		+ - ${TRAVIS_BUILD_DIR}/paxoskv/dependency_tools/install_dependencies.sh

		script:
		# For certain.
		- cd certain; sh build.sh; cd ..;
		# For paxoskv.
		-# (TODO)
		+ - cd paxoskv
		+ - mkdir build
		+ - cd build
		+ - cmake .. && make

		notifications:
		email: true

		@@ -21,7 +21,7 @@ GXXFLAGS = -O0 -g2 \
		-I$(PROTOBUF_PATH) -I$(COLIB_PATH) -I$(LEVELDB_PATH)/include -I$(GTEST_PATH)/include

		BUILDFLAGS = -static-libgcc -static-libstdc++ -std=c++11
		-DLIBS = -pthread -ldl
		+DLIBS = -pthread -ldl -lsnappy
		SLIBS = $(PROTOBUF_PATH)/.libs/libprotobuf.a $(COLIB_PATH)/lib/libcolib.a $(LEVELDB_PATH)/out-static/libleveldb.a

		#-----------------------------------------------

		@@ -18,7 +18,7 @@ else()

		find_library(
		LEVELDB_LIBRARY
		- NAMES leveldb
		+ NAMES libleveldb.a
		HINTS ${LEVELDB_ROOT_DIR} $ENV{LEVELDB_ROOT_DIR}
		PATH_SUFFIXES ${LIBRARY_PATH_PREFIX})

		@@ -13,10 +13,18 @@
		# set, the default paths are searched.

		if(NOT SNAPPY_ROOT)
		- find_path(SNAPPY_INCLUDE_DIRS snappy.h)
		- find_library(SNAPPY_LIBRARIES NAMES snappy)
		+ find_path(
		+ SNAPPY_INCLUDE_DIRS
		+ NAMES snappy.h
		+ HINTS ${CMAKE_SOURCE_DIR}/snappy
		+ PATH_SUFFIXES include)
		+ find_library(
		+ SNAPPY_LIBRARIES
		+ NAMES snappy
		+ HINTS ${CMAKE_SOURCE_DIR}/snappy
		+ PATH_SUFFIXES build)
		else()
		- find_path(SNAPPY_INCLUDE_DIRS snappy.h NO_DEFAULT_PATH PATHS ${SNAPPY_ROOT})
		+ find_path(SNAPPY_INCLUDE_DIRS NAMES snappy.h NO_DEFAULT_PATH PATHS ${SNAPPY_ROOT})
		find_library(SNAPPY_LIBRARIES NAMES snappy NO_DEFAULT_PATH PATHS ${SNAPPY_ROOT})
		endif()

		#!/bin/sh

		-rm -rf leveldb
		-mkdir leveldb
		-cd leveldb
		-wget https://github.com/google/leveldb/archive/v1.20.tar.gz -O leveldb-1.20.tar.gz
		-tar zxvf leveldb-1.20.tar.gz
		-cd leveldb-1.20
		-
		-make -j2
		-sudo cp out-shared/libleveldb.so* /usr/local/lib/
		-sudo cp out-static/libleveldb.a /usr/local/lib/
		-sudo cp include/leveldb /usr/local/include/ -r
		-sudo ldconfig
		+set -ex
		+base_dir=$(cd `dirname $0`;pwd)
		+cd $(dirname $base_dir)/leveldb
		+make -j2 && sudo cp out-shared/libleveldb.so* /usr/local/lib/ && sudo cp out-static/libleveldb.a /usr/local/lib/ && sudo cp include/leveldb /usr/local/include/ -r && sudo ldconfig

		#!/bin/sh

		-rm -rf protobuf
		-mkdir protobuf
		-cd protobuf
		-wget https://github.com/google/protobuf/releases/download/v2.6.1/protobuf-2.6.1.tar.gz -O protobuf-2.6.1.tar.gz
		-tar zxvf protobuf-2.6.1.tar.gz
		-cd protobuf-2.6.1
		-
		-./configure
		-make -j3
		-make check
		-sudo make install
		-sudo ldconfig
		+set -ex
		+base_dir=$(cd `dirname $0`;pwd)
		+cd $(dirname $base_dir)/protobuf
		+./autogen.sh && ./configure && make -j3 && make check && sudo make install && sudo ldconfig

		#!/bin/sh

		-rm -rf snappy
		-mkdir snappy
		-cd snappy
		-wget https://github.com/google/snappy/archive/1.1.6.tar.gz -O snappy-1.1.6.tar.gz
		-tar zxvf snappy-1.1.6.tar.gz
		-cd snappy-1.1.6
		-
		-mkdir build
		-cd build && cmake ../ && make -j2
		-sudo make install
		-sudo ldconfig
		+set -ex
		+base_dir=$(cd `dirname $0`;pwd)
		+cd $(dirname $base_dir)/snappy
		+mkdir build && cd build
		+export CXXFLAGS="-fPIC" && cmake ../ && make -j2
		+sudo make install && sudo ldconfig

paxoskv/leveldb (Git 子模块)

不支持预览此文件

paxoskv/protobuf (Git 子模块)

不支持预览此文件

paxoskv/snappy (Git 子模块)

不支持预览此文件

登录后才可以发表评论