[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 80a54ea76f
commit 62c9a72e22
3 changed files with 276 additions and 277 deletions

View File

@ -1,5 +1,5 @@
#!/usr/bin/python
import lutin.module as module
import lutin.debug as debug
import lutin.tools as tools
import os
@ -27,8 +27,7 @@ def get_maintainer():
def get_version():
return [0,0]
def create(target, module_name):
my_module = module.Module(__file__, module_name, get_type())
def configure(target, my_module):
my_module.add_src_file([
"zxing-cpp/cli/src/jpgd.cpp",
"zxing-cpp/cli/src/lodepng.cpp",
@ -37,8 +36,8 @@ def create(target, module_name):
])
# build in C mode
my_module.compile_version("c++", 2003)
my_module.add_path(os.path.join(tools.get_current_path(__file__), "zxing-cpp", "cli", "src"))
my_module.add_path("zxing-cpp/cli/src")
my_module.add_depend('zxing')
return my_module
return True

View File

@ -1,5 +1,5 @@
#!/usr/bin/python
import lutin.module as module
import lutin.debug as debug
import lutin.tools as tools
import os
@ -27,8 +27,7 @@ def get_maintainer():
def get_version():
return [0,0]
def create(target, module_name):
my_module = module.Module(__file__, module_name, get_type())
def configure(target, my_module):
my_module.add_src_file([
"zxing-cpp/core/tests/src/common/reedsolomon/ReedSolomonTest.cpp",
"zxing-cpp/core/tests/src/common/BitMatrixTest.cpp",
@ -45,8 +44,11 @@ def create(target, module_name):
])
# build in C mode
my_module.compile_version("c++", 2003)
my_module.add_path(os.path.join(tools.get_current_path(__file__), "zxing-cpp", "core", "test", "src"))
my_module.add_depend(['zxing', 'cppunit'])
return my_module
my_module.add_path("zxing-cpp/core/test/src")
my_module.add_depend([
'zxing',
'cppunit'
])
return True

View File

@ -1,5 +1,5 @@
#!/usr/bin/python
import lutin.module as module
import lutin.debug as debug
import lutin.tools as tools
import os
@ -24,15 +24,13 @@ def get_maintainer():
def get_version():
return [0,0]
def create(target, module_name):
my_module = module.Module(__file__, module_name, get_type())
def configure(target, my_module):
my_module.add_src_file([
"zxing-cpp/core/src/bigint/BigIntegerUtils.cc",
"zxing-cpp/core/src/bigint/BigInteger.cc",
"zxing-cpp/core/src/bigint/BigIntegerAlgorithms.cc",
"zxing-cpp/core/src/bigint/BigUnsigned.cc",
"zxing-cpp/core/src/bigint/BigUnsignedInABase.cc",
"zxing-cpp/core/src/zxing/aztec/detector/Detector.cpp",
"zxing-cpp/core/src/zxing/aztec/AztecDetectorResult.cpp",
"zxing-cpp/core/src/zxing/aztec/decoder/Decoder.cpp",
@ -308,8 +306,8 @@ def create(target, module_name):
"zxing-cpp/core/src/win32/zxing/iconv.h",
"zxing-cpp/core/src/win32/zxing/stdint.h",
])
my_module.add_path(os.path.join(tools.get_current_path(__file__), "zxing-cpp", "core", "src", "win32"))
my_module.add_path("zxing-cpp/core/src/win32")
return my_module
return True