[DEV] Update new lutin 2.2.0 (no legacy support)

This commit is contained in:
Edouard DUPIN 2016-10-04 23:41:29 +02:00
parent 5c41fd08e1
commit a99c382bc6
7 changed files with 45 additions and 52 deletions

View File

@ -1,5 +1,5 @@
#!/usr/bin/python #!/usr/bin/python
import lutin.module as module import lutin.debug as debug
import lutin.tools as tools import lutin.tools as tools
@ -24,14 +24,13 @@ def get_compagny_name():
def get_maintainer(): def get_maintainer():
return "authors.txt" return "authors.txt"
def create(target, module_name): def configure(target, my_module):
my_module = module.Module(__file__, module_name, get_type())
my_module.add_src_file([ my_module.add_src_file([
'tool/bench-corpus/main.cpp' 'tool/bench-corpus/main.cpp'
]) ])
my_module.add_depend([ my_module.add_depend([
'dollar', 'dollar',
'test-debug', 'test-debug',
]) ])
return my_module return True

View File

@ -1,5 +1,5 @@
#!/usr/bin/python #!/usr/bin/python
import lutin.module as module import lutin.debug as debug
import lutin.tools as tools import lutin.tools as tools
@ -24,14 +24,13 @@ def get_compagny_name():
def get_maintainer(): def get_maintainer():
return "authors.txt" return "authors.txt"
def create(target, module_name): def configure(target, my_module):
my_module = module.Module(__file__, module_name, get_type())
my_module.add_src_file([ my_module.add_src_file([
'tool/converter/main.cpp' 'tool/converter/main.cpp'
]) ])
my_module.add_depend([ my_module.add_depend([
'dollar', 'dollar',
'test-debug', 'test-debug',
]) ])
return my_module return True

View File

@ -1,5 +1,5 @@
#!/usr/bin/python #!/usr/bin/python
import lutin.module as module import lutin.debug as debug
import lutin.tools as tools import lutin.tools as tools
@ -21,9 +21,8 @@ def get_compagny_name():
def get_maintainer(): def get_maintainer():
return "authors.txt" return "authors.txt"
def create(target, module_name): def configure(target, my_module):
my_module = module.Module(__file__, module_name, get_type())
my_module.copy_path('data/text/*.json', 'text') my_module.copy_path('data/text/*.json', 'text')
my_module.copy_path('data/figure/*.json', 'figure') my_module.copy_path('data/figure/*.json', 'figure')
return my_module return True

View File

@ -1,5 +1,5 @@
#!/usr/bin/python #!/usr/bin/python
import lutin.module as module import lutin.debug as debug
import lutin.tools as tools import lutin.tools as tools
@ -24,14 +24,13 @@ def get_compagny_name():
def get_maintainer(): def get_maintainer():
return "authors.txt" return "authors.txt"
def create(target, module_name): def configure(target, my_module):
my_module = module.Module(__file__, module_name, get_type())
my_module.add_src_file([ my_module.add_src_file([
'tool/generate-form/main.cpp' 'tool/generate-form/main.cpp'
]) ])
my_module.add_depend([ my_module.add_depend([
'dollar', 'dollar',
'test-debug', 'test-debug',
]) ])
return my_module return True

View File

@ -1,5 +1,5 @@
#!/usr/bin/python #!/usr/bin/python
import lutin.module as module import lutin.debug as debug
import lutin.tools as tools import lutin.tools as tools
@ -24,8 +24,7 @@ def get_compagny_name():
def get_maintainer(): def get_maintainer():
return "authors.txt" return "authors.txt"
def create(target, module_name): def configure(target, my_module):
my_module = module.Module(__file__, module_name, get_type())
my_module.add_src_file([ my_module.add_src_file([
'test/main.cpp' 'test/main.cpp'
]) ])
@ -36,5 +35,5 @@ def create(target, module_name):
'gtest', 'gtest',
]) ])
my_module.copy_path('data/test/*.json', 'test') my_module.copy_path('data/test/*.json', 'test')
return my_module return True

