summaryrefslogtreecommitdiff
path: root/setup.nsi
diff options
context:
space:
mode:
authorVo Minh Thu <vmt@openerp.com>2011-10-03 17:35:09 +0200
committerVo Minh Thu <vmt@openerp.com>2011-10-03 17:35:09 +0200
commitd9b6f5e2d0d0c30e4e55bc72454b6ec4b720232c (patch)
tree14eb229c961e3413abd06b6ad1a86d64d2d3a2ab /setup.nsi
parentfbb6e5e56aaf36ff652edbec0181a0fcb95a3601 (diff)
parentbf3d0d604c89edfd709603c8ca261d020e9ac748 (diff)
[MERGE] merged trunk.
bzr revid: vmt@openerp.com-20111003153509-8mbfg1t8hm92pult
Diffstat (limited to 'setup.nsi')
-rw-r--r--setup.nsi1
1 files changed, 1 insertions, 0 deletions
diff --git a/setup.nsi b/setup.nsi
index f9c962ae383..0ea37b0f9e6 100644
--- a/setup.nsi
+++ b/setup.nsi
@@ -210,6 +210,7 @@ Section OpenERP_Server SectionOpenERP_Server
WriteIniStr "$INSTDIR\openerp-server.conf" "options" "db_user" $TextPostgreSQLUsername
WriteIniStr "$INSTDIR\openerp-server.conf" "options" "db_password" $TextPostgreSQLPassword
WriteIniStr "$INSTDIR\openerp-server.conf" "options" "db_port" $TextPostgreSQLPort
+ WriteIniStr "$INSTDIR\openerp-server.conf" "options" "pg_path" "$INSTDIR\PostgreSQL\bin"
nsExec::Exec '"$INSTDIR\openerp-server.exe" --stop-after-init --logfile "$INSTDIR\openerp-server.log" -s'
nsExec::Exec '"$INSTDIR\service\OpenERPServerService.exe" -auto -install'