summaryrefslogtreecommitdiff
path: root/setup/win32
diff options
context:
space:
mode:
authorSimon Lejeune <sle@openerp.com>2016-09-16 13:44:02 +0200
committerSimon Lejeune <sle@openerp.com>2016-09-30 12:05:48 +0200
commiteb501081c55f2ed16a335d3f7f33ca2f2adf9d50 (patch)
treeec54443e7df701b4aea1a4a6c4e001681a1bec75 /setup/win32
parentba5258adb8b7f19e26d5d120c78d0ef9b92dd6f5 (diff)
[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".
Diffstat (limited to 'setup/win32')
-rwxr-xr-xsetup/win32/setup.nsi2
-rw-r--r--setup/win32/win32_service.py2
-rw-r--r--setup/win32/win32_setup.py2
3 files changed, 3 insertions, 3 deletions
diff --git a/setup/win32/setup.nsi b/setup/win32/setup.nsi
index 67b1551ff9c..398fc9b265e 100755
--- a/setup/win32/setup.nsi
+++ b/setup/win32/setup.nsi
@@ -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,
diff --git a/setup/win32/win32_service.py b/setup/win32/win32_service.py
index fcc6b897059..5da2083323a 100644
--- a/setup/win32/win32_service.py
+++ b/setup/win32/win32_service.py
@@ -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):
diff --git a/setup/win32/win32_setup.py b/setup/win32/win32_setup.py
index dcebaf3630f..d973f90674a 100644
--- a/setup/win32/win32_setup.py
+++ b/setup/win32/win32_setup.py
@@ -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():