Skip to content

Commit 794ae62

Browse files
flierflier
committed
Merge branch 'release/v0.2.0'
2 parents a83daf4 + 61a20e6 commit 794ae62

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+2316
-600
lines changed

‎.gitignore

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
bin
44
build
55
dist
6-
docs
76
gen-cpp
87

98
.sconsign.dblite
109
.conan*
1110
SConscript_conan
12-
conan*info.txt
11+
conan*info.*
1312
config.log
1413
tags
1514

1615
*.o
17-
*.a
16+
*.a
17+
*.pyc

‎.travis.yml

+61
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
sudo: required
2+
3+
dist: trusty
4+
5+
services:
6+
- docker
7+
8+
os:
9+
- linux
10+
- osx
11+
12+
addons:
13+
apt:
14+
packages:
15+
- automake
16+
- bison
17+
- flex
18+
- build-essential
19+
- clang
20+
- cmake
21+
- g++
22+
- libboost-dev
23+
- libboost-filesystem-dev
24+
- libboost-program-options-dev
25+
- libboost-system-dev
26+
- libboost-test-dev
27+
- libevent-dev
28+
- libssl-dev
29+
- libtool
30+
- make
31+
- pkg-config
32+
- curl
33+
- tree
34+
35+
language: cpp
36+
37+
compiler:
38+
- clang
39+
- gcc
40+
41+
python:
42+
- "2.7"
43+
44+
env:
45+
global:
46+
- THRIFT_VERSION=0.10.0
47+
- RDKAFKA_VERSION=0.9.4
48+
49+
install:
50+
- pip install --upgrade pip
51+
- pip install --user conan
52+
53+
before_script:
54+
- .travis/install-dependencies.sh
55+
56+
script:
57+
- scons
58+
59+
after_failure:
60+
- echo `pwd`
61+
- tree -h

‎.travis/install-dependencies.sh

+37
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
#/bin/sh -f
2+
set -e
3+
4+
if [[ $TRAVIS_OS_NAME == 'osx' ]]; then
5+
brew update
6+
brew install thrift librdkafka
7+
8+
$HOME/.local/bin/conan install --build missing
9+
else
10+
curl -sSL "http://apache.mirrors.spacedump.net/thrift/$THRIFT_VERSION/thrift-$THRIFT_VERSION.tar.gz" -o thrift.tar.gz
11+
mkdir -p thrift-$THRIFT_VERSION
12+
tar zxf thrift.tar.gz -C thrift-$THRIFT_VERSION --strip-components=1
13+
rm thrift.tar.gz
14+
cd thrift-$THRIFT_VERSION
15+
./configure --without-python --without-java --without-ruby --without-php --without-erlang --without-go --without-nodejs --without-qt4
16+
make
17+
sudo make install
18+
cd ..
19+
rm -rf thrift-$THRIFT_VERSION
20+
21+
curl -sSL "https://github.com/edenhill/librdkafka/archive/v$RDKAFKA_VERSION.tar.gz" -o librdkafka.tar.gz
22+
mkdir -p librdkafka-$RDKAFKA_VERSION
23+
tar zxf librdkafka.tar.gz -C librdkafka-$RDKAFKA_VERSION --strip-components=1
24+
rm librdkafka.tar.gz
25+
cd librdkafka-$RDKAFKA_VERSION
26+
./configure
27+
make
28+
sudo make install
29+
cd ..
30+
rm -rf librdkafka-$RDKAFKA_VERSION
31+
32+
if [ "$CXX" == "g++" ]; then
33+
$HOME/.local/bin/conan install --build missing -s compiler=gcc -s compiler.libcxx=libstdc++11
34+
else
35+
$HOME/.local/bin/conan install --build missing -s compiler=clang -s compiler.libcxx=libstdc++11
36+
fi
37+
fi

‎CMakeLists.txt

