Skip to content

Commit eb50108

Browse files
sle-odoosle-odoo
committed
[REF] packaging: openerp has been renamed odoo
Fix the various place when the rename of the git root directory broke the packaging script. Also, we can now name the library "odoo".
1 parent ba5258a commit eb50108

8 files changed

+51
-51
lines changed

‎MANIFEST.in

+35-35
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,40 @@
11
include requirements.txt
22
include LICENSE
33
include README.md
4-
recursive-include openerp *.css
5-
recursive-include openerp *.csv
6-
recursive-include openerp *.doc
7-
recursive-include openerp *.eml
8-
recursive-include openerp *.eot
9-
recursive-include openerp *.gif
10-
recursive-include openerp *.html
11-
recursive-include openerp *.ico
12-
recursive-include openerp *.jpeg
13-
recursive-include openerp *.jpg
14-
recursive-include openerp *.js
15-
recursive-include openerp *.less
16-
recursive-include openerp *.md
17-
recursive-include openerp *.mp3
18-
recursive-include openerp *.ogg
19-
recursive-include openerp *.otf
20-
recursive-include openerp *.pdf
21-
recursive-include openerp *.png
22-
recursive-include openerp *.po
23-
recursive-include openerp *.rml
24-
recursive-include openerp *.rng
25-
recursive-include openerp *.rst
26-
recursive-include openerp *.sass
27-
recursive-include openerp *.sql
28-
recursive-include openerp *.svg
29-
recursive-include openerp *.template
30-
recursive-include openerp *.txt
31-
recursive-include openerp *.ttf
32-
recursive-include openerp *.woff
33-
recursive-include openerp *.woff2
34-
recursive-include openerp *.wsdl
35-
recursive-include openerp *.xsd
36-
recursive-include openerp *.xsl
37-
recursive-include openerp *.xml
38-
recursive-include openerp *.yml
4+
recursive-include odoo *.css
5+
recursive-include odoo *.csv
6+
recursive-include odoo *.doc
7+
recursive-include odoo *.eml
8+
recursive-include odoo *.eot
9+
recursive-include odoo *.gif
10+
recursive-include odoo *.html
11+
recursive-include odoo *.ico
12+
recursive-include odoo *.jpeg
13+
recursive-include odoo *.jpg
14+
recursive-include odoo *.js
15+
recursive-include odoo *.less
16+
recursive-include odoo *.md
17+
recursive-include odoo *.mp3
18+
recursive-include odoo *.ogg
19+
recursive-include odoo *.otf
20+
recursive-include odoo *.pdf
21+
recursive-include odoo *.png
22+
recursive-include odoo *.po
23+
recursive-include odoo *.rml
24+
recursive-include odoo *.rng
25+
recursive-include odoo *.rst
26+
recursive-include odoo *.sass
27+
recursive-include odoo *.sql
28+
recursive-include odoo *.svg
29+
recursive-include odoo *.template
30+
recursive-include odoo *.txt
31+
recursive-include odoo *.ttf
32+
recursive-include odoo *.woff
33+
recursive-include odoo *.woff2
34+
recursive-include odoo *.wsdl
35+
recursive-include odoo *.xsd
36+
recursive-include odoo *.xsl
37+
recursive-include odoo *.xml
38+
recursive-include odoo *.yml
3939
recursive-exclude * *.py[co]
4040
recursive-exclude * *.hg*

‎debian/openerp-server.conf

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ db_host = False
55
db_port = False
66
db_user = odoo
77
db_password = False
8-
addons_path = /usr/lib/python2.7/dist-packages/openerp/addons
8+
addons_path = /usr/lib/python2.7/dist-packages/odoo/addons

‎setup.py

+5-5
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@
88
from os.path import join, dirname
99

1010

11-
execfile(join(dirname(__file__), 'openerp', 'release.py')) # Load release variables
12-
lib_name = 'openerp'
11+
execfile(join(dirname(__file__), 'odoo', 'release.py')) # Load release variables
12+
lib_name = 'odoo'
1313

1414

1515
def py2exe_datafiles():
1616
data_files = {}
1717
data_files['Microsoft.VC90.CRT'] = glob('C:\Microsoft.VC90.CRT\*.*')
1818

