diff --git a/README b/README
index e7639e08fedae18310f2c39b75495d770fcc22f6..9449819d766bb2c87dafc451231170366f58e583 100644
--- a/README
+++ b/README
@@ -6,17 +6,9 @@ Customer Relationship Management software. More info at:
http://www.openerp.com
-Installation on Debian Ubuntu
+Installation on Debian/Ubuntu
-----------------------------
-Download the deb file and type:
-
- $ sudo dpkg -i <openerp-deb-filename>
- $ sudo apt-get install install -f
-
-Installation on Debian Ubuntu from nightly build
-------------------------------------------------
-
Add the the apt repository
deb http://nightly.openerp.com/6.1/deb/ ./
@@ -26,6 +18,11 @@ in your source.list and type:
$ sudo apt-get update
$ sudo apt-get install openerp
+Or download the deb file and type:
+
+ $ sudo dpkg -i <openerp-deb-filename>
+ $ sudo apt-get install install -f
+
Installation on RedHat, Fedora, CentOS
--------------------------------------
@@ -42,6 +39,8 @@ Install the openerp rpm
Installation on Windows
-----------------------
+ Check the notes in setup.py
+
Installation on MacOSX
-----------------------
@@ -54,14 +53,7 @@ default master password is "admin".
Detailed System Requirements
----------------------------
-You need the following software installed:
-
- postgresql-client, python-dateutil, python-feedparser, python-gdata,
- python-ldap, python-libxslt1, python-lxml, python-mako, python-openid,
- python-psycopg2, python-pybabel, python-pychart, python-pydot,
- python-pyparsing, python-reportlab, python-simplejson, python-tz,
- python-vatnumber, python-vobject, python-webdav, python-werkzeug, python-xlwt,
- python-yaml, python-zsi
+The dependencies are listed in setup.py
For Luxembourg localization, you also need:
diff --git a/openerp/service/__init__.py b/openerp/service/__init__.py
index a1c19914268c7bb487adc98335ba1504dbfaba99..491af631202dd2629f3c7e71dd06735e2ba992a4 100644
--- a/openerp/service/__init__.py
+++ b/openerp/service/__init__.py
@@ -34,7 +34,6 @@ import openerp.netsvc
import openerp.osv
import openerp.tools
import openerp.service.wsgi_server
-import openerp.service.workers
#.apidoc title: RPC Services
@@ -119,6 +118,7 @@ def stop_services():
openerp.modules.registry.RegistryManager.delete_all()
def start_services_workers():
+ import openerp.service.workers
openerp.multi_process = True # Nah!
openerp.service.workers.Multicorn(openerp.service.wsgi_server.application).run()
diff --git a/openerp/service/workers.py b/openerp/service/workers.py
index eae1b2839a83ab778c65c625ba193dcf95ebafd8..7bdf45c079f3bddc0397f07ebcae49068d9ab299 100644
--- a/openerp/service/workers.py
+++ b/openerp/service/workers.py
@@ -3,20 +3,17 @@
# TODO rename class: Multicorn -> Arbiter ?
#-----------------------------------------------------------
import errno
-try:
- import fcntl
-except ImportError:
- fcntl = None
+import fcntl
+import logging
+import os
import psutil
import random
import resource
import select
-import socket
-import time
-import logging
-import os
import signal
+import socket
import sys
+import time
import werkzeug.serving
diff --git a/setup.py b/setup.py
new file mode 100755
index 0000000000000000000000000000000000000000..45f19ea7a7dcdba5ca4ce21067baf8e312b3383e
--- /dev/null
+++ b/setup.py
@@ -0,0 +1,139 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# OpenERP, Open Source Management Solution
+# Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import glob, os, re, setuptools, sys
+from os.path import join, isfile
+
+# List all data files
+def data():
+ files = []
+ for root, dirnames, filenames in os.walk('openerp'):
+ for filename in filenames:
+ if not re.match(r'.*(\.pyc|\.pyo|\~)$',filename):
+ files.append(os.path.join(root, filename))
+ d = {}
+ for v in files:
+ k=os.path.dirname(v)
+ if k in d:
+ d[k].append(v)
+ else:
+ d[k]=[v]
+ r = d.items()
+ if os.name == 'nt':
+ r.append(("Microsoft.VC90.CRT", glob.glob('C:\Microsoft.VC90.CRT\*.*')))
+
+ import babel
+ r.append(("localedata",
+ glob.glob(os.path.join(os.path.dirname(babel.__file__), "localedata" , '*'))))
+
+ return r
+
+def gen_manifest():
+ file_list="\n".join(data())
+ open('MANIFEST','w').write(file_list)
+
+if os.name == 'nt':
+ sys.path.append("C:\Microsoft.VC90.CRT")
+
+def py2exe_options():
+ if os.name == 'nt':
+ import py2exe
+ return {
+ "console" : [ { "script": "openerp-server", "icon_resources": [(1, join("install","openerp-icon.ico"))], }],
+ 'options' : {
+ "py2exe": {
+ "skip_archive": 1,
+ "optimize": 2,
+ "dist_dir": 'dist',
+ "packages": [ "DAV", "HTMLParser", "PIL", "asynchat", "asyncore", "commands", "dateutil", "decimal", "email", "encodings", "imaplib", "lxml", "lxml._elementpath", "lxml.builder", "lxml.etree", "lxml.objectify", "mako", "openerp", "poplib", "pychart", "pydot", "pyparsing", "reportlab", "select", "simplejson", "smtplib", "uuid", "vatnumber", "vobject", "xml", "xml.dom", "yaml", ],
+ "excludes" : ["Tkconstants","Tkinter","tcl"],
+ }
+ }
+ }
+ else:
+ return {}
+
+execfile(join(os.path.dirname(__file__), 'openerp', 'release.py'))
+
+# Notes for OpenERP developer on windows:
+#
+# To setup a windows developer evironement install python2.7 then pip and use
+# "pip install <depencey>" for every dependency listed below.
+#
+# Dependecies that requires DLLs are not installable with pip install, for
+# them we added comments with links where you can find the installers.
+#
+# OpenERP on windows also require the pywin32, the binary can be found at
+# http://pywin32.sf.net
+#
+# Both python2.7 32bits and 64bits are known to work.
+
+setuptools.setup(
+ name = 'openerp',
+ version = version,
+ description = description,
+ long_description = long_desc,
+ url = url,
+ author = author,
+ author_email = author_email,
+ classifiers = filter(None, classifiers.split("\n")),
+ license = license,
+ scripts = ['openerp-server'],
+ data_files = data(),
+ packages = setuptools.find_packages(),
+ dependency_links = ['http://download.gna.org/pychart/'],
+ #include_package_data = True,
+ install_requires = [
+ 'pychart', # not on pypi, use: pip install http://download.gna.org/pychart/PyChart-1.39.tar.gz
+ 'babel',
+ 'docutils',
+ 'feedparser',
+ 'gdata',
+ 'lxml < 3', # windows binary http://www.lfd.uci.edu/~gohlke/pythonlibs/
+ 'mako',
+ 'PIL', # windows binary http://www.lfd.uci.edu/~gohlke/pythonlibs/
+ 'psutil', # windows binary code.google.com/p/psutil/downloads/list
+ 'psycopg2',
+ 'pydot',
+ 'python-dateutil < 2',
+ 'python-ldap', # optional
+ 'python-openid',
+ 'pytz',
+ 'pywebdav',
+ 'pyyaml',
+ 'reportlab', # windows binary pypi.python.org/pypi/reportlab
+ 'simplejson',
+ 'vatnumber',
+ 'vobject',
+ 'werkzeug',
+ 'xlwt',
+ 'zsi', # optional
+ ],
+ extras_require = {
+ 'SSL' : ['pyopenssl'],
+ },
+ tests_require = ['unittest2'],
+ **py2exe_options()
+)
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: