\r
!define PUBLISHER 'OpenERP S.A.'\r
\r
-!ifndef MAJOR_VERSION\r
- !define MAJOR_VERSION '6'\r
-!endif\r
-!ifndef MINOR_VERSION\r
- !define MINOR_VERSION '0'\r
-!endif\r
-!ifndef REVISION_VERSION\r
- !define REVISION_VERSION '0'\r
-!endif\r
-!ifndef BUILD_VERSION\r
- !define VERSION "${MAJOR_VERSION}.${MINOR_VERSION}.${REVISION_VERSION}"\r
-!else\r
- !define VERSION "${MAJOR_VERSION}.${MINOR_VERSION}.${REVISION_VERSION}-${BUILD_VERSION}"\r
+!ifndef VERSION\r
+ !define VERSION '0'\r
!endif\r
+#!define VERSION "${MAJOR_VERSION}.${MINOR_VERSION}.${REVISION_VERSION}"\r
\r
!define PRODUCT_NAME "OpenERP Server"\r
-!define DISPLAY_NAME "${PRODUCT_NAME} ${MAJOR_VERSION}.${MINOR_VERSION}"\r
+!define DISPLAY_NAME "${PRODUCT_NAME} ${VERSION}"\r
\r
!define UNINSTALL_REGISTRY_ROOT HKLM\r
!define UNINSTALL_REGISTRY_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${DISPLAY_NAME}"\r
\r
XPStyle on\r
\r
-InstallDir "$PROGRAMFILES\OpenERP ${MAJOR_VERSION}.${MINOR_VERSION}\Server"\r
+InstallDir "$PROGRAMFILES\OpenERP ${VERSION}"\r
InstallDirRegKey HKCU "${REGISTRY_KEY}" ""\r
\r
BrandingText '${PRODUCT_NAME} ${VERSION}'\r
Var STARTMENU_FOLDER\r
\r
!define MUI_ABORTWARNING\r
-!define MUI_ICON ".\pixmaps\openerp-icon.ico"\r
+!define MUI_ICON ".\install\openerp-icon.ico"\r
\r
-!define MUI_WELCOMEFINISHPAGE_BITMAP ".\pixmaps\openerp-intro.bmp"\r
-!define MUI_UNWELCOMEFINISHPAGE_BITMAP ".\pixmaps\openerp-intro.bmp"\r
+!define MUI_WELCOMEFINISHPAGE_BITMAP ".\install\openerp-intro.bmp"\r
+!define MUI_UNWELCOMEFINISHPAGE_BITMAP ".\install\openerp-intro.bmp"\r
!define MUI_HEADERIMAGE\r
-!define MUI_HEADERIMAGE_BITMAP ".\pixmaps\openerp-slogan.bmp"\r
+!define MUI_HEADERIMAGE_BITMAP ".\install\openerp-slogan.bmp"\r
!define MUI_HEADERIMAGE_BITMAP_NOSTRETCH\r
!define MUI_HEADER_TRANSPARENT_TEXT ""\r
\r
LangString WARNING_HostNameIsEmpty ${LANG_FRENCH} "L'adresse pour la connection au serveur PostgreSQL est vide"\r
LangString WARNING_UserNameIsEmpty ${LANG_FRENCH} "Le nom d'utilisateur pour la connection au serveur PostgreSQL est vide"\r
LangString WARNING_PasswordIsEmpty ${LANG_FRENCH} "Le mot de passe pour la connection au serveur PostgreSQL est vide"\r
-LangString WARNING_PortIsWrong ${LANG_FRENCH} "Le port pour la connection au serveur PostgreSQL est erroné (défaut: 5432)"\r
+LangString WARNING_PortIsWrong ${LANG_FRENCH} "Le port pour la connection au serveur PostgreSQL est erron? (d?faut: 5432)"\r
LangString DESC_PostgreSQLPage ${LANG_FRENCH} "Configurez les informations de connection pour le serveur PostgreSQL"\r
-LangString DESC_PostgreSQL_Hostname ${LANG_FRENCH} "Hôte"\r
+LangString DESC_PostgreSQL_Hostname ${LANG_FRENCH} "H?te"\r
LangString DESC_PostgreSQL_Port ${LANG_FRENCH} "Port"\r
LangString DESC_PostgreSQL_Username ${LANG_FRENCH} "Utilisateur"\r
LangString DESC_PostgreSQL_Password ${LANG_FRENCH} "Mot de passe"\r
\r
Section -StopService\r
- nsExec::Exec "net stop openerp-server-6.0"\r
+ nsExec::Exec "net stop openerp-server-7.0"\r
sleep 2\r
SectionEnd\r
\r
Section OpenERP_Server SectionOpenERP_Server\r
- SetOutPath '$INSTDIR'\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
!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\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
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\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
Section -RestartServer\r
- nsExec::Exec "net start openerp-server-6.0"\r
+ nsExec::Exec "net start openerp-server-7.0"\r
sleep 2\r
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" "${MAJOR_VERSION}.${MINOR_VERSION}"\r
+ WriteRegStr HKLM "${UNINSTALL_REGISTRY_KEY}" "DisplayVersion" "${VERSION}"\r
WriteRegStr HKLM "${UNINSTALL_REGISTRY_KEY}" "Publisher" "${PUBLISHER}"\r
- WriteRegDWORD HKLM "${UNINSTALL_REGISTRY_KEY}" "Version" "${VERSION}"\r
- WriteRegDWORD HKLM "${UNINSTALL_REGISTRY_KEY}" "VersionMajor" "${MAJOR_VERSION}.${MINOR_VERSION}"\r
- WriteRegDWORD HKLM "${UNINSTALL_REGISTRY_KEY}" "VersionMinor" "${REVISION_VERSION}"\r
+; WriteRegDWORD HKLM "${UNINSTALL_REGISTRY_KEY}" "Version" "${VERSION}"\r
+; WriteRegDWORD HKLM "${UNINSTALL_REGISTRY_KEY}" "VersionMajor" "${MAJOR_VERSION}.${MINOR_VERSION}"\r
+; WriteRegDWORD HKLM "${UNINSTALL_REGISTRY_KEY}" "VersionMinor" "${REVISION_VERSION}"\r
WriteRegStr HKLM "${UNINSTALL_REGISTRY_KEY}" "HelpLink" "support@openerp.com"\r
WriteRegStr HKLM "${UNINSTALL_REGISTRY_KEY}" "HelpTelephone" "+32.81.81.37.00"\r
WriteRegStr HKLM "${UNINSTALL_REGISTRY_KEY}" "URLInfoAbout" "http://www.openerp.com"\r
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
; Stop the NT Service\r
- nsExec::Exec "net stop openerp-server-6.0"\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"\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
!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