[FIX] windows packaging: postgresql and the server are side-by-side.

bzr revid: vmt@openerp.com-20111220164229-y8fkc6drtxuq3lbr

diff --git a/setup.nsi b/setup.nsi
index 185a87c..7979b8a 100644 (file)
--- a/setup.nsi
+++ b/setup.nsi
@@ -58,7 +58,7 @@ ShowInstDetails show
 \r
 XPStyle on\r
 \r
-InstallDir "$PROGRAMFILES\OpenERP ${VERSION}\Server"\r
+InstallDir "$PROGRAMFILES\OpenERP ${VERSION}"\r
 InstallDirRegKey HKCU "${REGISTRY_KEY}" ""\r
 \r
 BrandingText '${PRODUCT_NAME} ${VERSION}'\r
@@ -165,7 +165,7 @@ Section -StopService
 SectionEnd\r
 \r
 Section OpenERP_Server SectionOpenERP_Server\r
-    SetOutPath '$INSTDIR'\r
+    SetOutPath '$INSTDIR\server'\r
 \r
     File /r "dist\*"\r
 \r
@@ -198,13 +198,13 @@ Section OpenERP_Server SectionOpenERP_Server
     FileClose $9\r
 \r
 # If there is a previous install of the OpenERP Server, keep the login/password from the config file\r
-    WriteIniStr "$INSTDIR\openerp-server.conf" "options" "db_host" $TextPostgreSQLHostname\r
-    WriteIniStr "$INSTDIR\openerp-server.conf" "options" "db_user" $TextPostgreSQLUsername\r
-    WriteIniStr "$INSTDIR\openerp-server.conf" "options" "db_password" $TextPostgreSQLPassword\r
-    WriteIniStr "$INSTDIR\openerp-server.conf" "options" "db_port" $TextPostgreSQLPort\r
-    WriteIniStr "$INSTDIR\openerp-server.conf" "options" "pg_path" "$INSTDIR\PostgreSQL\bin"\r
+    WriteIniStr "$INSTDIR\server\openerp-server.conf" "options" "db_host" $TextPostgreSQLHostname\r
+    WriteIniStr "$INSTDIR\server\openerp-server.conf" "options" "db_user" $TextPostgreSQLUsername\r
+    WriteIniStr "$INSTDIR\server\openerp-server.conf" "options" "db_password" $TextPostgreSQLPassword\r
+    WriteIniStr "$INSTDIR\server\openerp-server.conf" "options" "db_port" $TextPostgreSQLPort\r
+    WriteIniStr "$INSTDIR\server\openerp-server.conf" "options" "pg_path" "$INSTDIR\PostgreSQL\bin"\r
 \r
-    nsExec::Exec '"$INSTDIR\openerp-server.exe" --stop-after-init --logfile "$INSTDIR\openerp-server.log" -s'\r
+    nsExec::Exec '"$INSTDIR\server\openerp-server.exe" --stop-after-init --logfile "$INSTDIR\server\openerp-server.log" -s'\r
     nsExec::Exec '"$INSTDIR\service\OpenERPServerService.exe" -auto -install'\r
 SectionEnd\r
 \r