Odoo Server (MOVED TO GITHUB)

Merge lp:~openerp-dev/openobject-server/trunk-bug-723424-gpa into lp:openobject-server

  1. trunk-bug-723424-gpa
  2. Merge into trunk
Proposed by gpa(OpenERP)
Status: Merged
Merged at revision: 3623
Proposed branch: lp:~openerp-dev/openobject-server/trunk-bug-723424-gpa
Merge into: lp:openobject-server
Diff against target: 11 lines (+1/-0)
1 file modified
setup.nsi (+1/-0)
To merge this branch: bzr merge lp:~openerp-dev/openobject-server/trunk-bug-723424-gpa
Reviewer Review Type Date Requested Status
Olivier Dony (Odoo) Approve
Naresh(OpenERP) (community) Approve
Review via email: mp+71205@code.launchpad.net

This proposal supersedes a proposal from 2011-08-11.

Description of the change

Improvement

To post a comment you must log in.
Revision history for this message
Naresh(OpenERP) (nch-openerp) :
review: Approve
Revision history for this message
Olivier Dony (Odoo) (odo-openerp) wrote :

Thanks, merging it!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'setup.nsi'
2--- setup.nsi 2011-03-22 14:08:41 +0000
3+++ setup.nsi 2011-08-11 13:33:48 +0000
4@@ -210,6 +210,7 @@
5 WriteIniStr "$INSTDIR\openerp-server.conf" "options" "db_user" $TextPostgreSQLUsername
6 WriteIniStr "$INSTDIR\openerp-server.conf" "options" "db_password" $TextPostgreSQLPassword
7 WriteIniStr "$INSTDIR\openerp-server.conf" "options" "db_port" $TextPostgreSQLPort
8+ WriteIniStr "$INSTDIR\openerp-server.conf" "options" "pg_path" "$INSTDIR\PostgreSQL\bin"
9
10 nsExec::Exec '"$INSTDIR\openerp-server.exe" --stop-after-init --logfile "$INSTDIR\openerp-server.log" -s'
11 nsExec::Exec '"$INSTDIR\service\OpenERPServerService.exe" -auto -install'