X-Git-Url: http://git.inspyration.org/?a=blobdiff_plain;f=setup.nsi;h=87a6202646ba2cfbbf3084ed7f1c0d7aaf5d9be8;hb=11dd44ec360d4130c824bda10bd2bee1f8a31a2c;hp=0aa0687b3c01cd5ebda52d1398f51cec3832e38c;hpb=1bdf60d4e3a201680dfbd8b52d0f1331d3b4765c;p=odoo%2Fodoo.git diff --git a/setup.nsi b/setup.nsi index 0aa0687..87a6202 100644 --- a/setup.nsi +++ b/setup.nsi @@ -30,16 +30,14 @@ !include 'Sections.nsh' !define PUBLISHER 'OpenERP S.A.' -!define MAJOR_VERSION '6.0' -!define MINOR_VERSION '0.0' -!define REVISION_VERSION 'RC2-test' -!ifndef REVISION_VERSION - !define VERSION "${MAJOR_VERSION}.${MINOR_VERSION}" -!else - !define VERSION "${MAJOR_VERSION}.${MINOR_VERSION}-${REVISION_VERSION}" + +!ifndef VERSION + !define VERSION '0' !endif +#!define VERSION "${MAJOR_VERSION}.${MINOR_VERSION}.${REVISION_VERSION}" + !define PRODUCT_NAME "OpenERP Server" -!define DISPLAY_NAME "${PRODUCT_NAME} ${MAJOR_VERSION}" +!define DISPLAY_NAME "${PRODUCT_NAME} ${VERSION}" !define UNINSTALL_REGISTRY_ROOT HKLM !define UNINSTALL_REGISTRY_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${DISPLAY_NAME}" @@ -60,20 +58,20 @@ ShowInstDetails show XPStyle on -InstallDir "$PROGRAMFILES\OpenERP ${MAJOR_VERSION}\Server" +InstallDir "$PROGRAMFILES\OpenERP ${VERSION}" InstallDirRegKey HKCU "${REGISTRY_KEY}" "" BrandingText '${PRODUCT_NAME} ${VERSION}' RequestExecutionLevel admin -VIAddVersionKey "ProductName" "${PRODUCT_NAME}" -VIAddVersionKey "CompanyName" "${PUBLISHER}" -VIAddVersionKey "FileDescription" "Installer of ${DISPLAY_NAME}" -VIAddVersionKey "LegalCopyright" "${PUBLISHER}" -VIAddVersionKey "LegalTrademark" "OpenERP is a trademark of ${PUBLISHER}" -VIAddVersionKey "FileVersion" "${MAJOR_VERSION}" -VIProductVersion "${VERSION}" +#VIAddVersionKey "ProductName" "${PRODUCT_NAME}" +#VIAddVersionKey "CompanyName" "${PUBLISHER}" +#VIAddVersionKey "FileDescription" "Installer of ${DISPLAY_NAME}" +#VIAddVersionKey "LegalCopyright" "${PUBLISHER}" +#VIAddVersionKey "LegalTrademark" "OpenERP is a trademark of ${PUBLISHER}" +#VIAddVersionKey "FileVersion" "${MAJOR_VERSION}.${MINOR_VERSION}.${REVISION_VERSION}" +#VIProductVersion "${MAJOR_VERSION}.${MINOR_VERSION}.${REVISION_VERSION}" !insertmacro GetParameters !insertmacro GetOptions @@ -96,17 +94,17 @@ Var MUI_TEMP Var STARTMENU_FOLDER !define MUI_ABORTWARNING -!define MUI_ICON ".\pixmaps\openerp-icon.ico" +!define MUI_ICON ".\install\openerp-icon.ico" -!define MUI_WELCOMEFINISHPAGE_BITMAP ".\pixmaps\openerp-intro.bmp" -!define MUI_UNWELCOMEFINISHPAGE_BITMAP ".\pixmaps\openerp-intro.bmp" +!define MUI_WELCOMEFINISHPAGE_BITMAP ".\install\openerp-intro.bmp" +!define MUI_UNWELCOMEFINISHPAGE_BITMAP ".\install\openerp-intro.bmp" !define MUI_HEADERIMAGE -!define MUI_HEADERIMAGE_BITMAP ".\pixmaps\openerp-slogan.bmp" +!define MUI_HEADERIMAGE_BITMAP ".\install\openerp-slogan.bmp" !define MUI_HEADERIMAGE_BITMAP_NOSTRETCH !define MUI_HEADER_TRANSPARENT_TEXT "" !insertmacro MUI_PAGE_WELCOME -!insertmacro MUI_PAGE_LICENSE "doc\License.rtf" +!insertmacro MUI_PAGE_LICENSE ".\LICENSE" !define MUI_COMPONENTSPAGE_SMALLDESC !insertmacro MUI_PAGE_DIRECTORY Page Custom ShowPostgreSQL LeavePostgreSQL @@ -154,22 +152,23 @@ LangString DESC_FinishPage_Link ${LANG_FRENCH} "Contactez OpenERP pour un Parten LangString WARNING_HostNameIsEmpty ${LANG_FRENCH} "L'adresse pour la connection au serveur PostgreSQL est vide" LangString WARNING_UserNameIsEmpty ${LANG_FRENCH} "Le nom d'utilisateur pour la connection au serveur PostgreSQL est vide" LangString WARNING_PasswordIsEmpty ${LANG_FRENCH} "Le mot de passe pour la connection au serveur PostgreSQL est vide" -LangString WARNING_PortIsWrong ${LANG_FRENCH} "Le port pour la connection au serveur PostgreSQL est erroné (défaut: 5432)" +LangString WARNING_PortIsWrong ${LANG_FRENCH} "Le port pour la connection au serveur PostgreSQL est erron? (d?faut: 5432)" LangString DESC_PostgreSQLPage ${LANG_FRENCH} "Configurez les informations de connection pour le serveur PostgreSQL" -LangString DESC_PostgreSQL_Hostname ${LANG_FRENCH} "Hôte" +LangString DESC_PostgreSQL_Hostname ${LANG_FRENCH} "H?te" LangString DESC_PostgreSQL_Port ${LANG_FRENCH} "Port" LangString DESC_PostgreSQL_Username ${LANG_FRENCH} "Utilisateur" LangString DESC_PostgreSQL_Password ${LANG_FRENCH} "Mot de passe" Section -StopService - nsExec::Exec "net stop openerp-server-6.0" + nsExec::Exec "net stop openerp-server-6.1" sleep 2 SectionEnd Section OpenERP_Server SectionOpenERP_Server - SetOutPath '$INSTDIR' + SetOutPath '$INSTDIR\server' File /r "dist\*" + File /r "win32\wkhtmltopdf\*" SetOutPath "$INSTDIR\service" File /r "win32\dist\*" @@ -179,18 +178,12 @@ Section OpenERP_Server SectionOpenERP_Server !insertmacro MUI_STARTMENU_WRITE_BEGIN Application ;Create shortcuts CreateDirectory "$SMPROGRAMS\$STARTMENU_FOLDER" - CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\OpenERP Server.lnk" "$INSTDIR\openerp-server.exe" - CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\Start service.lnk" "$INSTDIR\service\start.bat" - CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\Stop service.lnk" "$INSTDIR\service\stop.bat" - CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\Edit config.lnk" "notepad.exe" "$INSTDIR\openerp-server.conf" - CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\View log.lnk" "notepad.exe" "$INSTDIR\openerp-server.log" - CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\Uninstall.lnk" "$INSTDIR\uninstall.exe" - !insertmacro CreateInternetShortcut "$SMPROGRAMS\$STARTMENU_FOLDER\Forum" "http://www.openerp.com/forum" - !insertmacro CreateInternetShortcut "$SMPROGRAMS\$STARTMENU_FOLDER\Translation" "https://translations.launchpad.net/openobject" + !insertmacro CreateInternetShortcut "$SMPROGRAMS\$STARTMENU_FOLDER\OpenERP" "http://localhost:8069/" !insertmacro MUI_STARTMENU_WRITE_END FileOpen $9 '$INSTDIR\install.log' w + FileWrite $9 "INSTDIR $INSTDIR$\r$\n" FileWrite $9 "Hostname $TextPostgreSQLHostname$\r$\n" FileWrite $9 "Port $TextPostgreSQLPort$\r$\n" FileWrite $9 "Username $TextPostgreSQLUsername$\r$\n" @@ -198,60 +191,54 @@ Section OpenERP_Server SectionOpenERP_Server FileClose $9 # If there is a previous install of the OpenERP Server, keep the login/password from the config file - WriteIniStr "$INSTDIR\openerp-server.conf" "options" "db_host" $TextPostgreSQLHostname - WriteIniStr "$INSTDIR\openerp-server.conf" "options" "db_user" $TextPostgreSQLUsername - WriteIniStr "$INSTDIR\openerp-server.conf" "options" "db_password" $TextPostgreSQLPassword - WriteIniStr "$INSTDIR\openerp-server.conf" "options" "db_port" $TextPostgreSQLPort + WriteIniStr "$INSTDIR\server\openerp-server.conf" "options" "db_host" $TextPostgreSQLHostname + WriteIniStr "$INSTDIR\server\openerp-server.conf" "options" "db_user" $TextPostgreSQLUsername + WriteIniStr "$INSTDIR\server\openerp-server.conf" "options" "db_password" $TextPostgreSQLPassword + WriteIniStr "$INSTDIR\server\openerp-server.conf" "options" "db_port" $TextPostgreSQLPort + WriteIniStr "$INSTDIR\server\openerp-server.conf" "options" "pg_path" "$INSTDIR\PostgreSQL\bin" - nsExec::Exec '"$INSTDIR\openerp-server.exe" --stop-after-init --logfile "$INSTDIR\openerp-server.log" -s' + nsExec::Exec '"$INSTDIR\server\openerp-server.exe" --stop-after-init --logfile "$INSTDIR\server\openerp-server.log" -s' nsExec::Exec '"$INSTDIR\service\OpenERPServerService.exe" -auto -install' SectionEnd Section -RestartServer - nsExec::Exec "net start openerp-server-6.0" + nsExec::Exec "net start openerp-server-6.1" sleep 2 SectionEnd Section -Post - WriteRegExpandStr HKLM "${UNINSTALL_REGISTRY_KEY}" "UninstallString" "$INSTDIR\Uninstall.exe" + WriteRegExpandStr HKLM "${UNINSTALL_REGISTRY_KEY}" "UninstallString" "$INSTDIR\server\Uninstall.exe" WriteRegExpandStr HKLM "${UNINSTALL_REGISTRY_KEY}" "InstallLocation" "$INSTDIR" WriteRegStr HKLM "${UNINSTALL_REGISTRY_KEY}" "DisplayName" "${DISPLAY_NAME}" - WriteRegStr HKLM "${UNINSTALL_REGISTRY_KEY}" "DisplayVersion" "${MAJOR_VERSION}" + WriteRegStr HKLM "${UNINSTALL_REGISTRY_KEY}" "DisplayVersion" "${VERSION}" WriteRegStr HKLM "${UNINSTALL_REGISTRY_KEY}" "Publisher" "${PUBLISHER}" - WriteRegDWORD HKLM "${UNINSTALL_REGISTRY_KEY}" "Version" "${VERSION}" - WriteRegDWORD HKLM "${UNINSTALL_REGISTRY_KEY}" "VersionMajor" "${MAJOR_VERSION}" - WriteRegDWORD HKLM "${UNINSTALL_REGISTRY_KEY}" "VersionMinor" "${MINOR_VERSION}" +; WriteRegDWORD HKLM "${UNINSTALL_REGISTRY_KEY}" "Version" "${VERSION}" +; WriteRegDWORD HKLM "${UNINSTALL_REGISTRY_KEY}" "VersionMajor" "${MAJOR_VERSION}.${MINOR_VERSION}" +; WriteRegDWORD HKLM "${UNINSTALL_REGISTRY_KEY}" "VersionMinor" "${REVISION_VERSION}" WriteRegStr HKLM "${UNINSTALL_REGISTRY_KEY}" "HelpLink" "support@openerp.com" WriteRegStr HKLM "${UNINSTALL_REGISTRY_KEY}" "HelpTelephone" "+32.81.81.37.00" WriteRegStr HKLM "${UNINSTALL_REGISTRY_KEY}" "URLInfoAbout" "http://www.openerp.com" WriteRegStr HKLM "${UNINSTALL_REGISTRY_KEY}" "Contact" "sales@openerp.com" WriteRegDWORD HKLM "${UNINSTALL_REGISTRY_KEY}" "NoModify" "1" WriteRegDWORD HKLM "${UNINSTALL_REGISTRY_KEY}" "NoRepair" "1" - WriteUninstaller "$INSTDIR\Uninstall.exe" + WriteUninstaller "$INSTDIR\server\Uninstall.exe" SectionEnd Section "Uninstall" ; Stop the NT Service - nsExec::Exec "net stop openerp-server-6.0" + nsExec::Exec "net stop openerp-server-6.1" sleep 2 ; Uninstall the OpenERP Service - nsExec::Exec '"$INSTDIR\service\OpenERPServerService.exe" -remove' + nsExec::Exec '"$INSTDIR\..\service\OpenERPServerService.exe" -remove' sleep 2 - Rmdir /r "$INSTDIR" + Rmdir /r "$INSTDIR\service" + Rmdir /r "$INSTDIR\server" !insertmacro MUI_STARTMENU_GETFOLDER Application $MUI_TEMP - Delete "$SMPROGRAMS\$MUI_TEMP\Forum.url" - Delete "$SMPROGRAMS\$MUI_TEMP\Translation.url" - Delete "$SMPROGRAMS\$MUI_TEMP\Uninstall.lnk" - Delete "$SMPROGRAMS\$MUI_TEMP\OpenERP Server.lnk" - Delete "$SMPROGRAMS\$MUI_TEMP\Uninstall.lnk" - Delete "$SMPROGRAMS\$MUI_TEMP\Start service.lnk" - Delete "$SMPROGRAMS\$MUI_TEMP\Stop service.lnk" - Delete "$SMPROGRAMS\$MUI_TEMP\Edit config.lnk" - Delete "$SMPROGRAMS\$MUI_TEMP\View log.lnk" + Delete "$SMPROGRAMS\$MUI_TEMP\OpenERP.url" ; ;Delete empty start menu parent diretories StrCpy $MUI_TEMP "$SMPROGRAMS\$MUI_TEMP"