From e8efb4cc1b5ea213d8d01d0ceb4c67a54aec5425 Mon Sep 17 00:00:00 2001 From: Edouard DUPIN Date: Thu, 24 Sep 2015 21:44:04 +0200 Subject: [PATCH] [DEV] update next lutin version --- .travis.yml | 19 +++++++----- lutin_ege.py | 14 ++++----- .../CameraPosition/lutin_egeCameraPosition.py | 30 +++++++++---------- sample/Collision/lutin_egeCollision.py | 30 +++++++++---------- sample/DoubleView/lutin_egeDoubleView.py | 30 +++++++++---------- sample/MeshCreator/lutin_egeMeshCreator.py | 30 +++++++++---------- sample/RayTest/lutin_egeRayTest.py | 30 +++++++++---------- 7 files changed, 94 insertions(+), 89 deletions(-) diff --git a/.travis.yml b/.travis.yml index f4454e2..478c7b7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,10 +3,6 @@ language: sudo: false -compiler: - - clang - - gcc - os: - linux - osx @@ -26,8 +22,18 @@ addons: install: - 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 + 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 - mkdir bin - curl https://storage.googleapis.com/git-repo-downloads/repo > bin/repo - chmod a+x bin/repo @@ -43,11 +49,10 @@ before_script: - cd .. - pwd - ls -l - - if [ "$CXX" == "clang++" ]; then BUILDER=clang; else BUILDER=gcc; fi - - if [ "$CXX" == "g++" ]; then COMPILATOR_OPTION="--compilator-version=4.9"; else COMPILATOR_OPTION=""; fi + - if [ "$BUILDER" == "gcc" ]; then COMPILATOR_OPTION="--compilator-version=4.9"; else COMPILATOR_OPTION=""; fi script: - - lutin -C -P -c$BUILDER $COMPILATOR_OPTION -mdebug -p ege egeCameraPosition egeCollision egeDoubleView egeMeshCreator egeRayTest + - lutin -w -j4 -C -P -c $BUILDER $COMPILATOR_OPTION -m $CONF $GCOV -p ege egeCameraPosition egeCollision egeDoubleView egeMeshCreator egeRayTest notifications: email: diff --git a/lutin_ege.py b/lutin_ege.py index 8e87d7b..7608b82 100644 --- a/lutin_ege.py +++ b/lutin_ege.py @@ -7,9 +7,9 @@ def get_desc(): def create(target): # module name is 'edn' and type binary. - myModule = module.Module(__file__, 'ege', 'LIBRARY') + my_module = module.Module(__file__, 'ege', 'LIBRARY') # add the file to compile: - myModule.add_src_file([ + my_module.add_src_file([ 'ege/debug.cpp', 'ege/AudioElement.cpp', 'ege/AudioEngine.cpp', @@ -47,15 +47,15 @@ def create(target): 'ege/physicsShape/PhysicsSphere.cpp', 'ege/Ray.cpp', ]) - myModule.copy_folder('data/ParticuleMesh.*','') + my_module.copy_folder('data/ParticuleMesh.*','') # name of the dependency - myModule.add_module_depend(['ewol', 'bullet-physics']) - myModule.compile_flags('c++', [ + my_module.add_module_depend(['ewol', 'bullet-physics']) + my_module.compile_flags('c++', [ '-Wno-write-strings', '-Wmissing-field-initializers', '-Wall']) - myModule.add_export_path(tools.get_current_path(__file__)) + my_module.add_export_path(tools.get_current_path(__file__)) # add the currrent module at the - return myModule + return my_module diff --git a/sample/CameraPosition/lutin_egeCameraPosition.py b/sample/CameraPosition/lutin_egeCameraPosition.py index e6b6360..d72b9f8 100644 --- a/sample/CameraPosition/lutin_egeCameraPosition.py +++ b/sample/CameraPosition/lutin_egeCameraPosition.py @@ -9,31 +9,31 @@ def get_desc(): def create(target): # module name is 'edn' and type binary. - myModule = module.Module(__file__, 'egeCameraPosition', 'PACKAGE') + my_module = module.Module(__file__, 'egeCameraPosition', 'PACKAGE') - myModule.add_src_file([ + my_module.add_src_file([ 'appl/debug.cpp', 'appl/main.cpp', 'appl/Windows.cpp' ]) - myModule.add_module_depend('ege') + my_module.add_module_depend('ege') - myModule.add_path(tools.get_current_path(__file__)) + my_module.add_path(tools.get_current_path(__file__)) - myModule.copy_folder("data/*") + my_module.copy_folder("data/*") # set the package properties : - myModule.pkg_set("VERSION", "0.0.0") - myModule.pkg_set("VERSION_CODE", "0") - myModule.pkg_set("COMPAGNY_TYPE", "org") - myModule.pkg_set("COMPAGNY_NAME", "ege") - myModule.pkg_set("MAINTAINER", ["noOne "]) - myModule.pkg_set("SECTION", ["Game"]) - myModule.pkg_set("PRIORITY", "optional") - myModule.pkg_set("DESCRIPTION", "ege sample : MeshCreator") - myModule.pkg_set("NAME", "egeMeshCreator") + my_module.pkg_set("VERSION", "0.0.0") + my_module.pkg_set("VERSION_CODE", "0") + my_module.pkg_set("COMPAGNY_TYPE", "org") + my_module.pkg_set("COMPAGNY_NAME", "ege") + my_module.pkg_set("MAINTAINER", ["noOne "]) + my_module.pkg_set("SECTION", ["Game"]) + my_module.pkg_set("PRIORITY", "optional") + my_module.pkg_set("DESCRIPTION", "ege sample : MeshCreator") + my_module.pkg_set("NAME", "egeMeshCreator") # add the currrent module at the - return myModule + return my_module diff --git a/sample/Collision/lutin_egeCollision.py b/sample/Collision/lutin_egeCollision.py index dcc3457..aa763a9 100644 --- a/sample/Collision/lutin_egeCollision.py +++ b/sample/Collision/lutin_egeCollision.py @@ -9,31 +9,31 @@ def get_desc(): def create(target): # module name is 'edn' and type binary. - myModule = module.Module(__file__, 'egeCollision', 'PACKAGE') + my_module = module.Module(__file__, 'egeCollision', 'PACKAGE') - myModule.add_src_file([ + my_module.add_src_file([ 'appl/debug.cpp', 'appl/main.cpp', 'appl/Windows.cpp' ]) - myModule.add_module_depend('ege') + my_module.add_module_depend('ege') - myModule.add_path(tools.get_current_path(__file__)) + my_module.add_path(tools.get_current_path(__file__)) - myModule.copy_folder("data/*") + my_module.copy_folder("data/*") # set the package properties : - myModule.pkg_set("VERSION", "0.0.0") - myModule.pkg_set("VERSION_CODE", "0") - myModule.pkg_set("COMPAGNY_TYPE", "org") - myModule.pkg_set("COMPAGNY_NAME", "ege") - myModule.pkg_set("MAINTAINER", ["noOne "]) - myModule.pkg_set("SECTION", ["Game"]) - myModule.pkg_set("PRIORITY", "optional") - myModule.pkg_set("DESCRIPTION", "ege sample : Collision") - myModule.pkg_set("NAME", "Collision") + my_module.pkg_set("VERSION", "0.0.0") + my_module.pkg_set("VERSION_CODE", "0") + my_module.pkg_set("COMPAGNY_TYPE", "org") + my_module.pkg_set("COMPAGNY_NAME", "ege") + my_module.pkg_set("MAINTAINER", ["noOne "]) + my_module.pkg_set("SECTION", ["Game"]) + my_module.pkg_set("PRIORITY", "optional") + my_module.pkg_set("DESCRIPTION", "ege sample : Collision") + my_module.pkg_set("NAME", "Collision") # add the currrent module at the - return myModule + return my_module diff --git a/sample/DoubleView/lutin_egeDoubleView.py b/sample/DoubleView/lutin_egeDoubleView.py index 0fa01b0..e48c14d 100644 --- a/sample/DoubleView/lutin_egeDoubleView.py +++ b/sample/DoubleView/lutin_egeDoubleView.py @@ -9,31 +9,31 @@ def get_desc(): def create(target): # module name is 'edn' and type binary. - myModule = module.Module(__file__, 'egeDoubleView', 'PACKAGE') + my_module = module.Module(__file__, 'egeDoubleView', 'PACKAGE') - myModule.add_src_file([ + my_module.add_src_file([ 'appl/debug.cpp', 'appl/main.cpp', 'appl/Windows.cpp' ]) - myModule.add_module_depend('ege') + my_module.add_module_depend('ege') - myModule.add_path(tools.get_current_path(__file__)) + my_module.add_path(tools.get_current_path(__file__)) - myModule.copy_folder("data/*") + my_module.copy_folder("data/*") # set the package properties : - myModule.pkg_set("VERSION", "0.0.0") - myModule.pkg_set("VERSION_CODE", "0") - myModule.pkg_set("COMPAGNY_TYPE", "org") - myModule.pkg_set("COMPAGNY_NAME", "ege") - myModule.pkg_set("MAINTAINER", ["noOne "]) - myModule.pkg_set("SECTION", ["Game"]) - myModule.pkg_set("PRIORITY", "optional") - myModule.pkg_set("DESCRIPTION", "ege sample : DoubleView") - myModule.pkg_set("NAME", "egeDoubleView") + my_module.pkg_set("VERSION", "0.0.0") + my_module.pkg_set("VERSION_CODE", "0") + my_module.pkg_set("COMPAGNY_TYPE", "org") + my_module.pkg_set("COMPAGNY_NAME", "ege") + my_module.pkg_set("MAINTAINER", ["noOne "]) + my_module.pkg_set("SECTION", ["Game"]) + my_module.pkg_set("PRIORITY", "optional") + my_module.pkg_set("DESCRIPTION", "ege sample : DoubleView") + my_module.pkg_set("NAME", "egeDoubleView") # add the currrent module at the - return myModule + return my_module diff --git a/sample/MeshCreator/lutin_egeMeshCreator.py b/sample/MeshCreator/lutin_egeMeshCreator.py index d01ed7f..b8da08c 100644 --- a/sample/MeshCreator/lutin_egeMeshCreator.py +++ b/sample/MeshCreator/lutin_egeMeshCreator.py @@ -9,31 +9,31 @@ def get_desc(): def create(target): # module name is 'edn' and type binary. - myModule = module.Module(__file__, 'egeMeshCreator', 'PACKAGE') + my_module = module.Module(__file__, 'egeMeshCreator', 'PACKAGE') - myModule.add_src_file([ + my_module.add_src_file([ 'appl/debug.cpp', 'appl/main.cpp', 'appl/Windows.cpp' ]) - myModule.add_module_depend('ege') + my_module.add_module_depend('ege') - myModule.add_path(tools.get_current_path(__file__)) + my_module.add_path(tools.get_current_path(__file__)) - myModule.copy_folder("data/*") + my_module.copy_folder("data/*") # set the package properties : - myModule.pkg_set("VERSION", "0.0.0") - myModule.pkg_set("VERSION_CODE", "0") - myModule.pkg_set("COMPAGNY_TYPE", "org") - myModule.pkg_set("COMPAGNY_NAME", "ege") - myModule.pkg_set("MAINTAINER", ["noOne "]) - myModule.pkg_set("SECTION", ["Game"]) - myModule.pkg_set("PRIORITY", "optional") - myModule.pkg_set("DESCRIPTION", "ege sample : MeshCreator") - myModule.pkg_set("NAME", "egeMeshCreator") + my_module.pkg_set("VERSION", "0.0.0") + my_module.pkg_set("VERSION_CODE", "0") + my_module.pkg_set("COMPAGNY_TYPE", "org") + my_module.pkg_set("COMPAGNY_NAME", "ege") + my_module.pkg_set("MAINTAINER", ["noOne "]) + my_module.pkg_set("SECTION", ["Game"]) + my_module.pkg_set("PRIORITY", "optional") + my_module.pkg_set("DESCRIPTION", "ege sample : MeshCreator") + my_module.pkg_set("NAME", "egeMeshCreator") # add the currrent module at the - return myModule + return my_module diff --git a/sample/RayTest/lutin_egeRayTest.py b/sample/RayTest/lutin_egeRayTest.py index 4dada7e..a8dce9d 100644 --- a/sample/RayTest/lutin_egeRayTest.py +++ b/sample/RayTest/lutin_egeRayTest.py @@ -9,31 +9,31 @@ def get_desc(): def create(target): # module name is 'edn' and type binary. - myModule = module.Module(__file__, 'egeRayTest', 'PACKAGE') + my_module = module.Module(__file__, 'egeRayTest', 'PACKAGE') - myModule.add_src_file([ + my_module.add_src_file([ 'appl/debug.cpp', 'appl/main.cpp', 'appl/Windows.cpp' ]) - myModule.add_module_depend('ege') + my_module.add_module_depend('ege') - myModule.add_path(tools.get_current_path(__file__)) + my_module.add_path(tools.get_current_path(__file__)) - myModule.copy_folder("data/*") + my_module.copy_folder("data/*") # set the package properties : - myModule.pkg_set("VERSION", "0.0.0") - myModule.pkg_set("VERSION_CODE", "0") - myModule.pkg_set("COMPAGNY_TYPE", "org") - myModule.pkg_set("COMPAGNY_NAME", "ege") - myModule.pkg_set("MAINTAINER", ["noOne "]) - myModule.pkg_set("SECTION", ["Game"]) - myModule.pkg_set("PRIORITY", "optional") - myModule.pkg_set("DESCRIPTION", "ege sample : Ray test") - myModule.pkg_set("NAME", "egeRayTest") + my_module.pkg_set("VERSION", "0.0.0") + my_module.pkg_set("VERSION_CODE", "0") + my_module.pkg_set("COMPAGNY_TYPE", "org") + my_module.pkg_set("COMPAGNY_NAME", "ege") + my_module.pkg_set("MAINTAINER", ["noOne "]) + my_module.pkg_set("SECTION", ["Game"]) + my_module.pkg_set("PRIORITY", "optional") + my_module.pkg_set("DESCRIPTION", "ege sample : Ray test") + my_module.pkg_set("NAME", "egeRayTest") # add the currrent module at the - return myModule + return my_module