SERVER: improve setup

bzr revid: ced-51772368bbd05b67c67026eb27f394595acd266c

4 files changed, 102 insertions, 134 deletions

diff --git a/bin/release.py b/bin/release.py
new file mode 100644
index 00000000000..4391cae2c3a
--- /dev/null
+++ b/bin/release.py
@@ -0,0 +1,21 @@
+#!/usr/bin/env python
+
+name = 'tinyerp-server'
+version = '4.1.2'
+description = 'Tiny\'s ERP Server'
+long_desc = '''\
+Tiny ERP is a complete ERP and CRM. The main features are accounting (analytic
+and financial), stock management, sales and purchases management, tasks
+automation, marketing campaigns, help desk, POS, etc. Technical features include
+a distributed server, flexible workflows, an object database, a dynamic GUI,
+customizable reports, and SOAP and XML-RPC interfaces.
+'''
+classifiers = """\
+Development Status :: 5 - Production/Stable
+License :: OSI Approved :: GNU General Public License (GPL)
+Programming Language :: Python
+"""
+url = 'http://tinyerp.com'
+author = 'Tiny.be'
+author_email = 'info@tiny.be'
+license = 'GPL'
diff --git a/bin/tinyerp-server.py b/bin/tinyerp-server.py
index 76553e53067..a443f97bcfa 100755
--- a/bin/tinyerp-server.py
+++ b/bin/tinyerp-server.py
@@ -38,9 +38,9 @@ GNU Public Licence.
 
 (c) 2003-TODAY, Fabien Pinckaers - Tiny sprl
 """
-
-__author__ = 'Fabien Pinckaers, <fp@tiny.be>'
-__version__ = '4.1.1'
+import release
+__author__ = release.author
+__version__ = release.version
 
 import __builtin__
 __builtin__.__dict__['tinyerp_version'] = __version__
@@ -51,7 +51,7 @@ __builtin__.__dict__['tinyerp_version_string'] = "Tiny ERP Server " + __version_
 #----------------------------------------------------------
 # python imports
 #----------------------------------------------------------
-import os, signal, sys
+import sys,os,signal
 
 #----------------------------------------------------------
 # get logger
diff --git a/setup.py b/setup.py
index 631d1156d9b..04991d21c4e 100755
--- a/setup.py
+++ b/setup.py
@@ -12,53 +12,24 @@ import sys
 import os
 import glob
 
+from stat import ST_MODE
+
 from distutils.core import setup, Command
 from distutils.command.install_scripts import install_scripts
 from distutils.file_util import copy_file
 
-from stat import ST_MODE
+if os.name == 'nt':
+    import py2exe
+
+sys.path.append(os.path.join(os.path.abspath(os.path.dirname(__file__)), "bin"))
 
 opj = os.path.join
 
-name = 'tinyerp-server'
-version = '4.1.1'
+execfile(opj('bin', 'release.py'))
 
 # get python short version
 py_short_version = '%s.%s' % sys.version_info[:2]
 
-included_addons = [
-    'account', 'account_followup', 'account_tax_include', 'airport', 'audittrail',
-    'base','base_partner_relation', 'base_setup', 'crm', 'custom', 'delivery',
-    'edi', 'esale_ez', 'esale_joomla', 'esale_osc',
-    'hr', 'hr_evaluation', 'hr_expense', 'hr_skill', 'hr_timesheet',
-    'hr_timesheet_ical', 'hr_timesheet_invoice', 'hr_timesheet_project',
-    'letter', 'marketing', 'mrp', 'network', 'partner_ldap',
-    'product','product_electronic', 'product_expiry', 'product_extended',
-    'productivity_analysis', 'product_variant', 'profile_accounting',
-    'profile_manufacturing', 'profile_service', 'project', 'purchase',
-    'purchase_tax_include', 'report_analytic_line', 'report_crm',
-    'report_intrastat',
-    'report_project', 'report_purchase', 'report_sale', 'sale', 'sale_crm',
-    'sale_journal', 'sale_rebate', 'sale_tax_include', 'sandwich', 'scrum',
-    'stock', 'subscription', 'travel',
-    'l10n_be', 'l10n_ca-qc', 'l10n_ch', 'l10n_ch_pcpbl_association',
-    'l10n_ch_pcpbl_independant', 'l10n_ch_pcpbl_menage',
-    'l10n_ch_pcpbl_plangen', 'l10n_ch_pcpbl_plangensimpl', 'l10n_ch_vat_brut',
-    'l10n_ch_vat_forfait', 'l10n_ch_vat_net', 'l10n_fr', 'l10n_se',
-    'l10n_simple', 'l10n_chart_at', 'l10n_chart_au', 'l10n_chart_be_frnl',
-    'l10n_chart_br', 'l10n_chart_ca_en', 'l10n_chart_ca_fr',
-    'l10n_chart_ch_german', 'l10n_chart_cn', 'l10n_chart_cn_traditional',
-    'l10n_chart_co', 'l10n_chart_cz', 'l10n_chart_da', 'l10n_chart_de_skr03',
-    'l10n_chart_hu', 'l10n_chart_id', 'l10n_chart_it', 'l10n_chart_it_cc2424',
-    'l10n_chart_la', 'l10n_chart_nl', 'l10n_chart_nl_standard', 'l10n_chart_no',
-    'l10n_chart_pa', 'l10n_chart_pl', 'l10n_chart_sp', 'l10n_chart_sw',
-    'l10n_chart_sw_church', 'l10n_chart_sw_food', 'l10n_chart_uk',
-    'l10n_chart_us_general', 'l10n_chart_us_manufacturing',
-    'l10n_chart_us_service', 'l10n_chart_us_ucoa', 'l10n_chart_us_ucoa_ez',
-    'l10n_chart_ve',
-    'users_ldap',
-    ]
-
 required_modules = [('psycopg', 'PostgreSQL module'),
                     ('xml', 'XML Tools for python'),
                     ('libxml2', 'libxml2 python bindings'),
@@ -77,64 +48,69 @@ def check_modules():
         sys.exit(1)
 
 def find_addons():
-    for addon in included_addons:
-        path = opj('bin', 'addons', addon)
-        for dirpath, dirnames, filenames in os.walk(path):
+    for (dp, dn, names) in os.walk(opj('bin', 'addons')):
+        if '.svn' in dn:
+            dn.remove('.svn')
+        for dirpath, dirnames, filenames in os.walk(dp):
             if '__init__.py' in filenames:
                 modname = dirpath.replace(os.path.sep, '.')
                 yield modname.replace('bin', 'tinyerp-server', 1)
 
 def data_files():
     '''Build list of data files to be installed'''
-    files = [(opj('share', 'man', 'man1'),
-              ['man/tinyerp-server.1']),
-             (opj('share', 'man', 'man5'),
-              ['man/terp_serverrc.5']),
-             (opj('share','doc', 'tinyerp-server-%s' % version), 
-              [f for f in glob.glob('doc/*') if os.path.isfile(f)]),
-             (opj('share','doc', 'tinyerp-server-%s' % version, 'migrate', '3.3.0-3.4.0'), 
-              [f for f in glob.glob('doc/migrate/3.3.0-3.4.0/*') if os.path.isfile(f)]),
-             (opj('share','doc', 'tinyerp-server-%s' % version, 'migrate', '3.4.0-4.0.0'), 
-              [f for f in glob.glob('doc/migrate/3.4.0-4.0.0/*') if os.path.isfile(f)]),
-             (opj('lib','python%s' % py_short_version, 'site-packagess', 'tinyerp-server', 'i18n'), 
-              glob.glob('bin/i18n/*')),
-             (opj('lib', 'python%s' % py_short_version, 'site-packages', 'tinyerp-server', 'addons', 'custom'),
-              glob.glob('bin/addons/custom/*xml') + 
-              glob.glob('bin/addons/custom/*rml') +
-              glob.glob('bin/addons/custom/*xsl'))]
-    for addon in find_addons():
-        add_path = addon.replace('.', os.path.sep).replace('tinyerp-server', 'bin',
-                                                           1)
-        pathfiles = [(opj('lib', 'python%s' % py_short_version, 'site-packages', 
-                          add_path.replace('bin', 'tinyerp-server', 1)),
-                      glob.glob(opj(add_path, '*xml')) +
-                      glob.glob(opj(add_path, '*csv')) +
-                      glob.glob(opj(add_path, '*sql'))),
-                     (opj('lib', 'python%s' % py_short_version, 'site-packages',
-                          add_path.replace('bin', 'tinyerp-server', 1), 'data'),
-                      glob.glob(opj(add_path, 'data', '*xml'))), 
-                     (opj('lib', 'python%s' % py_short_version, 'site-packages',
-                          add_path.replace('bin', 'tinyerp-server', 1), 'report'),
-                      glob.glob(opj(add_path, 'report', '*xml')) +
-                      glob.glob(opj(add_path, 'report', '*rml')) +
-                      glob.glob(opj(add_path, 'report', '*xsl')))]
-        files.extend(pathfiles)
+    files = []
+    if os.name == 'nt':
+        os.chdir('bin')
+        for (dp,dn,names) in os.walk('addons'):
+            if '.svn' in dn:
+                dn.remove('.svn')
+            files.append((dp, map(lambda x: os.path.join('bin', dp,x), names)))
+        for (dp,dn,names) in os.walk('i18n'):
+            if '.svn' in dn:
+                dn.remove('.svn')
+            files.append((dp, map(lambda x: os.path.join('bin', dp,x), names)))
+        os.chdir('..')
+        for (dp,dn,names) in os.walk('doc'):
+            if '.svn' in dn:
+                dn.remove('.svn')
+            files.append((dp, map(lambda x: os.path.join(dp,x), names)))
+    else:
+        files.append((opj('share', 'man', 'man1'), ['man/tinyerp-server.1']))
+        files.append((opj('share', 'man', 'man5'), ['man/terp_serverrc.5']))
+        files.append((opj('share','doc', 'tinyerp-server-%s' % version), [f for
+            f in glob.glob('doc/*') if os.path.isfile(f)]))
+        files.append((opj('share','doc', 'tinyerp-server-%s' % version,
+            'migrate', '3.3.0-3.4.0'), [f for f in
+                glob.glob('doc/migrate/3.3.0-3.4.0/*') if os.path.isfile(f)]))
+        files.append((opj('share','doc', 'tinyerp-server-%s' % version,
+            'migrate', '3.4.0-4.0.0'), [f for f in
+                glob.glob('doc/migrate/3.4.0-4.0.0/*') if os.path.isfile(f)]))
+        files.append((opj('lib','python%s' % py_short_version, 'site-packages',
+            'tinyerp-server', 'i18n'), glob.glob('bin/i18n/*')))
+        files.append((opj('lib', 'python%s' % py_short_version, 'site-packages',
+            'tinyerp-server', 'addons', 'custom'),
+            glob.glob('bin/addons/custom/*xml') +
+            glob.glob('bin/addons/custom/*rml') +
+            glob.glob('bin/addons/custom/*xsl')))
+        for addon in find_addons():
+            add_path = addon.replace('.', os.path.sep).replace('tinyerp-server', 'bin',
+                                                               1)
+            pathfiles = [(opj('lib', 'python%s' % py_short_version, 'site-packages', 
+                              add_path.replace('bin', 'tinyerp-server', 1)),
+                          glob.glob(opj(add_path, '*xml')) +
+                          glob.glob(opj(add_path, '*csv')) +
+                          glob.glob(opj(add_path, '*sql'))),
+                         (opj('lib', 'python%s' % py_short_version, 'site-packages',
+                              add_path.replace('bin', 'tinyerp-server', 1), 'data'),
+                          glob.glob(opj(add_path, 'data', '*xml'))), 
+                         (opj('lib', 'python%s' % py_short_version, 'site-packages',
+                              add_path.replace('bin', 'tinyerp-server', 1), 'report'),
+                          glob.glob(opj(add_path, 'report', '*xml')) +
+                          glob.glob(opj(add_path, 'report', '*rml')) +
+                          glob.glob(opj(add_path, 'report', '*xsl')))]
+            files.extend(pathfiles)
     return files
 
-long_desc = '''\
-Tiny ERP is a complete ERP and CRM. The main features are accounting (analytic
-and financial), stock management, sales and purchases management, tasks
-automation, marketing campaigns, help desk, POS, etc. Technical features include
-a distributed server, flexible workflows, an object database, a dynamic GUI,
-customizable reports, and SOAP and XML-RPC interfaces.
-'''
-
-classifiers = """\
-Development Status :: 5 - Production/Stable
-License :: OSI Approved :: GNU General Public License (GPL)
-Programming Language :: Python
-"""
-
 check_modules()
 
 # create startup script
@@ -147,16 +123,24 @@ f = open('tinyerp-server', 'w')
 f.write(start_script)
 f.close()
 
+options = {"py2exe": {
+    "compressed": 0,
+    "optimize": 2, 
+    "packages": ["encodings","mx.DateTime","wizard","pychart","PIL", "pyparsing", "pydot"],
+    "excludes" : ["Tkconstants","Tkinter","tcl"],
+    }}
+
 setup(name             = name,
       version          = version,
-      description      = "Tiny's Enterprise Resource Planning",
+      description      = description,
       long_description = long_desc,
-      url              = 'http://tinyerp.com',
-      author           = 'Tiny.be',
-      author_email     = 'info@tiny.be',
+      url              = url,
+      author           = author,
+      author_email     = author_email,
       classifiers      = filter(None, classifiers.split("\n")),
-      license          = 'GPL',
+      license          = license,
       data_files       = data_files(),
+      scripts          = ['tinyerp-server'],
       packages         = ['tinyerp-server', 'tinyerp-server.addons',
                           'tinyerp-server.ir',
                           'tinyerp-server.osv',
@@ -171,7 +155,8 @@ setup(name             = name,
                           'tinyerp-server.wizard', 'tinyerp-server.workflow'] + \
                          list(find_addons()),
       package_dir      = {'tinyerp-server': 'bin'},
-      scripts          = ['tinyerp-server']
+      console = [{"script":"bin\\tinyerp-server.py", "icon_resources":[(1,"pixmaps\\tinyerp.ico")]}],
+      options = options,
       )
 
 # vim:expandtab:tw=80
diff --git a/setup_py2exe.py b/setup_py2exe.py
deleted file mode 100644
index 992e5ac11f3..00000000000
--- a/setup_py2exe.py
+++ /dev/null
@@ -1,38 +0,0 @@
-from distutils.core import setup

-import py2exe

-import glob

-import os

-import sys

-import itertools

-

-sys.path.append(os.path.join(os.path.abspath(os.path.dirname(__file__)), "bin"))

-

-options = {"py2exe": {"compressed": 0,

-						"optimize": 2,

-						"packages": ["encodings","mx.DateTime","wizard","pychart","PIL", "pyparsing", "pydot"],

-						"excludes" : ["Tkconstants","Tkinter","tcl"],

-						}}

-

-data_files = []

-

-os.chdir('bin')

-for (dp,dn,names) in os.walk('addons'):

-	if '.svn' in dn:

-		dn.remove('.svn')

-	data_files.append((dp, map(lambda x: os.path.join('bin', dp,x), names)))

-for (dp,dn,names) in os.walk('i18n'):

-	if '.svn' in dn:

-		dn.remove('.svn')

-	data_files.append((dp, map(lambda x: os.path.join('bin', dp,x), names)))

-os.chdir('..')

-for (dp,dn,names) in os.walk('doc'):

-	if '.svn' in dn:

-		dn.remove('.svn')

-	data_files.append((dp, map(lambda x: os.path.join(dp,x), names)))

-

-setup(

-	name="tinyerp-server",

-	console = [{"script":"bin\\tinyerp-server.py", "icon_resources":[(1,"pixmaps\\tinyerp.ico")]}],

-	data_files = data_files,

-	options = options

-	)