atria-soft/ewol
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[DEV][CI] update to remove agg library and travis build env

Browse Source
This commit is contained in:
Edouard DUPIN 2015-12-03 21:32:51 +01:00
parent 94f6d4f48a
commit 5f38706175
5 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@ -80,10 +80,10 @@ after_script:
- if [ "$GCOV" != "" ]; then - if [ "$GCOV" != "" ]; then
./ci/warning_send.py --find-path ./out/Linux_x86_64/$CONF/build/$BUILDER/ewol/; ./ci/warning_send.py --find-path ./out/Linux_x86_64/$CONF/build/$BUILDER/ewol/;
fi fi
- ./out/Linux_x86_64/$CONF/staging/$BUILDER/ewol-test/ewol-test.app/bin/ewol-test -l6 | tee out_test.txt - ./out/Linux_x86_64/$CONF/staging/$BUILDER/ewol-test/ewol-test.app/bin/ewol-test --etk-log-level=6 | tee out_test.txt
- if [ "$GCOV" != "" ]; then - if [ "$GCOV" != "" ]; then
./ci/test_send.py --file=out_test.txt; ./ci/test_send.py --file=out_test.txt;
lutin -C -P $TARGET -c $BUILDER $COMPILATOR_OPTION -m $CONF -p ewol?gcov; lutin -C -P -t $TARGET -c $BUILDER $COMPILATOR_OPTION $BUS -m $CONF -p ewol?gcov;
./ci/coverage_send.py --json=out/Linux_x86_64/$CONF/build/$BUILDER/ewol/ewol_coverage.json; ./ci/coverage_send.py --json=out/Linux_x86_64/$CONF/build/$BUILDER/ewol/ewol_coverage.json;
fi fi

10
README.md
View File

@ -36,6 +36,12 @@ Developement (dev)
Instructions Instructions
============ ============
download Build system:
----------------------
sudo pip install lutin
sudo pip install pillow
need google repo: need google repo:
----------------- -----------------
@ -52,9 +58,7 @@ download the software:
mkdir WORKING_DIRECTORY mkdir WORKING_DIRECTORY
cd WORKING_DIRECTORY cd WORKING_DIRECTORY
sudo pip install lutin repo init -u git://github.com/atria-soft/manifest.git
sudo pip install pillow
repo init -u git://github.com/HeeroYui/manifest.git
repo sync -j8 repo sync -j8

1
ewol/widget/Image.h
View File

@ -11,7 +11,6 @@
#include <etk/types.h> #include <etk/types.h>
#include <ewol/debug.h> #include <ewol/debug.h>
#include <draw/Color.h>
#include <ewol/widget/Widget.h> #include <ewol/widget/Widget.h>
#include <ewol/compositing/Image.h> #include <ewol/compositing/Image.h>
#include <ewol/resource/ColorFile.h> #include <ewol/resource/ColorFile.h>

6
ewol/widget/Joystick.cpp
View File

@ -29,10 +29,10 @@ ewol::widget::Joystick::Joystick() :
m_lock = false; m_lock = false;
m_displayMode = modeNormal; m_displayMode = modeNormal;
m_colorFg = draw::color::blue; m_colorFg = etk::color::blue;
m_colorBg = draw::color::black; m_colorBg = etk::color::black;
m_colorBg.a = 0x3F; m_colorBg.setA(0x3F);
m_displayPos.setValue(0,0); m_displayPos.setValue(0,0);
m_distance = 0.0; m_distance = 0.0;

6
ewol/widget/Joystick.h
View File

@ -10,9 +10,9 @@
#define __EWOL_JOYSTICK_H__ #define __EWOL_JOYSTICK_H__
#include <etk/types.h> #include <etk/types.h>
#include <etk/Color.h>
#include <ewol/debug.h> #include <ewol/debug.h>
#include <ewol/widget/Widget.h> #include <ewol/widget/Widget.h>
#include <draw/Color.h>
#include <ewol/signal/Signal.h> #include <ewol/signal/Signal.h>
@ -33,8 +33,8 @@ namespace ewol {
modeArrow, modeArrow,
}; };
private: private:
draw::Color m_colorFg; //!< Forground color etk::Color<> m_colorFg; //!< Forground color
draw::Color m_colorBg; //!< Background color etk::Color<> m_colorBg; //!< Background color
vec2 m_displayPos; //!< direction of the cursor ... vec2 m_displayPos; //!< direction of the cursor ...
float m_distance; //!< dintance from the center float m_distance; //!< dintance from the center
float m_angle; //!< angle of the arraw (if < 0 : No arraw...) 0 is the TOP ... float m_angle; //!< angle of the arraw (if < 0 : No arraw...) 0 is the TOP ...