[FIX] res.users: context_get cache was not cleared properly, due to braindead impleme...

[odoo/odoo.git] / setup.nsi

diff --git a/setup.nsi b/setup.nsi
index 1a98eb4..87a6202 100644 (file)
--- a/setup.nsi
+++ b/setup.nsi
@@ -168,6 +168,7 @@ Section OpenERP_Server SectionOpenERP_Server
     SetOutPath '$INSTDIR\server'\r
 \r
     File /r "dist\*"\r
+    File /r "win32\wkhtmltopdf\*"\r
 \r
     SetOutPath "$INSTDIR\service"\r
     File /r "win32\dist\*"\r
@@ -177,20 +178,12 @@ Section OpenERP_Server SectionOpenERP_Server
     !insertmacro MUI_STARTMENU_WRITE_BEGIN Application\r
         ;Create shortcuts\r
         CreateDirectory "$SMPROGRAMS\$STARTMENU_FOLDER"\r
-;        CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\OpenERP Server.lnk" "$INSTDIR\openerp-server.exe"\r
-;        CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\Start service.lnk" "$INSTDIR\service\start.bat"\r
-;        CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\Stop service.lnk" "$INSTDIR\service\stop.bat"\r
-;        CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\Edit config.lnk" "notepad.exe" "$INSTDIR\openerp-server.conf"\r
-;        CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\View log.lnk" "notepad.exe" "$INSTDIR\openerp-server.log"\r
-;        CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\OpenERP.lnk" "start" "http://127.0.0.1:8069/"\r
-;        CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\Uninstall.lnk" "$INSTDIR\uninstall.exe"\r
-;        !insertmacro CreateInternetShortcut "$SMPROGRAMS\$STARTMENU_FOLDER\Forum" "http://www.openerp.com/forum"\r
-;        !insertmacro CreateInternetShortcut "$SMPROGRAMS\$STARTMENU_FOLDER\Translation" "https://translations.launchpad.net/openobject"\r
         !insertmacro CreateInternetShortcut "$SMPROGRAMS\$STARTMENU_FOLDER\OpenERP" "http://localhost:8069/"\r
     !insertmacro MUI_STARTMENU_WRITE_END\r
 \r
 \r
     FileOpen $9 '$INSTDIR\install.log' w\r
+    FileWrite $9 "INSTDIR $INSTDIR$\r$\n"\r
     FileWrite $9 "Hostname $TextPostgreSQLHostname$\r$\n"\r
     FileWrite $9 "Port $TextPostgreSQLPort$\r$\n"\r
     FileWrite $9 "Username $TextPostgreSQLUsername$\r$\n"\r
@@ -214,7 +207,7 @@ Section -RestartServer
 SectionEnd\r
 \r
 Section -Post\r
-    WriteRegExpandStr HKLM "${UNINSTALL_REGISTRY_KEY}" "UninstallString" "$INSTDIR\Uninstall.exe"\r
+    WriteRegExpandStr HKLM "${UNINSTALL_REGISTRY_KEY}" "UninstallString" "$INSTDIR\server\Uninstall.exe"\r
     WriteRegExpandStr HKLM "${UNINSTALL_REGISTRY_KEY}" "InstallLocation" "$INSTDIR"\r
     WriteRegStr HKLM       "${UNINSTALL_REGISTRY_KEY}" "DisplayName" "${DISPLAY_NAME}"\r
     WriteRegStr HKLM       "${UNINSTALL_REGISTRY_KEY}" "DisplayVersion" "${VERSION}"\r
@@ -228,7 +221,7 @@ Section -Post
     WriteRegStr HKLM       "${UNINSTALL_REGISTRY_KEY}" "Contact" "sales@openerp.com"\r
     WriteRegDWORD HKLM     "${UNINSTALL_REGISTRY_KEY}" "NoModify" "1"\r
     WriteRegDWORD HKLM     "${UNINSTALL_REGISTRY_KEY}" "NoRepair" "1"\r
-    WriteUninstaller "$INSTDIR\Uninstall.exe"\r
+    WriteUninstaller "$INSTDIR\server\Uninstall.exe"\r
 SectionEnd\r
 \r
 Section "Uninstall"\r
@@ -237,22 +230,15 @@ Section "Uninstall"
     sleep 2\r
 \r
     ; Uninstall the OpenERP Service\r
-    nsExec::Exec '"$INSTDIR\service\OpenERPServerService.exe" -remove'\r
+    nsExec::Exec '"$INSTDIR\..\service\OpenERPServerService.exe" -remove'\r
     sleep 2\r
 \r
-    Rmdir /r "$INSTDIR"\r
+    Rmdir /r "$INSTDIR\service"\r
+    Rmdir /r "$INSTDIR\server"\r
 \r
     !insertmacro MUI_STARTMENU_GETFOLDER Application $MUI_TEMP\r
 \r
-    Delete "$SMPROGRAMS\$MUI_TEMP\Forum.url"\r
-    Delete "$SMPROGRAMS\$MUI_TEMP\Translation.url"\r
-    Delete "$SMPROGRAMS\$MUI_TEMP\Uninstall.lnk"\r
-    Delete "$SMPROGRAMS\$MUI_TEMP\OpenERP Server.lnk"\r
-    Delete "$SMPROGRAMS\$MUI_TEMP\Uninstall.lnk"\r
-    Delete "$SMPROGRAMS\$MUI_TEMP\Start service.lnk"\r
-    Delete "$SMPROGRAMS\$MUI_TEMP\Stop service.lnk"\r
-    Delete "$SMPROGRAMS\$MUI_TEMP\Edit config.lnk"\r
-    Delete "$SMPROGRAMS\$MUI_TEMP\View log.lnk"\r
+    Delete "$SMPROGRAMS\$MUI_TEMP\OpenERP.url"\r
     ;\r
     ;Delete empty start menu parent diretories\r
     StrCpy $MUI_TEMP "$SMPROGRAMS\$MUI_TEMP"\r