projects
/
odoo
/
odoo.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[FIX] stock: packages menuitem hidden by the right group. sale_stock: fixed bug ...
[odoo/odoo.git]
/
setup.nsi
diff --git
a/setup.nsi
b/setup.nsi
index
e23cf46
..
653a879
100644
(file)
--- a/
setup.nsi
+++ b/
setup.nsi
@@
-160,7
+160,7
@@
LangString DESC_PostgreSQL_Username ${LANG_FRENCH} "Utilisateur"
LangString DESC_PostgreSQL_Password ${LANG_FRENCH} "Mot de passe"
\r
\r
Section -StopService
\r
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
sleep 2
\r
SectionEnd
\r
\r
@@
-168,6
+168,7
@@
Section OpenERP_Server SectionOpenERP_Server
SetOutPath '$INSTDIR\server'
\r
\r
File /r "dist\*"
\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
\r
SetOutPath "$INSTDIR\service"
\r
File /r "win32\dist\*"
\r
@@
-201,7
+202,7
@@
Section OpenERP_Server SectionOpenERP_Server
SectionEnd
\r
\r
Section -RestartServer
\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
sleep 2
\r
SectionEnd
\r
\r
@@
-225,7
+226,7
@@
SectionEnd
\r
Section "Uninstall"
\r
; Stop the NT Service
\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
sleep 2
\r
\r
; Uninstall the OpenERP Service
\r
@@
-290,9
+291,10
@@
Function .onInit
!insertmacro MUI_LANGDLL_DISPLAY
\r
\r
ClearErrors
\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
IfErrors DoInstallPostgreSQL 0
\r
- StrCpy $HasPostgreSQL 1
\r
+ StrCmp $0 "" DoInstallPostgreSQL
\r
+ StrCpy $HasPostgreSQL 1
\r
\r
DoInstallPostgreSQL:
\r
FunctionEnd
\r
\r
DoInstallPostgreSQL:
\r
FunctionEnd
\r