View File

@ -1,5 +1,5 @@
#!/usr/bin/python #!/usr/bin/python
import lutin.module as module import lutin.debug as debug
import lutin.tools as tools import lutin.tools as tools
@ -24,29 +24,28 @@ def get_maintainer():
def get_version(): def get_version():
return "version.txt" return "version.txt"
def create(target, module_name): def configure(target, my_module):
my_module = module.Module(__file__, module_name, get_type())
my_module.add_extra_flags() my_module.add_extra_flags()
# add the file to compile: # add the file to compile:
my_module.add_src_file([ my_module.add_src_file([
'dollar/debug.cpp', 'dollar/debug.cpp',
'dollar/Engine.cpp', 'dollar/Engine.cpp',
'dollar/EngineN.cpp', 'dollar/EngineN.cpp',
'dollar/EngineP.cpp', 'dollar/EngineP.cpp',
'dollar/EnginePPlus.cpp', 'dollar/EnginePPlus.cpp',
'dollar/Gesture.cpp', 'dollar/Gesture.cpp',
'dollar/GestureN.cpp', 'dollar/GestureN.cpp',
'dollar/GestureP.cpp', 'dollar/GestureP.cpp',
'dollar/GesturePPlus.cpp', 'dollar/GesturePPlus.cpp',
'dollar/Results.cpp', 'dollar/Results.cpp',
'dollar/tools.cpp', 'dollar/tools.cpp',
'dollar/Rectangle.cpp' 'dollar/Rectangle.cpp'
]) ])
my_module.add_header_file([ my_module.add_header_file([
'dollar/*.hpp', 'dollar/*.hpp',
], ],
destination_path="dollar") destination_path="dollar")
# build in C++ mode # build in C++ mode
my_module.compile_version("c++", 2011) my_module.compile_version("c++", 2011)
@ -59,6 +58,6 @@ def create(target, module_name):
'esvg', 'esvg',
'ememory', 'ememory',
]) ])
return my_module return True

View File

@ -1,5 +1,5 @@
#!/usr/bin/python #!/usr/bin/python
import lutin.module as module import lutin.debug as debug
import lutin.tools as tools import lutin.tools as tools
import os import os
@ -27,8 +27,7 @@ def get_maintainer():
def get_version(): def get_version():
return [0,1] return [0,1]
def create(target, module_name): def configure(target, my_module):
my_module = module.Module(__file__, module_name, get_type())
my_module.add_src_file([ my_module.add_src_file([
'appl/Main.cpp', 'appl/Main.cpp',
'appl/debug.cpp', 'appl/debug.cpp',
@ -46,7 +45,7 @@ def create(target, module_name):
"-DPROJECT_NAME=\"\\\"" + my_module.get_name() + "\\\"\"", "-DPROJECT_NAME=\"\\\"" + my_module.get_name() + "\\\"\"",
"-DAPPL_VERSION=\"\\\"" + tools.version_to_string(get_version()) + "\\\"\"" "-DAPPL_VERSION=\"\\\"" + tools.version_to_string(get_version()) + "\\\"\""
]) ])
my_module.add_path(tools.get_current_path(__file__)) my_module.add_path(".")
my_module.set_pkg("VERSION_CODE", 1) my_module.set_pkg("VERSION_CODE", 1)
my_module.add_pkg("RIGHT", "WRITE_EXTERNAL_STORAGE") my_module.add_pkg("RIGHT", "WRITE_EXTERNAL_STORAGE")
@ -54,8 +53,8 @@ def create(target, module_name):
my_module.copy_path("data/freefont/*","fonts/") my_module.copy_path("data/freefont/*","fonts/")
my_module.copy_path('data/reference/*', "reference") my_module.copy_path('data/reference/*', "reference")
my_module.set_pkg("ICON", os.path.join(tools.get_current_path(__file__), "data/icon.png")) my_module.set_pkg("ICON", "data/icon.png")
return my_module return True