Merge commit 'origin/master' into mdv-gpl3-py26
bzr revid: p_christ@hol.gr-20090209135704-xi8471u5u7xza016
This commit is contained in:
commit
70340087e5
|
@ -23,7 +23,7 @@
|
||||||
|
|
||||||
name = 'openerp-server'
|
name = 'openerp-server'
|
||||||
version = '5.0.0'
|
version = '5.0.0'
|
||||||
release = '1'
|
release = '2'
|
||||||
major_version = '5.0'
|
major_version = '5.0'
|
||||||
description = 'OpenERP Server'
|
description = 'OpenERP Server'
|
||||||
long_desc = '''\
|
long_desc = '''\
|
||||||
|
|
|
@ -6,9 +6,9 @@ formats=rpm
|
||||||
|
|
||||||
[bdist_rpm]
|
[bdist_rpm]
|
||||||
# release must exactly match 'release' as set in bin/release.py
|
# release must exactly match 'release' as set in bin/release.py
|
||||||
release=0_rc3
|
release=2
|
||||||
|
|
||||||
requires=python >= 2.3
|
requires=python >= 2.4
|
||||||
#build-requires=python-devel >= 2.3
|
#build-requires=python-devel >= 2.3
|
||||||
|
|
||||||
#doc_files = doc/*
|
#doc_files = doc/*
|
||||||
|
|
2
setup.py
2
setup.py
|
@ -113,7 +113,7 @@ def data_files():
|
||||||
addon_path = opj('lib', 'python%s' % py_short_version, 'site-packages', add_path.replace('bin', 'openerp-server', 1))
|
addon_path = opj('lib', 'python%s' % py_short_version, 'site-packages', add_path.replace('bin', 'openerp-server', 1))
|
||||||
pathfiles = []
|
pathfiles = []
|
||||||
for root, dirs, innerfiles in os.walk(add_path):
|
for root, dirs, innerfiles in os.walk(add_path):
|
||||||
innerfiles = filter(lambda file: os.path.splitext(file)[1] not in ('.pyc', '.py', '.pyd', '.pyo'), innerfiles)
|
innerfiles = filter(lambda file: os.path.splitext(file)[1] not in ('.pyc', '.pyd', '.pyo'), innerfiles)
|
||||||
if innerfiles:
|
if innerfiles:
|
||||||
res = os.path.normpath(opj(addon_path, root.replace(opj('bin','addons', addonname), '.')))
|
res = os.path.normpath(opj(addon_path, root.replace(opj('bin','addons', addonname), '.')))
|
||||||
pathfiles.extend(((res, map(lambda file: opj(root, file), innerfiles)),))
|
pathfiles.extend(((res, map(lambda file: opj(root, file), innerfiles)),))
|
||||||
|
|
Loading…
Reference in New Issue