19-
for root, dirnames, filenames in os.walk('openerp'):
19+
for root, dirnames, filenames in os.walk('odoo'):
2020
for filename in filenames:
2121
if not re.match(r'.*(\.pyc|\.pyo|\~)$', filename):
2222
data_files.setdefault(root, []).append(join(root, filename))
@@ -84,7 +84,7 @@ def py2exe_options():
8484
'markupsafe',
8585
'mock',
8686
'ofxparse',
87-
'openerp',
87+
'odoo',
8888
'openid',
8989
'passlib',
9090
'PIL',
@@ -131,7 +131,7 @@ def py2exe_options():
131131
license=license,
132132
scripts=['openerp-server', 'odoo.py'],
133133
packages=find_packages(),
134-
package_dir={'%s' % lib_name: 'openerp'},
134+
package_dir={'%s' % lib_name: 'odoo'},
135135
include_package_data=True,
136136
install_requires=[
137137
'babel >= 1.0',

‎setup/package.py

+6-6
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
#----------------------------------------------------------
2222
# Utils
2323
#----------------------------------------------------------
24-
execfile(join(dirname(__file__), '..', 'openerp', 'release.py'))
24+
execfile(join(dirname(__file__), '..', 'odoo', 'release.py'))
2525
version = version.split('-')[0]
2626
timestamp = time.strftime("%Y%m%d", time.gmtime())
2727
GPGPASSPHRASE = os.getenv('GPGPASSPHRASE')
@@ -231,9 +231,9 @@ def _prepare_build_dir(o, win32=False):
231231
try:
232232
for addon_path in glob(join(o.build_dir, 'addons/*')):
233233
if addon_path.split(os.path.sep)[-1] not in ADDONS_NOT_TO_PUBLISH:
234-
shutil.move(addon_path, join(o.build_dir, 'openerp/addons'))
234+
shutil.move(addon_path, join(o.build_dir, 'odoo/addons'))
235235
except shutil.Error:
236-
# Thrown when the add-on is already in openerp/addons (if _prepare_build_dir
236+
# Thrown when the add-on is already in odoo/addons (if _prepare_build_dir
237237
# has already been called once)
238238
pass
239239

@@ -306,8 +306,8 @@ def test_tgz(o):
306306
wheezy.system('su postgres -s /bin/bash -c "createdb mycompany"')
307307
wheezy.system('mkdir /var/lib/odoo')
308308
wheezy.system('chown odoo:odoo /var/lib/odoo')
309-
wheezy.system('su odoo -s /bin/bash -c "odoo.py --addons-path=/usr/local/lib/python2.7/dist-packages/openerp/addons -d mycompany -i base --stop-after-init"')
310-
wheezy.system('su odoo -s /bin/bash -c "odoo.py --addons-path=/usr/local/lib/python2.7/dist-packages/openerp/addons -d mycompany &"')
309+
wheezy.system('su odoo -s /bin/bash -c "odoo.py --addons-path=/usr/local/lib/python2.7/dist-packages/odoo/addons -d mycompany -i base --stop-after-init"')
310+
wheezy.system('su odoo -s /bin/bash -c "odoo.py --addons-path=/usr/local/lib/python2.7/dist-packages/odoo/addons -d mycompany &"')
311311

312312
def test_deb(o):
313313
with docker('odoo-%s-debian-nightly-tests' % version, o.build_dir, o.pub) as wheezy:
@@ -420,7 +420,7 @@ def options():
420420
o.pkg = join(o.build_dir, 'pkg')
421421
o.version_full = '%s-%s' % (o.version, timestamp)
422422
o.work = join(o.build_dir, 'openerp-%s' % o.version_full)
423-
o.work_addons = join(o.work, 'openerp', 'addons')
423+
o.work_addons = join(o.work, 'odoo', 'addons')
424424

425425
return o
426426

‎setup/redhat/postinstall.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ db_host = False
2727
db_port = False
2828
db_user = $ODOO_USER
2929
db_password = False
30-
addons_path = /usr/lib/python2.7/site-packages/openerp/addons
30+
addons_path = /usr/lib/python2.7/site-packages/odoo/addons
3131
" > $ODOO_CONFIGURATION_FILE
3232
chown $ODOO_USER:$ODOO_GROUP $ODOO_CONFIGURATION_FILE
3333
chmod 0640 $ODOO_CONFIGURATION_FILE

‎setup/win32/setup.nsi

+1-1
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ Section $(TITLE_OpenERP_Server) SectionOpenERP_Server
224224
WriteIniStr "$INSTDIR\server\openerp-server.conf" "options" "db_password" $TextPostgreSQLPassword
225225
WriteIniStr "$INSTDIR\server\openerp-server.conf" "options" "db_port" $TextPostgreSQLPort
226226
# Fix the addons path
227-
WriteIniStr "$INSTDIR\server\openerp-server.conf" "options" "addons_path" "$INSTDIR\server\openerp\addons"
227+
WriteIniStr "$INSTDIR\server\openerp-server.conf" "options" "addons_path" "$INSTDIR\server\odoo\addons"
228228
WriteIniStr "$INSTDIR\server\openerp-server.conf" "options" "bin_path" "$INSTDIR\thirdparty"
229229

230230
# if we're going to install postgresql force it's path,

‎setup/win32/win32_service.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
from os.path import dirname, join, split
1212

1313

14-
execfile(join(dirname(__file__), '..', 'server', 'openerp', 'release.py'))
14+
execfile(join(dirname(__file__), '..', 'server', 'odoo', 'release.py'))
1515

1616

1717
class OdooService(win32serviceutil.ServiceFramework):

‎setup/win32/win32_setup.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
from distutils.core import setup
77

88

9-
execfile(os.path.join(os.path.dirname(__file__), '..', '..', 'openerp', 'release.py'))
9+
execfile(os.path.join(os.path.dirname(__file__), '..', '..', 'odoo', 'release.py'))
1010

1111

1212
def generate_files():

0 commit comments

Comments
 (0)