projects
/
odoo
/
odoo.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of https://github.com/odoo/odoo
[odoo/odoo.git]
/
setup.py
diff --git
a/setup.py
b/setup.py
index
ab32e4e
..
c7bde8e
100644
(file)
--- a/
setup.py
+++ b/
setup.py
@@
-40,6
+40,12
@@
def py2exe_datafiles():
base = join('docutils', root[len(dudir) + 1:])
data_files[base] = [join(root, f) for f in filenames if not f.endswith(('.py', '.pyc', '.pyo'))]
base = join('docutils', root[len(dudir) + 1:])
data_files[base] = [join(root, f) for f in filenames if not f.endswith(('.py', '.pyc', '.pyo'))]
+ import passlib
+ pl = dirname(passlib.__file__)
+ for root, _, filenames in os.walk(pl):
+ base = join('passlib', root[len(pl) + 1:])
+ data_files[base] = [join(root, f) for f in filenames if not f.endswith(('.py', '.pyc', '.pyo'))]
+
return data_files.items()
return data_files.items()
@@
-77,6
+83,7
@@
def py2exe_options():
'mock',
'openerp',
'openid',
'mock',
'openerp',
'openid',
+ 'passlib',
'PIL',
'poplib',
'psutil',
'PIL',
'poplib',
'psutil',
@@
-108,7
+115,7
@@
def py2exe_options():
setup(
setup(
- name='openerp',
+ name='odoo',
version=version,
description=description,
long_description=long_desc,
version=version,
description=description,
long_description=long_desc,