pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[REF] packaging: openerp has been renamed odoo

Browse Source 
Fix the various place when the rename of the git root directory
broke the packaging script. Also, we can now name the library
"odoo".
This commit is contained in:
Simon Lejeune
2016-09-30 12:05:48 +02:00
parent ba5258adb8
commit eb501081c5
8 changed files with 51 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MANIFEST.in
+35 -35
View File
@@ -1,40 +1,40 @@
include requirements.txt
include LICENSE
include README.md
recursive-include openerp *.css
recursive-include openerp *.csv
recursive-include openerp *.doc
recursive-include openerp *.eml
recursive-include openerp *.eot
recursive-include openerp *.gif
recursive-include openerp *.html
recursive-include openerp *.ico
recursive-include openerp *.jpeg
recursive-include openerp *.jpg
recursive-include openerp *.js
recursive-include openerp *.less
recursive-include openerp *.md
recursive-include openerp *.mp3
recursive-include openerp *.ogg
recursive-include openerp *.otf
recursive-include openerp *.pdf
recursive-include openerp *.png
recursive-include openerp *.po
recursive-include openerp *.rml
recursive-include openerp *.rng
recursive-include openerp *.rst
recursive-include openerp *.sass
recursive-include openerp *.sql
recursive-include openerp *.svg
recursive-include openerp *.template
recursive-include openerp *.txt
recursive-include openerp *.ttf
recursive-include openerp *.woff
recursive-include openerp *.woff2
recursive-include openerp *.wsdl
recursive-include openerp *.xsd
recursive-include openerp *.xsl
recursive-include openerp *.xml
recursive-include openerp *.yml
recursive-include odoo *.css
recursive-include odoo *.csv
recursive-include odoo *.doc
recursive-include odoo *.eml
recursive-include odoo *.eot
recursive-include odoo *.gif
recursive-include odoo *.html
recursive-include odoo *.ico
recursive-include odoo *.jpeg
recursive-include odoo *.jpg
recursive-include odoo *.js
recursive-include odoo *.less
recursive-include odoo *.md
recursive-include odoo *.mp3
recursive-include odoo *.ogg
recursive-include odoo *.otf
recursive-include odoo *.pdf
recursive-include odoo *.png
recursive-include odoo *.po
recursive-include odoo *.rml
recursive-include odoo *.rng
recursive-include odoo *.rst
recursive-include odoo *.sass
recursive-include odoo *.sql
recursive-include odoo *.svg
recursive-include odoo *.template
recursive-include odoo *.txt
recursive-include odoo *.ttf
recursive-include odoo *.woff
recursive-include odoo *.woff2
recursive-include odoo *.wsdl
recursive-include odoo *.xsd
recursive-include odoo *.xsl
recursive-include odoo *.xml
recursive-include odoo *.yml
recursive-exclude * *.py[co]
recursive-exclude * *.hg*
debian/openerp-server.conf
Vendored
+1 -1
View File
@@ -5,4 +5,4 @@ db_host = False
db_port = False
db_user = odoo
db_password = False
addons_path = /usr/lib/python2.7/dist-packages/openerp/addons
addons_path = /usr/lib/python2.7/dist-packages/odoo/addons
setup.py
+5 -5
View File
@@ -8,15 +8,15 @@ from setuptools import find_packages, setup
from os.path import join, dirname
execfile(join(dirname(__file__), 'openerp', 'release.py')) # Load release variables
lib_name = 'openerp'
execfile(join(dirname(__file__), 'odoo', 'release.py')) # Load release variables
lib_name = 'odoo'
def py2exe_datafiles():
data_files = {}
data_files['Microsoft.VC90.CRT'] = glob('C:\Microsoft.VC90.CRT\*.*')
for root, dirnames, filenames in os.walk('openerp'):
for root, dirnames, filenames in os.walk('odoo'):
for filename in filenames:
if not re.match(r'.*(\.pyc|\.pyo|\~)$', filename):
data_files.setdefault(root, []).append(join(root, filename))
@@ -84,7 +84,7 @@ def py2exe_options():
'markupsafe',
'mock',
'ofxparse',
'openerp',
'odoo',
'openid',
'passlib',
'PIL',
@@ -131,7 +131,7 @@ setup(
license=license,
scripts=['openerp-server', 'odoo.py'],
packages=find_packages(),
package_dir={'%s' % lib_name: 'openerp'},
package_dir={'%s' % lib_name: 'odoo'},
include_package_data=True,
install_requires=[
'babel >= 1.0',
setup/package.py
+6 -6
View File
@@ -21,7 +21,7 @@ from tempfile import NamedTemporaryFile
#----------------------------------------------------------
# Utils
#----------------------------------------------------------
execfile(join(dirname(__file__), '..', 'openerp', 'release.py'))
execfile(join(dirname(__file__), '..', 'odoo', 'release.py'))
version = version.split('-')[0]
timestamp = time.strftime("%Y%m%d", time.gmtime())
GPGPASSPHRASE = os.getenv('GPGPASSPHRASE')
@@ -231,9 +231,9 @@ def _prepare_build_dir(o, win32=False):
try:
for addon_path in glob(join(o.build_dir, 'addons/*')):
if addon_path.split(os.path.sep)[-1] not in ADDONS_NOT_TO_PUBLISH:
shutil.move(addon_path, join(o.build_dir, 'openerp/addons'))
shutil.move(addon_path, join(o.build_dir, 'odoo/addons'))
except shutil.Error:
# Thrown when the add-on is already in openerp/addons (if _prepare_build_dir
# Thrown when the add-on is already in odoo/addons (if _prepare_build_dir
# has already been called once)
pass
@@ -306,8 +306,8 @@ def test_tgz(o):
wheezy.system('su postgres -s /bin/bash -c "createdb mycompany"')
wheezy.system('mkdir /var/lib/odoo')
wheezy.system('chown odoo:odoo /var/lib/odoo')
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"')
wheezy.system('su odoo -s /bin/bash -c "odoo.py --addons-path=/usr/local/lib/python2.7/dist-packages/openerp/addons -d mycompany &"')
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"')
wheezy.system('su odoo -s /bin/bash -c "odoo.py --addons-path=/usr/local/lib/python2.7/dist-packages/odoo/addons -d mycompany &"')
def test_deb(o):
with docker('odoo-%s-debian-nightly-tests' % version, o.build_dir, o.pub) as wheezy:
@@ -420,7 +420,7 @@ def options():
o.pkg = join(o.build_dir, 'pkg')
o.version_full = '%s-%s' % (o.version, timestamp)
o.work = join(o.build_dir, 'openerp-%s' % o.version_full)
o.work_addons = join(o.work, 'openerp', 'addons')
o.work_addons = join(o.work, 'odoo', 'addons')
return o
setup/redhat/postinstall.sh
+1 -1
View File
@@ -27,7 +27,7 @@ db_host = False
db_port = False
db_user = $ODOO_USER
db_password = False
addons_path = /usr/lib/python2.7/site-packages/openerp/addons
addons_path = /usr/lib/python2.7/site-packages/odoo/addons
" > $ODOO_CONFIGURATION_FILE
chown $ODOO_USER:$ODOO_GROUP $ODOO_CONFIGURATION_FILE
chmod 0640 $ODOO_CONFIGURATION_FILE
setup/win32/setup.nsi
+1 -1
View File
@@ -224,7 +224,7 @@ Section $(TITLE_OpenERP_Server) SectionOpenERP_Server
WriteIniStr "$INSTDIR\server\openerp-server.conf" "options" "db_password" $TextPostgreSQLPassword
WriteIniStr "$INSTDIR\server\openerp-server.conf" "options" "db_port" $TextPostgreSQLPort
# Fix the addons path
WriteIniStr "$INSTDIR\server\openerp-server.conf" "options" "addons_path" "$INSTDIR\server\openerp\addons"
WriteIniStr "$INSTDIR\server\openerp-server.conf" "options" "addons_path" "$INSTDIR\server\odoo\addons"
WriteIniStr "$INSTDIR\server\openerp-server.conf" "options" "bin_path" "$INSTDIR\thirdparty"
# if we're going to install postgresql force it's path,
setup/win32/win32_service.py
+1 -1
View File
@@ -11,7 +11,7 @@ import sys
from os.path import dirname, join, split
execfile(join(dirname(__file__), '..', 'server', 'openerp', 'release.py'))
execfile(join(dirname(__file__), '..', 'server', 'odoo', 'release.py'))
class OdooService(win32serviceutil.ServiceFramework):
setup/win32/win32_setup.py
+1 -1
View File
@@ -6,7 +6,7 @@ import py2exe
from distutils.core import setup
execfile(os.path.join(os.path.dirname(__file__), '..', '..', 'openerp', 'release.py'))
execfile(os.path.join(os.path.dirname(__file__), '..', '..', 'odoo', 'release.py'))
def generate_files():