summaryrefslogtreecommitdiff
path: root/setup
diff options
context:
space:
mode:
authorSimon Lejeune <sle@openerp.com>2014-11-21 17:38:50 +0100
committerSimon Lejeune <sle@openerp.com>2014-11-21 18:08:12 +0100
commitf76d4525a3295c31f830956f02c65556c5ffc7d0 (patch)
tree580b4e265cd15231f3357f6ac6ded1221c2f803d /setup
parentd804ba36a8f896161a3c27ace561189e718653c5 (diff)
[ADD] tools: handling of bin_path key in find_in_path
The openerp-server.conf now generates the bin_path record, in order to resolve calls to external binaries served in the thirdparty dir. Adpated report.py to use find_in_path and not directly which.
Diffstat (limited to 'setup')
-rwxr-xr-xsetup/win32/setup.nsi1
1 files changed, 1 insertions, 0 deletions
diff --git a/setup/win32/setup.nsi b/setup/win32/setup.nsi
index 73def65df59..992f9215f95 100755
--- a/setup/win32/setup.nsi
+++ b/setup/win32/setup.nsi
@@ -249,6 +249,7 @@ Section $(TITLE_OpenERP_Server) SectionOpenERP_Server
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" "bin_path" "$INSTDIR\thirdparty"
# if we're going to install postgresql force it's path,
# otherwise we consider it's always done and/or correctly tune by users