From a5950ce0e707384313be89a08affb5fc323bb87b Mon Sep 17 00:00:00 2001 From: Edouard DUPIN Date: Mon, 24 Oct 2016 22:25:37 +0200 Subject: [PATCH] [CI] update build --- .travis.yml | 86 +++++++++++++++++++++++++++++++++++---------------- README.md | 57 +++++++++++++++++++++++++++++++--- lutin_enet.py | 3 +- 3 files changed, 115 insertions(+), 31 deletions(-) diff --git a/.travis.yml b/.travis.yml index 535e0c1..962a990 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,11 +1,7 @@ -language: - - cpp +language: cpp -sudo: false - -os: - - linux - - osx +sudo: required +dist: trusty branches: only: @@ -18,37 +14,75 @@ addons: - ubuntu-toolchain-r-test packages: - g++-4.9 + - expect + - binutils-mingw-w64-x86-64 # 64bit MinGW + - gcc-mingw-w64-x86-64 + - g++-mingw-w64-x86-64 + +matrix: + include: + - os: linux + env: CONF=release BUILDER=gcc TARGET=Linux TAG=Linux COMPILATOR_OPTION="--compilator-version=4.9" GCOV=--gcov + compiler: gcc + - os: linux + env: CONF=debug BUILDER=clang TARGET=Linux + compiler: clang + - os: linux + env: CONF=release BUILDER=gcc TARGET=Windows TAG=Mingw + compiler: x86_64-w64-mingw32-gcc + - os: linux + env: CONF=release BUILDER=gcc TARGET=Android TAG=Android DISABLE_PACKAGE=-p + compiler: gcc + - os: osx + env: CONF=release BUILDER=clang TARGET=MacOs TAG=MacOs + compiler: clang + - os: osx + env: CONF=release BUILDER=clang TARGET=IOs TAG=IOs + compiler: clang + install: + - cd .. - pip install --user lutin - -env: - - CONF=debug BOARD=Linux BUILDER=clang GCOV= - - CONF=release BOARD=Linux BUILDER=clang GCOV= - - CONF=debug BOARD=Linux BUILDER=gcc GCOV= - - CONF=release BOARD=Linux BUILDER=gcc GCOV= - - CONF=debug BOARD=Linux BUILDER=gcc GCOV=--gcov + - if [ "$TAG" == "Android" ]; then + git clone --depth 1 --branch master https://github.com/HeeroYui/android-download-tool; + ./android-download-tool/dl-android.sh; + fi + - git clone --depth 1 --branch master https://github.com/atria-soft/ci.git + - cd - before_script: - cd .. - - wget http://atria-soft.com/ci/coverage_send.py - - wget http://atria-soft.com/ci/test_send.py - - wget http://atria-soft.com/ci/warning_send.py - - git clone https://github.com/atria-soft/etk.git + - git clone https://github.com/atria-soft/elog.git -b $TRAVIS_BRANCH + - git clone https://github.com/atria-soft/ememory.git -b $TRAVIS_BRANCH + - git clone https://github.com/atria-soft/echrono.git -b $TRAVIS_BRANCH + - git clone https://github.com/atria-soft/algue.git -b $TRAVIS_BRANCH + - git clone https://github.com/atria-soft/etk.git -b $TRAVIS_BRANCH + - git clone https://github.com/atria-soft/ethread.git -b $TRAVIS_BRANCH - git clone https://github.com/generic-library/gtest-lutin.git --recursive + - git clone https://github.com/generic-library/z-lutin.git --recursive + - git clone https://github.com/generic-library/openssl-lutin.git --recursive - pwd - ls -l - - if [ "$BUILDER" == "gcc" ]; then COMPILATOR_OPTION="--compilator-version=4.9"; else COMPILATOR_OPTION=""; fi + - if [ "$TRAVIS_OS_NAME" == "osx" ]; then + export PATH=$PATH:/Users/travis/Library/Python/2.7/bin/; + fi + - ./ci/build_send.py --tag=$TAG --status=START; -script: - - lutin -w -j4 -C -P -c $BUILDER $COMPILATOR_OPTION -m $CONF $GCOV -p enet-test +script: + - lutin -w -j4 -C -P -t$TARGET -c $BUILDER $COMPILATOR_OPTION $BUS -m $CONF $GCOV $DISABLE_PACKAGE enet-*; STATUS=$? + - ./ci/build_send.py --tag=$TAG --status="$STATUS"; after_script: - - if [ "$GCOV" != "" ]; then python ./warning_send.py --find-path ./out/Linux_x86_64/$CONF/build/$BUILDER/enet/ ; fi - - ./out/Linux_x86_64/$CONF/staging/$BUILDER/enet-test/usr/bin/enet-test -l6 | tee out_test.txt - - if [ "$GCOV" != "" ]; then python ./test_send.py --file=out_test.txt; fi - - if [ "$GCOV" != "" ]; then lutin -C -P -c $BUILDER $COMPILATOR_OPTION -m $CONF -p enet?gcov; fi - - if [ "$GCOV" != "" ]; then python ./coverage_send.py --json=out/Linux_x86_64/$CONF/build/$BUILDER/enet/enet_coverage.json; fi + - if [ "$GCOV" != "" ]; then + ./ci/warning_send.py --find-path ./out/Linux_x86_64/$CONF/build/$BUILDER/enet/; + fi + - lutin -w -j4 -C -P -t$TARGET -c $BUILDER $COMPILATOR_OPTION $BUS -m $CONF $GCOV $DISABLE_PACKAGE enet-test-client-websocket?run:--elog-level=3 | tee out_test.txt + - if [ "$GCOV" != "" ]; then + ./ci/test_send.py --file=out_test.txt; + lutin -C -P -t $TARGET -c $BUILDER $COMPILATOR_OPTION $BUS -m $CONF -p enet?gcov; + ./ci/coverage_send.py --json=out/Linux_x86_64/$CONF/build/$BUILDER/enet/enet_coverage.json; + fi notifications: email: diff --git a/README.md b/README.md index 1ef7c40..04f482d 100644 --- a/README.md +++ b/README.md @@ -3,18 +3,67 @@ enet `enet` is a network abstraction layer for ewol +Release (master) +---------------- + [![Build Status](https://travis-ci.org/atria-soft/enet.svg?branch=master)](https://travis-ci.org/atria-soft/enet) - [![Coverage Status](http://atria-soft.com/ci/coverage/atria-soft/enet.svg?branch=master)](http://atria-soft.com/ci/atria-soft/enet) - [![Test Status](http://atria-soft.com/ci/test/atria-soft/enet.svg?branch=master)](http://atria-soft.com/ci/atria-soft/enet) - [![Warning Status](http://atria-soft.com/ci/warning/atria-soft/enet.svg?branch=master)](http://atria-soft.com/ci/atria-soft/enet) +[![Build Status](http://atria-soft.com/ci/build/atria-soft/enet.svg?branch=master&tag=Linux)](http://atria-soft.com/ci/atria-soft/enet) +[![Build Status](http://atria-soft.com/ci/build/atria-soft/enet.svg?branch=master&tag=MacOs)](http://atria-soft.com/ci/atria-soft/enet) +[![Build Status](http://atria-soft.com/ci/build/atria-soft/enet.svg?branch=master&tag=Mingw)](http://atria-soft.com/ci/atria-soft/enet) + +[![Build Status](http://atria-soft.com/ci/build/atria-soft/enet.svg?branch=master&tag=Android)](http://atria-soft.com/ci/atria-soft/enet) +[![Build Status](http://atria-soft.com/ci/build/atria-soft/enet.svg?branch=master&tag=IOs)](http://atria-soft.com/ci/atria-soft/enet) + +Developement (dev) +------------------ + +[![Build Status](https://travis-ci.org/atria-soft/enet.svg?branch=dev)](https://travis-ci.org/atria-soft/enet) +[![Coverage Status](http://atria-soft.com/ci/coverage/atria-soft/enet.svg?branch=dev)](http://atria-soft.com/ci/atria-soft/enet) +[![Test Status](http://atria-soft.com/ci/test/atria-soft/enet.svg?branch=dev)](http://atria-soft.com/ci/atria-soft/enet) +[![Warning Status](http://atria-soft.com/ci/warning/atria-soft/enet.svg?branch=dev)](http://atria-soft.com/ci/atria-soft/enet) + +[![Build Status](http://atria-soft.com/ci/build/atria-soft/enet.svg?branch=dev&tag=Linux)](http://atria-soft.com/ci/atria-soft/enet) +[![Build Status](http://atria-soft.com/ci/build/atria-soft/enet.svg?branch=dev&tag=MacOs)](http://atria-soft.com/ci/atria-soft/enet) +[![Build Status](http://atria-soft.com/ci/build/atria-soft/enet.svg?branch=dev&tag=Mingw)](http://atria-soft.com/ci/atria-soft/enet) + +[![Build Status](http://atria-soft.com/ci/build/atria-soft/enet.svg?branch=dev&tag=Android)](http://atria-soft.com/ci/atria-soft/enet) +[![Build Status](http://atria-soft.com/ci/build/atria-soft/enet.svg?branch=dev&tag=IOs)](http://atria-soft.com/ci/atria-soft/enet) + + Instructions ============ -To compile and use see 'ewol' or 'edn' project +download Build system: +---------------------- + + sudo pip install lutin + sudo pip install pillow + +download the software: +---------------------- + + mkdir WORKING_DIRECTORY + cd WORKING_DIRECTORY + git clone https://github.com/atria-soft/elog.git + git clone https://github.com/atria-soft/ememory.git + git clone https://github.com/atria-soft/echrono.git + git clone https://github.com/atria-soft/algue.git + git clone https://github.com/atria-soft/etk.git + git clone https://github.com/atria-soft/enet.git + git clone https://github.com/generic-library/gtest-lutin.git --recursive + git clone https://github.com/generic-library/z-lutin.git --recursive + git clone https://github.com/generic-library/openssl-lutin.git --recursive + +Compile software: +----------------- + + cd WORKING_DIRECTORY + lutin -C -P enet-test?build?run + License (APACHE v2.0) ===================== diff --git a/lutin_enet.py b/lutin_enet.py index e019e09..9db9448 100644 --- a/lutin_enet.py +++ b/lutin_enet.py @@ -28,7 +28,8 @@ def configure(target, my_module): my_module.add_depend([ 'etk', 'ememory', - 'algue' + 'algue', + 'ethread' ]) my_module.add_path(".") my_module.add_src_file([