Skip to content
Snippets Groups Projects
Commit 2d5fc151 authored by Simon Lejeune's avatar Simon Lejeune
Browse files

[REF] cli: rename odoo.py to setup_dev.py

and move it under the setup package. Since the rename of the
openerp directory into odoo, having a script named "odoo.py"
conflicts with a package named "odoo".
parent ea3d9e69
No related branches found
No related tags found
No related merge requests found
...@@ -32,7 +32,7 @@ from the documentation. ...@@ -32,7 +32,7 @@ from the documentation.
If you are a developer you may type the following command at your terminal: If you are a developer you may type the following command at your terminal:
wget -O- https://raw.githubusercontent.com/odoo/odoo/9.0/odoo.py | python wget -O- https://raw.githubusercontent.com/odoo/odoo/10.0/setup/setup_dev.py | python
Then follow <a href="https://www.odoo.com/documentation/9.0/tutorials.html">the developer tutorials</a> Then follow <a href="https://www.odoo.com/documentation/9.0/tutorials.html">the developer tutorials</a>
......
...@@ -46,7 +46,7 @@ class Shell(Command): ...@@ -46,7 +46,7 @@ class Shell(Command):
exec sys.stdin in local_vars exec sys.stdin in local_vars
else: else:
if 'env' not in local_vars: if 'env' not in local_vars:
print 'No environment set, use `odoo.py shell -d dbname` to get one.' print 'No environment set, use `%s shell -d dbname` to get one.' % sys.argv[0]
for i in sorted(local_vars): for i in sorted(local_vars):
print '%s: %s' % (i, local_vars[i]) print '%s: %s' % (i, local_vars[i])
......
...@@ -45,7 +45,7 @@ def _get_default_datadir(): ...@@ -45,7 +45,7 @@ def _get_default_datadir():
def _deduplicate_loggers(loggers): def _deduplicate_loggers(loggers):
""" Avoid saving multiple logging levels for the same loggers to a save """ Avoid saving multiple logging levels for the same loggers to a save
file, that just takes space and the list can potentially grow unbounded file, that just takes space and the list can potentially grow unbounded
if for some odd reason people use :option`odoo.py --save`` all the time. if for some odd reason people use :option`--save`` all the time.
""" """
# dict(iterable) -> the last item of iterable for any given key wins, # dict(iterable) -> the last item of iterable for any given key wins,
# which is what we want and expect. Output order should not matter as # which is what we want and expect. Output order should not matter as
......
...@@ -57,7 +57,6 @@ def py2exe_options(): ...@@ -57,7 +57,6 @@ def py2exe_options():
import py2exe import py2exe
return { return {
'console': [ 'console': [
{'script': 'odoo.py'},
{'script': 'openerp-server', 'icon_resources': [ {'script': 'openerp-server', 'icon_resources': [
(1, join('setup', 'win32', 'static', 'pixmaps', 'openerp-icon.ico')) (1, join('setup', 'win32', 'static', 'pixmaps', 'openerp-icon.ico'))
]}, ]},
...@@ -129,7 +128,7 @@ setup( ...@@ -129,7 +128,7 @@ setup(
author_email=author_email, author_email=author_email,
classifiers=filter(None, classifiers.split('\n')), classifiers=filter(None, classifiers.split('\n')),
license=license, license=license,
scripts=['openerp-server', 'odoo.py'], scripts=['openerp-server'],
packages=find_packages(), packages=find_packages(),
package_dir={'%s' % lib_name: 'odoo'}, package_dir={'%s' % lib_name: 'odoo'},
include_package_data=True, include_package_data=True,
......
File moved
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment