[CI] update travis and create dev branch

.travis.yml

@@ -1,12 +1,7 @@
-language:
+language: cpp
-  - cpp
 
 sudo: false
 
-os:
-  - linux
-  - osx
-
 branches:
   only:
     - master
@@ -18,37 +13,71 @@ 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
-
+  - if [ "$TAG" == "Android" ]; then
-env:
+        git clone --depth 1 --branch master https://github.com/HeeroYui/android-download-tool;
-  - CONF=debug   BOARD=Linux BUILDER=clang GCOV=
+        ./android-download-tool/dl-android.sh;
-  - CONF=release BOARD=Linux BUILDER=clang GCOV=
+    fi
-  - CONF=debug   BOARD=Linux BUILDER=gcc   GCOV=
+  - git clone --depth 1 --branch master https://github.com/atria-soft/ci.git
-  - CONF=release BOARD=Linux BUILDER=gcc   GCOV=
+  - cd -
-  - CONF=debug   BOARD=Linux BUILDER=gcc   GCOV=--gcov
 
 before_script:
   - cd ..
-  - wget http://atria-soft.com/ci/coverage_send.py
+  - git clone https://github.com/atria-soft/etk.git -b $TRAVIS_BRANCH
-  - 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/generic-library/gtest-lutin.git --recursive
+  - git clone https://github.com/generic-library/z-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: 
+script:
-  - lutin -w -j4 -C -P -c $BUILDER $COMPILATOR_OPTION -m $CONF $GCOV -p ejson-test
+  - lutin -w -j4 -C -P -t$TARGET -c $BUILDER $COMPILATOR_OPTION $BUS -m $CONF $GCOV $DISABLE_PACKAGE ejson-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/ejson/ ; fi
+  - if [ "$GCOV" != "" ]; then
-  - ./out/Linux_x86_64/$CONF/staging/$BUILDER/ejson-test/usr/bin/ejson-test | tee out_test.txt
+        ./ci/warning_send.py --find-path ./out/Linux_x86_64/$CONF/build/$BUILDER/ejson/;
-  - if [ "$GCOV" != "" ]; then python ./test_send.py --file=out_test.txt; fi
+    fi
-  - if [ "$GCOV" != "" ]; then lutin -C -P -c $BUILDER $COMPILATOR_OPTION -m $CONF -p ejson?gcov; fi
+  - ./out/Linux_x86_64/$CONF/staging/$BUILDER/ejson-test/ejson-test.app/bin/ejson-test --etk-log-level=3 | tee out_test.txt
-  - if [ "$GCOV" != "" ]; then python ./coverage_send.py --json=out/Linux_x86_64/$CONF/build/$BUILDER/ejson/ejson_coverage.json; fi
+  - if [ "$GCOV" != "" ]; then
+        ./ci/test_send.py --file=out_test.txt;
+        lutin -C -P -t $TARGET -c $BUILDER $COMPILATOR_OPTION $BUS -m $CONF -p ejson?gcov;
+        ./ci/coverage_send.py --json=out/Linux_x86_64/$CONF/build/$BUILDER/ejson/ejson_coverage.json;
+    fi
+
 notifications:
   email:
     - yui.heero@gmail.com
+

README.md

@@ -3,18 +3,61 @@ ejson
 
 `ejson` is a simple json stream reader and writer
 
+Release (master)
+----------------
+
 [![Build Status](https://travis-ci.org/atria-soft/ejson.svg?branch=master)](https://travis-ci.org/atria-soft/ejson)
-
 [![Coverage Status](http://atria-soft.com/ci/coverage/atria-soft/ejson.svg?branch=master)](http://atria-soft.com/ci/atria-soft/ejson)
-
 [![Test Status](http://atria-soft.com/ci/test/atria-soft/ejson.svg?branch=master)](http://atria-soft.com/ci/atria-soft/ejson)
-
 [![Warning Status](http://atria-soft.com/ci/warning/atria-soft/ejson.svg?branch=master)](http://atria-soft.com/ci/atria-soft/ejson)
 
+[![Build Status](http://atria-soft.com/ci/build/atria-soft/ejson.svg?branch=master&tag=Linux)](http://atria-soft.com/ci/atria-soft/ejson)
+[![Build Status](http://atria-soft.com/ci/build/atria-soft/ejson.svg?branch=master&tag=MacOs)](http://atria-soft.com/ci/atria-soft/ejson)
+[![Build Status](http://atria-soft.com/ci/build/atria-soft/ejson.svg?branch=master&tag=Mingw)](http://atria-soft.com/ci/atria-soft/ejson)
+
+[![Build Status](http://atria-soft.com/ci/build/atria-soft/ejson.svg?branch=master&tag=Android)](http://atria-soft.com/ci/atria-soft/ejson)
+[![Build Status](http://atria-soft.com/ci/build/atria-soft/ejson.svg?branch=master&tag=IOs)](http://atria-soft.com/ci/atria-soft/ejson)
+
+Developement (dev)
+------------------
+
+[![Build Status](https://travis-ci.org/atria-soft/ejson.svg?branch=dev)](https://travis-ci.org/atria-soft/ejson)
+[![Coverage Status](http://atria-soft.com/ci/coverage/atria-soft/ejson.svg?branch=dev)](http://atria-soft.com/ci/atria-soft/ejson)
+[![Test Status](http://atria-soft.com/ci/test/atria-soft/ejson.svg?branch=dev)](http://atria-soft.com/ci/atria-soft/ejson)
+[![Warning Status](http://atria-soft.com/ci/warning/atria-soft/ejson.svg?branch=dev)](http://atria-soft.com/ci/atria-soft/ejson)
+
+[![Build Status](http://atria-soft.com/ci/build/atria-soft/ejson.svg?branch=dev&tag=Linux)](http://atria-soft.com/ci/atria-soft/ejson)
+[![Build Status](http://atria-soft.com/ci/build/atria-soft/ejson.svg?branch=dev&tag=MacOs)](http://atria-soft.com/ci/atria-soft/ejson)
+[![Build Status](http://atria-soft.com/ci/build/atria-soft/ejson.svg?branch=dev&tag=Mingw)](http://atria-soft.com/ci/atria-soft/ejson)
+
+[![Build Status](http://atria-soft.com/ci/build/atria-soft/ejson.svg?branch=dev&tag=Android)](http://atria-soft.com/ci/atria-soft/ejson)
+[![Build Status](http://atria-soft.com/ci/build/atria-soft/ejson.svg?branch=dev&tag=IOs)](http://atria-soft.com/ci/atria-soft/ejson)
+
+
 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/atria-soft/ejson.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 ejson-test
 
 
 License (APACHE v2.0)

lutin_ejson.py

@@ -22,7 +22,7 @@ def get_maintainer():
 	return ["Mr DUPIN Edouard <yui.heero@gmail.com>"]
 
 def get_version():
-	return [0,0,0]
+	return [0,4,"dev"]
 
 def create(target, module_name):
 	my_module = module.Module(__file__, module_name, get_type())