[IMP] directory cleanups, moved historical cruft into history

bzr revid: al@openerp.com-20110926005444-a7vqjb05vep7xbvj

48 files changed, 170 insertions, 101 deletions

diff --git a/MANIFEST.in b/MANIFEST.in
index 6cd10b511cf..70715f18bc2 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,18 +1,12 @@
-include rpminstall_sh.txt # TODO do we need this file ?
 include README
 include LICENSE
 include MANIFEST.in
 include setup.nsi
 include setup.cfg
-#include openerp/server.cert
-#include openerp/server.pkey
-#include openerp/gpl.txt
-include man/openerp-server.1
-include man/openerp_serverrc.5
-recursive-include pixmaps *bmp *ico *png
+include setup_rpm.sh
 recursive-include win32 *.py *.bat
-recursive-include openerp *css *csv *html *png *po *pot
-recursive-include openerp *rml *rng *sql *sxw *xml *xsl *yml
+recursive-include openerp *css *csv *html *png *po *pot *rml *rng *sql *sxw *xml *xsl *yml
+graft install
 graft debian
 graft doc
 global-exclude *pyc *~    # Exclude possible garbage from previous graft.
diff --git a/README b/README
index 5725ce9f866..a6fe10c8ffb 100644
--- a/README
+++ b/README
@@ -1,17 +1,138 @@
-About OpenERP

----------------

-

-OpenERP is a free Enterprise Resource Planning and Customer Relationship 

-Management software. It is mainly developed to meet changing needs.

-

-The main functional features are: CRM & SRM, analytic and financial accounting,

-double-entry stock management, sales and purchases management, tasks automation,

-help desk, marketing campaign, ... and vertical modules for very specific 

-businesses.

-

-Technical features include a distributed server, flexible workflows, an object 

-database, dynamic GUIs, customizable reports, NET-RPC and XML-RPC interfaces, ...

-

-For more information, please visit: 

-http://www.openerp.com

-