+98
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,98 @@
1+
cmake_minimum_required (VERSION 2.8.12)
2+
3+
project(zipkin C CXX)
4+
5+
set (zipkin_VERSION_MAJOR 0)
6+
set (zipkin_VERSION_MINOR 2)
7+
set (zipkin_VERSION_PATCH 0)
8+
set (zipkin_VERSION ${zipkin_VERSION_MAJOR}.${zipkin_VERSION_MINOR}.${zipkin_VERSION_PATCH})
9+
10+
include(${PROJECT_SOURCE_DIR}/conanbuildinfo.cmake)
11+
conan_basic_setup()
12+
13+
if (NOT CMAKE_BUILD_TYPE)
14+
message(STATUS "Default build type 'Release with debug info'")
15+
set(CMAKE_BUILD_TYPE RELWITHDEBINFO CACHE STRING "" FORCE )
16+
else()
17+
string(TOUPPER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE)
18+
message(STATUS "Build type: ${CMAKE_BUILD_TYPE}")
19+
endif()
20+
21+
if(CMAKE_BUILD_TYPE MATCHES RELEASE|RELWITHDEBINFO)
22+
set(RELEASE_BUILD TRUE)
23+
else()
24+
set(RELEASE_BUILD FALSE)
25+
endif()
26+
27+
set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
28+
29+
set(Boost_USE_STATIC_LIBS ON) # only find static libs
30+
set(Boost_USE_MULTITHREADED ON)
31+
set(Boost_USE_STATIC_RUNTIME OFF)
32+
33+
find_package(Boost REQUIRED COMPONENTS regex system)
34+
if(Boost_FOUND)
35+
include_directories(${Boost_INCLUDE_DIRS})
36+
endif()
37+
38+
find_package(Thrift REQUIRED)
39+
find_package(LibRDKafka REQUIRED)
40+
find_package(Doxygen QUIET)
41+
42+
if (${DOXYGEN_FOUND} AND ${RELEASE_BUILD})
43+
set (BUILD_DOCS ON)
44+
else()
45+
set (BUILD_DOCS OFF)
46+
endif()
47+
48+
option (WITH_FPIC "Build with -fPIC for shared library" OFF)
49+
option (SHARED_LIB "Build shared library" OFF)
50+
option (BUILD_DOCS "Build API documentation (requires Doxygen)" BUILD_DOCS)
51+
52+
if (APPLE)
53+
set (CMAKE_MACOSX_RPATH ON)
54+
endif ()
55+
56+
if (RELEASE_BUILD)
57+
add_compile_options(-O2)
58+
else()
59+
add_compile_options(-g)
60+
endif()
61+
62+
if (WITH_FPIC)
63+
message(STATUS "Build with -fPIC")
64+
add_compile_options(-fPIC)
65+
endif()
66+
67+
set (INCDIR "${PROJECT_SOURCE_DIR}/include")
68+
set (BINDIR "${PROJECT_BINARY_DIR}/bin")
69+
set (LIBDIR "${PROJECT_BINARY_DIR}/lib")
70+
set (GENDIR "${PROJECT_BINARY_DIR}/gen-cpp")
71+
72+
if(CMAKE_GENERATOR STREQUAL Xcode)
73+
set(XCODE TRUE)
74+
endif()
75+
76+
include_directories(${PROJECT_SOURCE_DIR}/src)
77+
include_directories(${PROJECT_SOURCE_DIR}/include)
78+
include_directories(${PROJECT_SOURCE_DIR}/gen-cpp)
79+
include_directories(${PROJECT_BINARY_DIR})
80+
include_directories(SYSTEM include)
81+
82+
set(zipkin_DEPENDENCIES
83+
${CONAN_LIBS_GLOG}
84+
${CONAN_LIBS_GFLAGS}
85+
${THRIFT_LIBRARIES}
86+
${LibRDKafka_LIBRARIES}
87+
${Boost_LIBRARIES}
88+
)
89+
90+
message (STATUS "Link with ${zipkin_DEPENDENCIES}")
91+
92+
enable_testing()
93+
94+
add_subdirectory(docs)
95+
add_subdirectory(src)
96+
add_subdirectory(test)
97+
add_subdirectory(bench)
98+
add_subdirectory(examples)

0 commit comments

Comments
 (0)