lp:~openerp-dev/openobject-server/trunk-bug-715667-vmt

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:openobject-server at revision 3375

OpenERP Core Team: Pending requested 2011-03-22

Diff: 1321 lines (+101/-1118)

7 files modified

MANIFEST.in (+10/-11)
bin/openerp-server.py (+1/-1)
doc/Changelog-4.x.moved (+0/-951)
openerp/addons/base_quality_interrogation.py (+1/-1)
openerp/osv/orm.py (+1/-1)
setup.README (+27/-0)
setup.py (+61/-153)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

3369. By Vo Minh Thu on 2011-03-24

[MERGE] merged trunk.

3368. By Vo Minh Thu on 2011-03-24

[REF] renamed openerp-server.py to openerp-server.

3367. By Vo Minh Thu on 2011-03-22

[MERGE] merged the trunk.

3366. By Vo Minh Thu on 2011-03-21

[MERGE] merge from trunk.

3365. By Vo Minh Thu on 2011-03-11

[FIX] setup.py: py2exe, sdist, and install seem good.
- added commands to the list of modules
- provide an explicit dependency link for pychart (which will be used by easy_install)

3364. By Vo Minh Thu on 2011-03-09

[FIX] setup.py: modification so py2exe works.

- still needs some testing, sdist should be tested again.

3363. By Vo Minh Thu on 2011-03-07

[MERGE] merged trunk.

3362. By Vo Minh Thu on 2011-03-04

[IMP] setup.py: cleaning

- Removed unnecessary custom code to search/list files and addons.
- Handling of some environment variable and files created specifically by debian/rule.
- This case should be handled by simply copying the addons in the server (as is done)
  for packaging if needed. A setup.py file will probably be created for addons in the
  future.
- The console option has been reintroduced (it is needed for py2exe) but taking care
  of adding it only on os=nt.
- The dependency on pychart as been commented out as we already include its code.
- Building (with py2exe) on windows has yet to be tested.

3361. By Vo Minh Thu on 2011-02-24

[FIX] setup.py: easy_install seems to work.

- the generated bin/openerp-server.py seems to work.
- I would like to remove the data_files() call as it seems redundant with MANIFEST.in.
- Same for find_package_dirs().
- I have to check first how the build on windows work (as it includes different files than on unix).

3360. By Vo Minh Thu on 2011-02-24

[FIX] setup.py: use the new openerp module.

- python setup.py build seems to work (it produces the same result as before).
- the install seems not good: code and data are duplicated in both site-packages and dist-packages.
  (This was already true before.)
- The bin/openerp-server is not good yet.