[fix] style fixes
bzr revid: xmo@tinyerp.com-20091212164600-1o0i5ka83c67m9mj
This commit is contained in:
parent
466b6e5d7d
commit
43e9f81873
37
setup.py
37
setup.py
|
@ -74,9 +74,9 @@ def check_modules():
|
||||||
sys.exit(1)
|
sys.exit(1)
|
||||||
|
|
||||||
def find_addons():
|
def find_addons():
|
||||||
for dp, dn, names in os.walk(join('bin', 'addons')):
|
for root, _, names in os.walk(join('bin', 'addons')):
|
||||||
if '__terp__.py' in names:
|
if '__terp__.py' in names:
|
||||||
yield basename(dp), dp
|
yield basename(root), root
|
||||||
#look for extra modules
|
#look for extra modules
|
||||||
try:
|
try:
|
||||||
empath = os.getenv('EXTRA_MODULES_PATH', '../addons/')
|
empath = os.getenv('EXTRA_MODULES_PATH', '../addons/')
|
||||||
|
@ -95,10 +95,10 @@ def data_files():
|
||||||
'''Build list of data files to be installed'''
|
'''Build list of data files to be installed'''
|
||||||
files = []
|
files = []
|
||||||
if os.name == 'nt':
|
if os.name == 'nt':
|
||||||
for dp,dn,names in os.walk(join('bin','addons')):
|
for root, _, names in os.walk(join('bin','addons')):
|
||||||
files.append((dp, map(lambda x: join(dp, x), names)))
|
files.append((root, [join(root, name) for name in names]))
|
||||||
for dp,dn,names in os.walk('doc'):
|
for root, _, names in os.walk('doc'):
|
||||||
files.append((dp, map(lambda x: join(dp, x), names)))
|
files.append((root, [join(root, name) for name in names]))
|
||||||
files.append(('.', [join('bin', 'import_xml.rng'),
|
files.append(('.', [join('bin', 'import_xml.rng'),
|
||||||
join('bin', 'server.pkey'),
|
join('bin', 'server.pkey'),
|
||||||
join('bin', 'server.cert')]))
|
join('bin', 'server.cert')]))
|
||||||
|
@ -148,21 +148,21 @@ exit 1
|
||||||
f.close()
|
f.close()
|
||||||
|
|
||||||
def find_package_dirs():
|
def find_package_dirs():
|
||||||
res = {}
|
package_dirs = {'openerp-server': 'bin'}
|
||||||
for mod, path in find_addons():
|
for mod, path in find_addons():
|
||||||
res ['openerp-server.addons.'+ mod ] = path
|
package_dirs['openerp-server.addons.' + mod] = path
|
||||||
res ['openerp-server'] = 'bin'
|
return package_dirs
|
||||||
return res
|
|
||||||
|
|
||||||
class openerp_server_install(install):
|
class openerp_server_install(install):
|
||||||
def run(self):
|
def run(self):
|
||||||
# create startup script
|
# create startup script
|
||||||
start_script = "#!/bin/sh\ncd %s\nexec %s ./openerp-server.py $@\n" % (join(self.install_libbase, "openerp-server"), sys.executable)
|
start_script = "#!/bin/sh\ncd %s\nexec %s ./openerp-server.py $@\n"\
|
||||||
|
% (join(self.install_libbase, "openerp-server"), sys.executable)
|
||||||
# write script
|
# write script
|
||||||
f = open('openerp-server', 'w')
|
f = open('openerp-server', 'w')
|
||||||
f.write(start_script)
|
f.write(start_script)
|
||||||
f.close()
|
f.close()
|
||||||
install.run(self)
|
super(openerp_server_install, self).run()
|
||||||
|
|
||||||
options = {
|
options = {
|
||||||
"py2exe": {
|
"py2exe": {
|
||||||
|
@ -171,9 +171,9 @@ options = {
|
||||||
"dist_dir": 'dist',
|
"dist_dir": 'dist',
|
||||||
"packages": ["lxml", "lxml.builder", "lxml._elementpath", "lxml.etree",
|
"packages": ["lxml", "lxml.builder", "lxml._elementpath", "lxml.etree",
|
||||||
"lxml.objectify", "decimal", "xml", "xml.dom", "xml.xpath",
|
"lxml.objectify", "decimal", "xml", "xml.dom", "xml.xpath",
|
||||||
"encodings","mx.DateTime","wizard","pychart","PIL", "pyparsing",
|
"encodings","mx.DateTime","wizard","pychart","PIL",
|
||||||
"pydot","asyncore","asynchat", "reportlab", "vobject",
|
"pyparsing", "pydot","asyncore","asynchat", "reportlab",
|
||||||
"HTMLParser", "select"],
|
"vobject", "HTMLParser", "select"],
|
||||||
"excludes" : ["Tkconstants","Tkinter","tcl"],
|
"excludes" : ["Tkconstants","Tkinter","tcl"],
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -212,9 +212,12 @@ setup(name = name,
|
||||||
'openerp-server.tools',
|
'openerp-server.tools',
|
||||||
'openerp-server.wizard',
|
'openerp-server.wizard',
|
||||||
'openerp-server.workflow'] + \
|
'openerp-server.workflow'] + \
|
||||||
list(map( lambda (a, p): 'openerp-server.addons.'+ a ,find_addons())),
|
[('openerp-server.addons.' + name)
|
||||||
|
for name, _ in find_addons()]
|
||||||
package_dir = find_package_dirs(),
|
package_dir = find_package_dirs(),
|
||||||
console = [ { "script" : "bin\\openerp-server.py", "icon_resources" : [ (1,"pixmaps\\openerp-icon.ico") ] } ],
|
console = [{"script": join("bin", "openerp-server.py"),
|
||||||
|
"icon_resources": [(1,join("pixmaps","openerp-icon.ico"))]
|
||||||
|
}],
|
||||||
options = options,
|
options = options,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue