[CI] better travis file

2015-12-02 21:48:12 +01:00 · 2015-12-02 21:48:12 +01:00 · c9dc2ac7ef
commit c9dc2ac7ef
parent 9da8a9e028
3 changed files with 86 additions and 49 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -1,15 +1,6 @@
-language:
-  - cpp
-
-#dist: trusty
+language: cpp

 sudo: false
-#sudo: required
-
-os:
-  - linux
-  - osx
-#  - mingw

 branches:
  only:
@ -22,64 +13,66 @@ addons:
      - ubuntu-toolchain-r-test
    packages:
      - g++-4.9
-
-env:
-  - CONF=debug BUILDER=clang
-  - CONF=debug BUILDER=gcc
+      - expect
+      #- binutils-mingw-w64-x86-64 # 64bit MinGW
+      #- gcc-mingw-w64-x86-64
+      #- g++-mingw-w64-x86-64

 matrix:
  include:
    - os: linux
-      env: CONF=debug BUILDER=gcc GCOV=--gcov
+      env: CONF=release BUILDER=gcc TARGET=Linux TAG=Linux COMPILATOR_OPTION="--compilator-version=4.9"
+      compiler: gcc
    - os: linux
-      env: CONF=release BUILDER=clang
-    - os: linux
-      env: CONF=release BUILDER=gcc
-  exclude:
-    - os: mingw
-      env: CONF=debug BUILDER=clang
+      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:
-  - uname -a
-  - printenv
+  - cd ..
  - pip install --user lutin
-
+  - 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/generic-library/gtest-lutin.git --recursive
+  - git clone https://github.com/generic-library/z-lutin.git --recursive
  - pwd
  - ls -l
-  - if [ "$BUILDER" == "gcc" ]; then
-        export COMPILATOR_OPTION="--compilator-version=4.9";
-    else
-        export COMPILATOR_OPTION="";
-    fi
  - if [ "$TRAVIS_OS_NAME" == "osx" ]; then
        export PATH=$PATH:/Users/travis/Library/Python/2.7/bin/;
    fi
-  - if [ "$TRAVIS_OS_NAME" == "mingw" ]; then
-        export TARGET="-t Windows";
-        export COMPILATOR_OPTION="";
-    else
-        export TARGET="";
-    fi
+  - ./ci/build_send.py --tag=$TAG --status=START;

 script:
-  - lutin -w -j4 -C -P $TARGET -c $BUILDER $COMPILATOR_OPTION -m $CONF $GCOV etk-test
+  - lutin -w -j4 -C -P -t$TARGET -c $BUILDER $COMPILATOR_OPTION $BUS -m $CONF $GCOV $DISABLE_PACKAGE etk-test; 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/etk/;
+        ./ci/warning_send.py --find-path ./out/Linux_x86_64/$CONF/build/$BUILDER/etk/;
    fi
-  - ./out/Linux_x86_64/$CONF/staging/$BUILDER/etk-test/etk-test.app/bin/etk-test -l6 | tee out_test.txt
+  - ./out/Linux_x86_64/$CONF/staging/$BUILDER/etk-test/etk-test.app/bin/etk-test --etk-log-level=6 | tee out_test.txt
  - if [ "$GCOV" != "" ]; then
-        python ./test_send.py --file=out_test.txt;
-        lutin -C -P -c $TARGET $BUILDER $COMPILATOR_OPTION -m $CONF -p etk?gcov;
-        python ./coverage_send.py --json=out/Linux_x86_64/$CONF/build/$BUILDER/etk/etk_coverage.json;
+        ./ci/test_send.py --file=out_test.txt;
+        lutin -C -P $TARGET -c $BUILDER $COMPILATOR_OPTION -m $CONF -p etk?gcov;
+        ./ci/coverage_send.py --json=out/Linux_x86_64/$CONF/build/$BUILDER/etk/etk_coverage.json;
    fi

 notifications:
--- a/README.md
+++ b/README.md
@ -1,20 +1,63 @@
 etk
 ===

