LangString DESC_PostgreSQL_Password ${LANG_FRENCH} "Mot de passe"\r
\r
Section -StopService\r
- nsExec::Exec "net stop openerp-server-6.1"\r
+ nsExec::Exec "net stop openerp-server-7.0"\r
sleep 2\r
SectionEnd\r
\r
SetOutPath '$INSTDIR\server'\r
\r
File /r "dist\*"\r
+ File /r "win32\wkhtmltopdf\*"\r
\r
SetOutPath "$INSTDIR\service"\r
File /r "win32\dist\*"\r
SectionEnd\r
\r
Section -RestartServer\r
- nsExec::Exec "net start openerp-server-6.1"\r
+ nsExec::Exec "net start openerp-server-7.0"\r
sleep 2\r
SectionEnd\r
\r
\r
Section "Uninstall"\r
; Stop the NT Service\r
- nsExec::Exec "net stop openerp-server-6.1"\r
+ nsExec::Exec "net stop openerp-server-7.0"\r
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\service"\r
!insertmacro MUI_LANGDLL_DISPLAY\r
\r
ClearErrors\r
- EnumRegKey $0 HKLM "SOFTWARE\PostgreSQL" 0\r
+ EnumRegKey $0 HKLM "SOFTWARE\PostgreSQL\Installations" 0\r
IfErrors DoInstallPostgreSQL 0\r
- StrCpy $HasPostgreSQL 1\r
+ StrCmp $0 "" DoInstallPostgreSQL\r
+ StrCpy $HasPostgreSQL 1\r
\r
DoInstallPostgreSQL:\r
FunctionEnd\r