#\r
# You should have received a copy of the GNU General Public License\r
# along with this program; if not, write to the Free Software\r
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\r
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA\r
#####################################################################################\r
\r
!include 'MUI2.nsh'\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
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\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://127.0.0.1:8069/"\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
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" "${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
+ 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