-`etk` is a simple basic toolkit to wrap some things (I maybe need to not se it ...
+`etk` is a simple basic toolkit to wrap some things (I maybe need not doing it ...)
+
+Release (master)
+----------------

 [![Build Status](https://travis-ci.org/atria-soft/etk.svg?branch=master)](https://travis-ci.org/atria-soft/etk)
-
 [![Coverage Status](http://atria-soft.com/ci/coverage/atria-soft/etk.svg?branch=master)](http://atria-soft.com/ci/atria-soft/etk)
-
 [![Test Status](http://atria-soft.com/ci/test/atria-soft/etk.svg?branch=master)](http://atria-soft.com/ci/atria-soft/etk)
-
 [![Warning Status](http://atria-soft.com/ci/warning/atria-soft/etk.svg?branch=master)](http://atria-soft.com/ci/atria-soft/etk)

+[![Build Status](http://atria-soft.com/ci/build/atria-soft/etk.svg?branch=master&tag=Linux)](http://atria-soft.com/ci/atria-soft/etk)
+[![Build Status](http://atria-soft.com/ci/build/atria-soft/etk.svg?branch=master&tag=MacOs)](http://atria-soft.com/ci/atria-soft/etk)
+[![Build Status](http://atria-soft.com/ci/build/atria-soft/etk.svg?branch=master&tag=Mingw)](http://atria-soft.com/ci/atria-soft/etk)
+
+[![Build Status](http://atria-soft.com/ci/build/atria-soft/etk.svg?branch=master&tag=Android)](http://atria-soft.com/ci/atria-soft/etk)
+[![Build Status](http://atria-soft.com/ci/build/atria-soft/etk.svg?branch=master&tag=IOs)](http://atria-soft.com/ci/atria-soft/etk)
+
+Developement (dev)
+------------------
+
+[![Build Status](https://travis-ci.org/atria-soft/etk.svg?branch=dev)](https://travis-ci.org/atria-soft/etk)
+[![Coverage Status](http://atria-soft.com/ci/coverage/atria-soft/etk.svg?branch=dev)](http://atria-soft.com/ci/atria-soft/etk)
+[![Test Status](http://atria-soft.com/ci/test/atria-soft/etk.svg?branch=dev)](http://atria-soft.com/ci/atria-soft/etk)
+[![Warning Status](http://atria-soft.com/ci/warning/atria-soft/etk.svg?branch=dev)](http://atria-soft.com/ci/atria-soft/etk)
+
+[![Build Status](http://atria-soft.com/ci/build/atria-soft/etk.svg?branch=dev&tag=Linux)](http://atria-soft.com/ci/atria-soft/etk)
+[![Build Status](http://atria-soft.com/ci/build/atria-soft/etk.svg?branch=dev&tag=MacOs)](http://atria-soft.com/ci/atria-soft/etk)
+[![Build Status](http://atria-soft.com/ci/build/atria-soft/etk.svg?branch=dev&tag=Mingw)](http://atria-soft.com/ci/atria-soft/etk)
+
+[![Build Status](http://atria-soft.com/ci/build/atria-soft/etk.svg?branch=dev&tag=Android)](http://atria-soft.com/ci/atria-soft/etk)
+[![Build Status](http://atria-soft.com/ci/build/atria-soft/etk.svg?branch=dev&tag=IOs)](http://atria-soft.com/ci/atria-soft/etk)
+
+
 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/etk.git
+	git clone https://github.com/generic-library/gtest-lutin.git --recursive
+	git clone https://github.com/generic-library/z-lutin.git --recursive
+
+Compile software:
+-----------------
+
+	cd WORKING_DIRECTORY
+	lutin -C -P etk-test
+

 License (APACHE v2.0)
 =====================
--- a/lutin_etk.py
+++ b/lutin_etk.py
@ -96,6 +96,7 @@ def create(target, module_name):
 	if target.name=="Windows":
 		pass
 	elif target.name=="Android":
+		#my_module.add_module_depend("SDK")
 		pass
 	else:
 		my_module.add_export_flag('link', "-lpthread")