[FIX] Set the right directory in the service, set the right version
bzr revid: stw@openerp.com-20111221173833-k0k2vasmjp4f6u9q
This commit is contained in:
parent
0354c117a1
commit
fd50a36583
16
setup.nsi
16
setup.nsi
|
@ -160,7 +160,7 @@ LangString DESC_PostgreSQL_Username ${LANG_FRENCH} "Utilisateur"
|
||||||
LangString DESC_PostgreSQL_Password ${LANG_FRENCH} "Mot de passe"
|
LangString DESC_PostgreSQL_Password ${LANG_FRENCH} "Mot de passe"
|
||||||
|
|
||||||
Section -StopService
|
Section -StopService
|
||||||
nsExec::Exec "net stop openerp-server-6.0"
|
nsExec::Exec "net stop openerp-server-6.1"
|
||||||
sleep 2
|
sleep 2
|
||||||
SectionEnd
|
SectionEnd
|
||||||
|
|
||||||
|
@ -186,7 +186,7 @@ Section OpenERP_Server SectionOpenERP_Server
|
||||||
; CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\Uninstall.lnk" "$INSTDIR\uninstall.exe"
|
; 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\Forum" "http://www.openerp.com/forum"
|
||||||
; !insertmacro CreateInternetShortcut "$SMPROGRAMS\$STARTMENU_FOLDER\Translation" "https://translations.launchpad.net/openobject"
|
; !insertmacro CreateInternetShortcut "$SMPROGRAMS\$STARTMENU_FOLDER\Translation" "https://translations.launchpad.net/openobject"
|
||||||
!insertmacro CreateInternetShortcut "$SMPROGRAMS\$STARTMENU_FOLDER\OpenERP" "http://127.0.0.1:8069/"
|
!insertmacro CreateInternetShortcut "$SMPROGRAMS\$STARTMENU_FOLDER\OpenERP" "http://localhost:8069/"
|
||||||
!insertmacro MUI_STARTMENU_WRITE_END
|
!insertmacro MUI_STARTMENU_WRITE_END
|
||||||
|
|
||||||
|
|
||||||
|
@ -209,7 +209,7 @@ Section OpenERP_Server SectionOpenERP_Server
|
||||||
SectionEnd
|
SectionEnd
|
||||||
|
|
||||||
Section -RestartServer
|
Section -RestartServer
|
||||||
nsExec::Exec "net start openerp-server-6.0"
|
nsExec::Exec "net start openerp-server-6.1"
|
||||||
sleep 2
|
sleep 2
|
||||||
SectionEnd
|
SectionEnd
|
||||||
|
|
||||||
|
@ -222,10 +222,10 @@ Section -Post
|
||||||
; WriteRegDWORD HKLM "${UNINSTALL_REGISTRY_KEY}" "Version" "${VERSION}"
|
; WriteRegDWORD HKLM "${UNINSTALL_REGISTRY_KEY}" "Version" "${VERSION}"
|
||||||
; WriteRegDWORD HKLM "${UNINSTALL_REGISTRY_KEY}" "VersionMajor" "${MAJOR_VERSION}.${MINOR_VERSION}"
|
; WriteRegDWORD HKLM "${UNINSTALL_REGISTRY_KEY}" "VersionMajor" "${MAJOR_VERSION}.${MINOR_VERSION}"
|
||||||
; WriteRegDWORD HKLM "${UNINSTALL_REGISTRY_KEY}" "VersionMinor" "${REVISION_VERSION}"
|
; WriteRegDWORD HKLM "${UNINSTALL_REGISTRY_KEY}" "VersionMinor" "${REVISION_VERSION}"
|
||||||
; WriteRegStr HKLM "${UNINSTALL_REGISTRY_KEY}" "HelpLink" "support@openerp.com"
|
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}" "HelpTelephone" "+32.81.81.37.00"
|
||||||
; WriteRegStr HKLM "${UNINSTALL_REGISTRY_KEY}" "URLInfoAbout" "http://www.openerp.com"
|
WriteRegStr HKLM "${UNINSTALL_REGISTRY_KEY}" "URLInfoAbout" "http://www.openerp.com"
|
||||||
; WriteRegStr HKLM "${UNINSTALL_REGISTRY_KEY}" "Contact" "sales@openerp.com"
|
WriteRegStr HKLM "${UNINSTALL_REGISTRY_KEY}" "Contact" "sales@openerp.com"
|
||||||
WriteRegDWORD HKLM "${UNINSTALL_REGISTRY_KEY}" "NoModify" "1"
|
WriteRegDWORD HKLM "${UNINSTALL_REGISTRY_KEY}" "NoModify" "1"
|
||||||
WriteRegDWORD HKLM "${UNINSTALL_REGISTRY_KEY}" "NoRepair" "1"
|
WriteRegDWORD HKLM "${UNINSTALL_REGISTRY_KEY}" "NoRepair" "1"
|
||||||
WriteUninstaller "$INSTDIR\Uninstall.exe"
|
WriteUninstaller "$INSTDIR\Uninstall.exe"
|
||||||
|
@ -233,7 +233,7 @@ SectionEnd
|
||||||
|
|
||||||
Section "Uninstall"
|
Section "Uninstall"
|
||||||
; Stop the NT Service
|
; Stop the NT Service
|
||||||
nsExec::Exec "net stop openerp-server-6.0"
|
nsExec::Exec "net stop openerp-server-6.1"
|
||||||
sleep 2
|
sleep 2
|
||||||
|
|
||||||
; Uninstall the OpenERP Service
|
; Uninstall the OpenERP Service
|
||||||
|
|
|
@ -34,10 +34,10 @@ import thread
|
||||||
|
|
||||||
class OpenERPServerService(win32serviceutil.ServiceFramework):
|
class OpenERPServerService(win32serviceutil.ServiceFramework):
|
||||||
# required info
|
# required info
|
||||||
_svc_name_ = "openerp-server-6.0"
|
_svc_name_ = "openerp-server-6.1"
|
||||||
_svc_display_name_ = "OpenERP Server 6.0"
|
_svc_display_name_ = "OpenERP Server 6.1"
|
||||||
# optionnal info
|
# optionnal info
|
||||||
_svc_description_ = "OpenERP Server 6.0 service"
|
_svc_description_ = "OpenERP Server 6.1 service"
|
||||||
|
|
||||||
def __init__(self, args):
|
def __init__(self, args):
|
||||||
win32serviceutil.ServiceFramework.__init__(self, args)
|
win32serviceutil.ServiceFramework.__init__(self, args)
|
||||||
|
@ -66,7 +66,7 @@ class OpenERPServerService(win32serviceutil.ServiceFramework):
|
||||||
# The server's binary must be one directory above the service's binary (when py2exe'd the python libraries shouldn' mix)
|
# The server's binary must be one directory above the service's binary (when py2exe'd the python libraries shouldn' mix)
|
||||||
service_dir = os.path.dirname(sys.argv[0])
|
service_dir = os.path.dirname(sys.argv[0])
|
||||||
server_dir = os.path.split(service_dir)[0]
|
server_dir = os.path.split(service_dir)[0]
|
||||||
server_path = os.path.join(server_dir, 'openerp-server.exe')
|
server_path = os.path.join(server_dir, 'server', 'openerp-server.exe')
|
||||||
self.terpprocess = subprocess.Popen([server_path], cwd=server_dir, creationflags=win32process.CREATE_NO_WINDOW)
|
self.terpprocess = subprocess.Popen([server_path], cwd=server_dir, creationflags=win32process.CREATE_NO_WINDOW)
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -28,7 +28,8 @@ setup(service=["OpenERPServerService"],
|
||||||
"_imagingtk","PIL._imagingtk",
|
"_imagingtk","PIL._imagingtk",
|
||||||
"ImageTk", "PIL.ImageTk",
|
"ImageTk", "PIL.ImageTk",
|
||||||
"FixTk"],
|
"FixTk"],
|
||||||
"compressed": 1}}
|
"skip_archive": 1,
|
||||||
|
"optimize": 2,}}
|
||||||
)
|
)
|
||||||
|
|
||||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
@PATH=%WINDIR%\system32;%WINDIR%;%WINDIR%\System32\Wbem;.
|
@PATH=%WINDIR%\system32;%WINDIR%;%WINDIR%\System32\Wbem;.
|
||||||
|
|
||||||
@net stop openerp-server-6.0
|
@net stop openerp-server-6.1
|
||||||
|
|
||||||
@net start openerp-server-6.0
|
@net start openerp-server-6.1
|
||||||
|
|
||||||
cls
|
cls
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
@PATH=%WINDIR%\system32;%WINDIR%;%WINDIR%\System32\Wbem;.
|
@PATH=%WINDIR%\system32;%WINDIR%;%WINDIR%\System32\Wbem;.
|
||||||
|
|
||||||
@net stop openerp-server-6.0
|
@net stop openerp-server-6.1
|
||||||
|
|
||||||
cls
|
cls
|
||||||
|
|
Loading…
Reference in New Issue