+About OpenERP
+-------------
+
+OpenERP is a free Enterprise Resource Planning and Customer Relationship 
+Management software. It is mainly developed to meet changing needs.
+
+The main functional features are: CRM & SRM, analytic and financial accounting,
+double-entry stock management, sales and purchases management, tasks automation,
+help desk, marketing campaign, ... and vertical modules for very specific 
+businesses.
+
+Technical features include a distributed server, flexible workflows, an object 
+database, dynamic GUIs, customizable reports, NET-RPC and XML-RPC interfaces, ...
+
+For more information, please visit: 
+http://www.openerp.com
+
+OpenERP Quick Installation Guide
+---------------------------------
+
+This file contains a quick guide to configure and install the OpenERP server.
+
+Required dependencies:
+---------------------
+
+You need the following software installed:
+
+    * Python 2.5 or 2.6
+    * Postgresql 8.2 or above
+    * Psycopg2 python module 
+    * Reportlab pdf generation library for python
+    * lxml python module
+    * pytz python module
+    * PyYaml python module (install with: easy_install PyYaml)
+
+Some dependencies are only required for specific purposes:
+
+for rendering workflows graphs, you need:
+    * graphviz
+    * pyparsing
+
+For Luxembourg localization, you also need:
+    * pdftk (http://www.pdflabs.com/tools/pdftk-the-pdf-toolkit/)
+
+for generating reports using non .jpg images, you need:
+    * Python Imaging Library for python
+
+For Debian-based distributions, the required packages can be installed with the 
+following command:
+
+  #> apt-get install -y postgresql graphviz python-psycopg2 python-lxml python-tz python-imaging
+
+For Fedora 
+if they are not installed, install:
+python and postgresql
+
+uses yum or you can recover required packages on fedora web site in "core" or "extra" repository :
+postgresql-python
+python-lxml
+python-imaging
+python-psycopg2
+python-reportlab
+graphviz
+You can find pyparsing at http://pyparsing.sourceforge.net/ 
+
+1. Check that all the required dependencies are installed.
+
+2. Launch the program "python ./bin/openerp-server.py -r db_user -w db_password --db_host 127.0.0.1".
+See the man page for more information about options.
+
+3. Connect to the server using the GUI client. And follow the instructions to create a new database.
+
+Installation Steps
+------------------
+
+1. Check that all the required dependencies are installed.
+
+2. Create a postgresql database.
+
+The default database name is "terp". If you want to use another name, you
+will need to provide it when launching the server (by using the commandline
+option --database).
+
+To create a postgresql database named "terp" using the following command:
+    $ createdb --encoding=UNICODE terp
+
+If it is the first time you use postgresql you might need to create a new user
+to the postgres system using the following commands (where myusername is your
+unix user name):
+
+    $ su -
+    # su - postgres
+    $ createuser openerp
+    Shall the new user be allowed to create databases? (y/n) y
+    Shall the new user be allowed to create more new users? (y/n) y
+    CREATE USER
+    $ logout
+    # logout
+
+3. Launch service daemon by "service openerp-server start".
+
+The first time it is run, the server will initialise the database with all the default values.
+
+4. Connect to the server using the GUI client.
+
+There are two accounts by default:
+    * login: admin, password:admin
+    * login: demo, password:demo
+
+Some instructions to use setup.py for a user-install.
+This file should/will be moved on a proper documentation place later.
+
+
+- Possibly clean any left-over of the previous build.
+  > rm -rf dist openerp_server.egg-info
+
+- Possibly copy the addons in the server if we want them to be packaged
+  together:
+  > rsync -av --delete \
+    --exclude .bzr/ \
+    --exclude .bzrignore \
+    --exclude /__init__.py \
+    --exclude /base \
+    --exclude /base_quality_interrogation.py \
+    <path-to-addons> openerp/addons
+
+- Create the user-local directory where we want the package to be installed:
+   > mkdir -p /home/openerp/openerp-tmp/lib/python2.6/site-packages/
+
+- Use --prefix to specify where the package is installed and include that
+  place in PYTHONPATH:
+  > PYTHONPATH=/home/openerp/openerp-tmp/lib/python2.6/site-packages/ \
+    python setup.py install --prefix=/home/openerp/openerp-tmp
+
+- Run the main script, again specifying the PYTHONPATH:
+  > PYTHONPATH=/home/openerp/openerp-tmp/lib/python2.6/site-packages/ \
+    /home/openerp/openerp-tmp/bin/openerp-server
+
diff --git a/doc/Changelog b/history/Changelog
index 3c63a7ee22d..3c63a7ee22d 100644
--- a/doc/Changelog
+++ b/history/Changelog
diff --git a/doc/Changelog-4.x b/history/Changelog-4.x
index d884fe8d391..d884fe8d391 100644
--- a/doc/Changelog-4.x
+++ b/history/Changelog-4.x
diff --git a/doc/Changelog-6.x b/history/Changelog-6.x
index 05b5f58217e..05b5f58217e 100644
--- a/doc/Changelog-6.x
+++ b/history/Changelog-6.x
diff --git a/doc/INSTALL b/history/INSTALL
index 254b7e7b5a0..254b7e7b5a0 100644
--- a/doc/INSTALL
+++ b/history/INSTALL
diff --git a/doc/README.urpmi b/history/README.urpmi
index ce8fb706703..ce8fb706703 100644
--- a/doc/README.urpmi
+++ b/history/README.urpmi
diff --git a/doc/README.userchange b/history/README.userchange
index f6cc0ab0666..f6cc0ab0666 100644
--- a/doc/README.userchange
+++ b/history/README.userchange
diff --git a/tools/change-loglevel.sh b/history/change-loglevel.sh
index 88c8c1d0fe0..88c8c1d0fe0 100755
--- a/tools/change-loglevel.sh
+++ b/history/change-loglevel.sh
diff --git a/doc/tests/check_profile_l10n_all.py b/history/check_profile_l10n_all.py
index 719d5ce051b..719d5ce051b 100644
--- a/doc/tests/check_profile_l10n_all.py
+++ b/history/check_profile_l10n_all.py
diff --git a/sql/clean-model.sql b/history/clean-model.sql
index 59b492aab2d..59b492aab2d 100644
--- a/sql/clean-model.sql
+++ b/history/clean-model.sql
diff --git a/tools/gen_graph.sh b/history/gen_graph.sh
index b052528eef4..b052528eef4 100755
--- a/tools/gen_graph.sh
+++ b/history/gen_graph.sh
diff --git a/tools/get-srvstats.sh b/history/get-srvstats.sh
index 931d575858a..931d575858a 100755
--- a/tools/get-srvstats.sh
+++ b/history/get-srvstats.sh
diff --git a/tools/list-services.sh b/history/list-services.sh
index a90e58479d5..a90e58479d5 100755
--- a/tools/list-services.sh
+++ b/history/list-services.sh
diff --git a/doc/migrate/3.3.0-3.4.0/README b/history/migrate/3.3.0-3.4.0/README
index 10cf834af0e..10cf834af0e 100644
--- a/doc/migrate/3.3.0-3.4.0/README
+++ b/history/migrate/3.3.0-3.4.0/README
diff --git a/doc/migrate/3.3.0-3.4.0/post.py b/history/migrate/3.3.0-3.4.0/post.py
index bdbd719116b..bdbd719116b 100644
--- a/doc/migrate/3.3.0-3.4.0/post.py
+++ b/history/migrate/3.3.0-3.4.0/post.py
diff --git a/doc/migrate/3.3.0-3.4.0/pre.py b/history/migrate/3.3.0-3.4.0/pre.py
index db8ec6ddfcc..db8ec6ddfcc 100644
--- a/doc/migrate/3.3.0-3.4.0/pre.py
+++ b/history/migrate/3.3.0-3.4.0/pre.py
diff --git a/doc/migrate/3.4.0-4.0.0/README b/history/migrate/3.4.0-4.0.0/README
index 6f8d73d9520..6f8d73d9520 100644
--- a/doc/migrate/3.4.0-4.0.0/README
+++ b/history/migrate/3.4.0-4.0.0/README
diff --git a/doc/migrate/3.4.0-4.0.0/post-tiny.py b/history/migrate/3.4.0-4.0.0/post-tiny.py
index f4d299f3763..f4d299f3763 100644
--- a/doc/migrate/3.4.0-4.0.0/post-tiny.py
+++ b/history/migrate/3.4.0-4.0.0/post-tiny.py
diff --git a/doc/migrate/3.4.0-4.0.0/post.py b/history/migrate/3.4.0-4.0.0/post.py
index 2abb06dd6f9..2abb06dd6f9 100644
--- a/doc/migrate/3.4.0-4.0.0/post.py
+++ b/history/migrate/3.4.0-4.0.0/post.py
diff --git a/doc/migrate/3.4.0-4.0.0/pre-tiny.py b/history/migrate/3.4.0-4.0.0/pre-tiny.py
index 1001957e719..1001957e719 100644
--- a/doc/migrate/3.4.0-4.0.0/pre-tiny.py
+++ b/history/migrate/3.4.0-4.0.0/pre-tiny.py
diff --git a/doc/migrate/3.4.0-4.0.0/pre.py b/history/migrate/3.4.0-4.0.0/pre.py
index 3e9f2bbf2d4..3e9f2bbf2d4 100644
--- a/doc/migrate/3.4.0-4.0.0/pre.py
+++ b/history/migrate/3.4.0-4.0.0/pre.py
diff --git a/doc/migrate/4.0.0-4.2.0/pre.py b/history/migrate/4.0.0-4.2.0/pre.py
index a8080ee9a2a..a8080ee9a2a 100644
--- a/doc/migrate/4.0.0-4.2.0/pre.py
+++ b/history/migrate/4.0.0-4.2.0/pre.py
diff --git a/doc/migrate/4.0.0-4.2.0/tiny/README b/history/migrate/4.0.0-4.2.0/tiny/README
index 36f129050d0..36f129050d0 100644
--- a/doc/migrate/4.0.0-4.2.0/tiny/README
+++ b/history/migrate/4.0.0-4.2.0/tiny/README
diff --git a/doc/migrate/4.0.0-4.2.0/tiny/pre-tiny.py b/history/migrate/4.0.0-4.2.0/tiny/pre-tiny.py
index f2485a24100..f2485a24100 100644
--- a/doc/migrate/4.0.0-4.2.0/tiny/pre-tiny.py
+++ b/history/migrate/4.0.0-4.2.0/tiny/pre-tiny.py
diff --git a/doc/migrate/4.2.0-4.4.0/pre.py b/history/migrate/4.2.0-4.4.0/pre.py
index 5c4598274e5..5c4598274e5 100644
--- a/doc/migrate/4.2.0-4.4.0/pre.py
+++ b/history/migrate/4.2.0-4.4.0/pre.py
diff --git a/tools/module_graph.py b/history/module_graph.py
index b29bd316e2f..b29bd316e2f 100755
--- a/tools/module_graph.py
+++ b/history/module_graph.py
diff --git a/tools/xml2yml.py b/history/xml2yml.py
index e926ddf5f94..e926ddf5f94 100755
--- a/tools/xml2yml.py
+++ b/history/xml2yml.py
diff --git a/pixmaps/openerp-header.bmp b/install/openerp-header.bmp
index 61226b99ad7..61226b99ad7 100644
--- a/pixmaps/openerp-header.bmp
+++ b/install/openerp-header.bmp
diff --git a/pixmaps/openerp-header.png b/install/openerp-header.png
index 22c1df45aee..22c1df45aee 100644
--- a/pixmaps/openerp-header.png
+++ b/install/openerp-header.png
diff --git a/pixmaps/openerp-icon.ico b/install/openerp-icon.ico
index 89ed393f7cc..89ed393f7cc 100644
--- a/pixmaps/openerp-icon.ico
+++ b/install/openerp-icon.ico
diff --git a/pixmaps/openerp-icon.png b/install/openerp-icon.png
index 9057d12d51e..9057d12d51e 100644
--- a/pixmaps/openerp-icon.png
+++ b/install/openerp-icon.png
diff --git a/man/openerp-server.1 b/install/openerp-server.1
index 58ac6f324f1..58ac6f324f1 100644
--- a/man/openerp-server.1
+++ b/install/openerp-server.1
diff --git a/doc/openerp-server.conf b/install/openerp-server.conf
index 4f13c8a45c2..4f13c8a45c2 100644
--- a/doc/openerp-server.conf
+++ b/install/openerp-server.conf
diff --git a/doc/openerp-server.init b/install/openerp-server.init
index 41efb5c35ce..41efb5c35ce 100644
--- a/doc/openerp-server.init
+++ b/install/openerp-server.init
diff --git a/doc/openerp-server.logrotate b/install/openerp-server.logrotate
index e1f7f803a7d..e1f7f803a7d 100644
--- a/doc/openerp-server.logrotate
+++ b/install/openerp-server.logrotate
diff --git a/pixmaps/openerp.ico b/install/openerp.ico
index cde3e961e79..cde3e961e79 100644
--- a/pixmaps/openerp.ico
+++ b/install/openerp.ico
diff --git a/pixmaps/openerp.png b/install/openerp.png
index 20da496413b..20da496413b 100644
--- a/pixmaps/openerp.png
+++ b/install/openerp.png
diff --git a/man/openerp_serverrc.5 b/install/openerp_serverrc.5
index e43f9b5a668..e43f9b5a668 100644
--- a/man/openerp_serverrc.5
+++ b/install/openerp_serverrc.5
diff --git a/ssl-cert.cfg b/install/ssl-cert.cfg
index 08ca7b5757e..08ca7b5757e 100644
--- a/ssl-cert.cfg
+++ b/install/ssl-cert.cfg
diff --git a/openerp/addons/base/res/res_company.py b/openerp/addons/base/res/res_company.py
index dc07b55a78e..51d796a3a1e 100644
--- a/openerp/addons/base/res/res_company.py
+++ b/openerp/addons/base/res/res_company.py
@@ -245,9 +245,7 @@ class res_company(osv.osv):
             return False
 
     def _get_logo(self, cr, uid, ids):
-        return open(os.path.join(
-            tools.config['root_path'], '..', 'pixmaps', 'your_logo.png'),
-                    'rb') .read().encode('base64')
+        return open(os.path.join( tools.config['root_path'], 'addons', 'base', 'res', 'res_company_logo.png'), 'rb') .read().encode('base64')
 
     _header = """
 <header>
diff --git a/pixmaps/your_logo.png b/openerp/addons/base/res/res_company_logo.png
index f5f05b08653..f5f05b08653 100644
--- a/pixmaps/your_logo.png
+++ b/openerp/addons/base/res/res_company_logo.png
diff --git a/pixmaps/openerp-intro.bmp b/pixmaps/openerp-intro.bmp
deleted file mode 100644
index 8d3c9340c9b..00000000000
--- a/pixmaps/openerp-intro.bmp
+++ /dev/null
diff --git a/pixmaps/openerp-slogan.bmp b/pixmaps/openerp-slogan.bmp
deleted file mode 100644
index a3cffd104f2..00000000000
--- a/pixmaps/openerp-slogan.bmp
+++ /dev/null
diff --git a/setup.README b/setup.README
deleted file mode 100644
index 5ee564ecfb4..00000000000
--- a/setup.README
+++ /dev/null
@@ -1,27 +0,0 @@
-Some instructions to use setup.py for a user-install.
-This file should/will be moved on a proper documentation place later.
-
-- Possibly clean any left-over of the previous build.
-  > rm -rf dist openerp_server.egg-info
-
-- Possibly copy the addons in the server if we want them to be packaged
-  together:
-  > rsync -av --delete \
-    --exclude .bzr/ \
-    --exclude .bzrignore \
-    --exclude /__init__.py \
-    --exclude /base \
-    --exclude /base_quality_interrogation.py \
-    <path-to-addons> openerp/addons
-
-- Create the user-local directory where we want the package to be installed:
-   > mkdir -p /home/openerp/openerp-tmp/lib/python2.6/site-packages/
-
-- Use --prefix to specify where the package is installed and include that
-  place in PYTHONPATH:
-  > PYTHONPATH=/home/openerp/openerp-tmp/lib/python2.6/site-packages/ \
-    python setup.py install --prefix=/home/openerp/openerp-tmp
-
-- Run the main script, again specifying the PYTHONPATH:
-  > PYTHONPATH=/home/openerp/openerp-tmp/lib/python2.6/site-packages/ \
-    /home/openerp/openerp-tmp/bin/openerp-server
diff --git a/setup.cfg b/setup.cfg
index 483eb2f22e1..2f64223e455 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -17,4 +17,4 @@ requires=python >= 2.5
 
 # Need to overwrite the install-part of the RPM to patch
 # the filenames of the man pages.
-install_script=rpminstall_sh.txt
+install_script=setup_rpm.sh
diff --git a/setup.py b/setup.py
index 94c3cf50a92..9595c1a9257 100755
--- a/setup.py
+++ b/setup.py
@@ -20,15 +20,12 @@
 #
 ##############################################################################
 
-import os, sys
-import os
+import glob, os, re, setuptools, sys
 from os.path import join, isfile
-import glob
 
-from setuptools import setup, find_packages
+execfile(join('openerp', 'release.py'))
 
 py2exe_keywords = {}
-py2exe_data_files = []
 if os.name == 'nt':
     import py2exe
     py2exe_keywords['console'] = [
@@ -52,37 +49,30 @@ if os.name == 'nt':
             "excludes" : ["Tkconstants","Tkinter","tcl"],
         }
     }
-    # TODO is it still necessary now that we don't use the library.zip file?
-    def data_files():
-        '''For Windows, we consider all the addons as data files.
-           It seems also that package_data below isn't honored by py2exe.'''
-        files = []
-        os.chdir('openerp')
-        for (dp, dn, names) in os.walk('addons'):
-            files.append((join('openerp',dp), map(lambda x: join('openerp', dp, x), names)))
-        os.chdir('..')
-        files.append(('openerp', [join('openerp', 'import_xml.rng'),]))
-
-        # copy pytz/timzeone
-        # TODO check if we have to also copy dateutil's timezone data.
-        import pytz
-        # Make sure the layout of pytz hasn't changed
-        assert (pytz.__file__.endswith('__init__.pyc') or
-                pytz.__file__.endswith('__init__.py')), pytz.__file__
-        pytz_dir = os.path.dirname(pytz.__file__)
 
-        saved_dir = os.getcwd()
-        os.chdir(pytz_dir)
-        for dp, dn, names in os.walk('zoneinfo'):
-            files.append((join('pytz',dp), map(lambda x: join(pytz_dir, dp, x), names)))
-        os.chdir(saved_dir)
+# 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()
+    return r
 
-        return files
-    py2exe_data_files = data_files()
+def gen_manifest():
+    file_list="\n".join(data())
+    open('MANIFEST','w').write(file_list)
 
-execfile(join('openerp', 'release.py'))
-
-setup(name             = name,
+setuptools.setup(
+      name             = name,
       version          = version,
       description      = description,
       long_description = long_desc,
@@ -91,18 +81,10 @@ setup(name             = name,
       author_email     = author_email,
       classifiers      = filter(None, classifiers.split("\n")),
       license          = license,
-      data_files       = [
-        (join('man', 'man1'), ['man/openerp-server.1']),
-        (join('man', 'man5'), ['man/openerp_serverrc.5']),
-        ('doc', filter(isfile, glob.glob('doc/*'))),
-      ] + py2exe_data_files,
       scripts          = ['openerp-server'],
-      packages = find_packages(),
-      include_package_data = True,
-      package_data = {
-          '': ['*.yml', '*.xml', '*.po', '*.pot', '*.csv'],
-      },
-      dependency_links = ['http://download.gna.org/pychart/'],
+      data_files       = data(),
+      packages         = setuptools.find_packages(),
+      #include_package_data = True,
       install_requires = [
        # We require the same version as caldav for lxml.
           'lxml==2.1.5',
@@ -114,6 +96,7 @@ setup(name             = name,
         # It is probably safe to move to PyChart 1.39 (the latest one).
         # (Let setup.py choose the latest one, and we should check we can remove pychart from
         # our tree.)
+        # http://download.gna.org/pychart/
           'pychart',
           'pydot',
           'pytz',
diff --git a/rpminstall_sh.txt b/setup_rpm.sh
index bb7bb3fc10c..bb7bb3fc10c 100644
--- a/rpminstall_sh.txt
+++ b/setup_rpm.sh