Merge branch 'master' of https://github.com/odoo/odoo

[odoo/odoo.git] / setup / win32 / setup.nsi

diff --git a/setup/win32/setup.nsi b/setup/win32/setup.nsi
index c7841e9..62f3ce8 100755 (executable)
--- a/setup/win32/setup.nsi
+++ b/setup/win32/setup.nsi
@@ -238,6 +238,10 @@ Section $(TITLE_OpenERP_Server) SectionOpenERP_Server
     File "start.bat"\r
     File "stop.bat"\r
 \r
+    SetOutPath "$INSTDIR\thirdparty"\r
+    File /r "${STATIC_PATH}\wkhtmltopdf\*"\r
+    File /r "${STATIC_PATH}\less\*"\r
+\r
 # If there is a previous install of the OpenERP Server, keep the login/password from the config file\r
     WriteIniStr "$INSTDIR\server\openerp-server.conf" "options" "db_host" $TextPostgreSQLHostname\r
     WriteIniStr "$INSTDIR\server\openerp-server.conf" "options" "db_user" $TextPostgreSQLUsername\r
@@ -245,6 +249,7 @@ Section $(TITLE_OpenERP_Server) SectionOpenERP_Server
     WriteIniStr "$INSTDIR\server\openerp-server.conf" "options" "db_port" $TextPostgreSQLPort\r
     # Fix the addons path\r
     WriteIniStr "$INSTDIR\server\openerp-server.conf" "options" "addons_path" "$INSTDIR\server\openerp\addons"\r
+    WriteIniStr "$INSTDIR\server\openerp-server.conf" "options" "bin_path" "$INSTDIR\thirdparty"\r
 \r
     # if we're going to install postgresql force it's path,\r
     # otherwise we consider it's always done and/or correctly tune by users\r
@@ -324,7 +329,7 @@ Section "Uninstall"
 \r
     Rmdir /r "$INSTDIR\server"\r
     Rmdir /r "$INSTDIR\service"\r
-\r
+    Rmdir /r "$INSTDIR\thirdparty"\r
     DeleteRegKey HKLM "${UNINSTALL_REGISTRY_KEY}"\r
 SectionEnd\r
 \r