Merge lp:~camptocamp/anybox.recipe.openerp/1.8-fix_github-nbi into lp:anybox.recipe.openerp/1.8

[Nicolas Bessi - Camptocamp]

Fix setup.py modification in master of Odoo

This fix depends on https://github.com/odoo/odoo/pull/276

[Nicolas Bessi - Camptocamp (nbessi-c2c-deactivatedaccount)]

I need some help to finalize this MP.
I'm not sure of all the places this modification must be done.
There is also a more deep modification to do in order to initialize sooner major_version

[lp:~camptocamp/anybox.recipe.openerp/1.8-fix_github-nbi]

536. By Nicolas Bessi - Camptocamp on 2014-05-30

[FIX] forgotten pdb

[Georges Racinet (gracinet)]

Another path to solution would be to read the simpler release.py if available and avoid that setup patching that dates back to the days of OpenERP 6.0.

Unmerged revisions

536. By Nicolas Bessi - Camptocamp on 2014-05-30

[FIX] forgotten pdb

535. By Nicolas Bessi - Camptocamp on 2014-05-30

[ADD] poc to fix github compatibility some hook must be completed and major_version trouble not fixed

=== modified file 'anybox/recipe/openerp/base.py'
--- anybox/recipe/openerp/base.py	2014-05-27 12:29:32 +0000
+++ anybox/recipe/openerp/base.py	2014-05-30 14:21:19 +0000
@@ -333,7 +333,10 @@
         setuptools.setup = new_setup
         distutils.core.setup = new_setup
         sys.path.insert(0, '.')
-        with open(join(self.openerp_dir, 'setup.py'), 'rb') as f:
+        setup_dir = 'setup' # how to get major version here ?
+        if self.major_version >= (8, 0):
+            setup_dir = 'setup'
+        with open(join(self.openerp_dir, setup_dir, 'setup.py'), 'rb') as f:
             saved_argv = sys.argv
             sys.argv = ['setup.py', 'develop']
             try:
 
=== modified file 'anybox/recipe/openerp/server.py'
--- anybox/recipe/openerp/server.py	2014-05-29 16:13:23 +0000
+++ anybox/recipe/openerp/server.py	2014-05-30 14:21:19 +0000
@@ -108,7 +108,9 @@
         if self.major_version >= (6, 1):
             openerp_dir = getattr(self, 'openerp_dir', None)
             if openerp_dir is not None:  # happens in unit tests
-                self.develop(openerp_dir, setup_has_pil=setup_has_pil)
+                if self.major_version >= (8, 0):
+                    setup_dir = 'setup'
+                self.develop(join(openerp_dir, setup_dir), setup_has_pil=setup_has_pil)
             self.requirements.append('openerp')
 
         if self.with_gunicorn: