[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 3fd827f10e
commit 8045c2c828
2 changed files with 22 additions and 20 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
import os import os
@ -25,8 +25,7 @@ def get_maintainer():
def get_version(): def get_version():
return [7,48,0] return [7,48,0]
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([
'curl/src/slist_wc.c', 'curl/src/slist_wc.c',
'curl/src/tool_binmode.c', 'curl/src/tool_binmode.c',
@ -79,14 +78,14 @@ def create(target, module_name):
]) ])
my_module.compile_version("c", 1989, gnu=True) my_module.compile_version("c", 1989, gnu=True)
my_module.add_depend('curl') my_module.add_depend('curl')
my_module.add_path(os.path.join(tools.get_current_path(__file__), "curl", "src")) my_module.add_path("curl/src")
# Bad lib implementation ... # Bad lib implementation ...
my_module.add_path(os.path.join(tools.get_current_path(__file__), "curl", "lib")) my_module.add_path("curl/lib")
my_module.add_path(os.path.join(tools.get_current_path(__file__), "curl", "include")) my_module.add_path("curl/include")
my_module.add_path(os.path.join(tools.get_current_path(__file__), "curl", "include", "curl")) my_module.add_path("curl/include/curl")
my_module.add_path(os.path.join(tools.get_current_path(__file__), "generate")) my_module.add_path("generate")
# end bad # end bad
return my_module return True
""" """
',/home/heero/dev/perso/framework/curl-lutin/curl/src',, ',/home/heero/dev/perso/framework/curl-lutin/curl/src',,

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
@ -25,8 +25,7 @@ def get_maintainer():
def get_version(): def get_version():
return [7,48,0] return [7,48,0]
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([
'curl/lib/file.c', 'curl/lib/file.c',
'curl/lib/timeval.c', 'curl/lib/timeval.c',
@ -152,13 +151,17 @@ def create(target, module_name):
'-DCURL_DISABLE_LDAP', '-DCURL_DISABLE_LDAP',
]) ])
my_module.compile_version("c", 1989, gnu=True) my_module.compile_version("c", 1989, gnu=True)
my_module.add_depend('z') my_module.add_depend([
my_module.add_depend('openssl') 'z',
my_module.add_depend('ssh2') 'openssl',
my_module.add_path(os.path.join(tools.get_current_path(__file__), "curl", "lib")) 'ssh2'
my_module.add_path(os.path.join(tools.get_current_path(__file__), "curl", "include")) ])
my_module.add_path(os.path.join(tools.get_current_path(__file__), "curl", "include", "curl")) my_module.add_path([
my_module.add_path(os.path.join(tools.get_current_path(__file__), "generate")) "curl/lib",
"curl/include",
"curl/include/curl",
"generate"
])
my_module.add_header_file([ my_module.add_header_file([
'curl/include/curl/mprintf.h', 'curl/include/curl/mprintf.h',
'curl/include/curl/curlver.h', 'curl/include/curl/curlver.h',
@ -171,4 +174,4 @@ def create(target, module_name):
'generate/curlbuild.h', 'generate/curlbuild.h',
], ],
destination_path="curl") destination_path="curl")
return my_module return True