Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Added g++-4.4 to travis build #266

Merged
merged 1 commit into from
Mar 2, 2017
Merged

Added g++-4.4 to travis build #266

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions pulsar-client-cpp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@ set(Boost_NO_BOOST_CMAKE ON)

set (CMAKE_CXX_FLAGS "-Wno-deprecated-declarations ${CMAKE_CXX_FLAGS}")

execute_process(COMMAND gcc -dumpversion OUTPUT_VARIABLE GCC_DUMP_VERSION)

find_package(Boost REQUIRED COMPONENTS program_options filesystem regex thread system)
find_package(OpenSSL REQUIRED)
find_package(ZLIB REQUIRED)
Expand Down Expand Up @@ -64,8 +62,6 @@ set(CLIENT_LIBS
pulsar
)

message( STATUS "GCC_DUMP_VERSION: " ${GCC_DUMP_VERSION} )

add_subdirectory(lib)
add_subdirectory(perf)
add_subdirectory(examples)
Expand Down
7 changes: 3 additions & 4 deletions pulsar-client-cpp/travis-build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,16 +55,15 @@ exec_cmd() {

if [ "$3" = "all" -o "$3" = "dep" ]; then
# Install dependant packages
exec_cmd "apt-get update && apt-get install -y cmake gcc-4.4 cpp-4.4 gcc-4.4-base libssl-dev libcurl4-openssl-dev liblog4cxx10-dev libprotobuf-dev libboost1.55-all-dev libgtest-dev libxml2-utils";
exec_cmd "unlink `which gcc` && ln -s `which gcc-4.4` `which gcc`"
exec_cmd "apt-get update && apt-get install -y cmake gcc-4.4 cpp-4.4 gcc-4.4-base libssl-dev libcurl4-openssl-dev liblog4cxx10-dev libprotobuf-dev libboost1.55-all-dev libgtest-dev libxml2-utils g++-4.4";
exec_cmd "pushd $1/ && wget https://github.com/google/protobuf/releases/download/v2.6.1/protobuf-2.6.1.tar.gz && popd";
exec_cmd "pushd /usr/src/gtest && cmake . && make && cp *.a /usr/lib && popd";
exec_cmd "pushd /usr/src/gtest && CC=gcc-4.4 CXX=g++-4.4 cmake . && make && cp *.a /usr/lib && popd";
exec_cmd "pushd $1/ && tar xvfz $1/protobuf-2.6.1.tar.gz && pushd $1/protobuf-2.6.1 && ./configure && make && make install && popd && popd";
fi

if [ "$3" = "all" -o "$3" = "compile" ]; then
# Compile and run unit tests
exec_cmd "pushd $2/pulsar-client-cpp && cmake . && make && popd";
exec_cmd "pushd $2/pulsar-client-cpp && CC=gcc-4.4 CXX=g++-4.4 cmake . && make && popd";
PULSAR_STANDALONE_CONF=$2/pulsar-client-cpp/tests/standalone.conf $2/bin/pulsar standalone &
standalone_pid=$!;
PULSAR_STANDALONE_CONF=$2/pulsar-client-cpp/tests/authentication.conf $2/bin/pulsar standalone --zookeeper-port 2191 --bookkeeper-port 3191 --zookeeper-dir data2/standalone/zookeeper --bookkeeper-dir data2/standalone/zookeeper &
Expand Down