Author: tyrell
Date: Sun Dec 2 22:52:18 2007
New Revision: 10403
Added:
trunk/mashup/java/modules/distribution/installer/serverdown.ico (contents,
props changed)
Modified:
trunk/mashup/java/modules/distribution/installer/mashupserver-setup.nsi
Log:
Adding -stop functionality and an icon in Windows Start Menu for the system
tray monitor.
Modified:
trunk/mashup/java/modules/distribution/installer/mashupserver-setup.nsi
==============================================================================
--- trunk/mashup/java/modules/distribution/installer/mashupserver-setup.nsi
(original)
+++ trunk/mashup/java/modules/distribution/installer/mashupserver-setup.nsi
Sun Dec 2 22:52:18 2007
@@ -84,9 +84,16 @@
# Checking the JRE and downloading the required one if necessary
Call DetectJRE
+ # Copying the distribution
SetOutPath $INSTDIR
SetOverwrite on
- File /nonfatal /r ${SERVER_BUILD_LOCATION}\*.*
+ File /nonfatal /r ${SERVER_BUILD_LOCATION}\*.*
+
+ # Copying the monitor icon
+ SetOutPath $INSTDIR\bin\native
+ SetOverwrite on
+ File /nonfatal /r serverdown.ico
+
WriteRegStr HKLM "${REGKEY}\Components" Main 1
SectionEnd
@@ -96,8 +103,8 @@
WriteUninstaller $INSTDIR\uninstall.exe
!insertmacro MUI_STARTMENU_WRITE_BEGIN Application
SetOutPath $SMPROGRAMS\$StartMenuGroup
- CreateShortcut "$SMPROGRAMS\$StartMenuGroup\Start $(^Name).lnk"
"$INSTDIR\bin\native\wrapper-windows-x86-32.exe" "-t ..\..\conf\wrapper.conf"
- CreateShortcut "$SMPROGRAMS\$StartMenuGroup\Start $(^Name) System Tray
Monitor.lnk" "javaw.exe" '-jar "$INSTDIR\lib\${MONITOR_JAR_NAME}"'
+ CreateShortcut "$SMPROGRAMS\$StartMenuGroup\Start $(^Name).lnk"
"$INSTDIR\bin\native\wrapper-windows-x86-32.exe" "-t ..\..\conf\wrapper.conf"
+ CreateShortcut "$SMPROGRAMS\$StartMenuGroup\Start $(^Name) System Tray
Monitor.lnk" "javaw.exe" '-jar "$INSTDIR\lib\${MONITOR_JAR_NAME}"'
"$INSTDIR\bin\native\serverdown.ico"
CreateShortcut "$SMPROGRAMS\$StartMenuGroup\$(^UninstallLink).lnk"
$INSTDIR\uninstall.exe
!insertmacro MUI_STARTMENU_WRITE_END
WriteRegStr HKLM
"SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" DisplayName
"$(^Name)"
@@ -141,8 +148,12 @@
please do so before proceeding." IDOK ok IDCANCEL cancel
ok:
- # Un-Installing the system tray monitor
- ExecWait '"$INSTDIR\bin\native\wrapper-windows-x86-32.exe" -r
..\..\conf\wrapper.conf'
+ # Un-installing the system tray monitor
+ ExecWait 'javaw.exe -jar "$INSTDIR\lib\${MONITOR_JAR_NAME}" -stop'
+
+ # Un-installing the windows service
+ ExecWait '"$INSTDIR\bin\native\wrapper-windows-x86-32.exe" -r
..\..\conf\wrapper.conf'
+
Delete /REBOOTOK "$SMPROGRAMS\$StartMenuGroup\Start $(^Name).lnk"
Delete /REBOOTOK "$SMPROGRAMS\$StartMenuGroup\Start $(^Name) System
Tray Monitor.lnk"
RmDir /r /REBOOTOK $INSTDIR
Added: trunk/mashup/java/modules/distribution/installer/serverdown.ico
==============================================================================
Binary file. No diff available.
_______________________________________________
Mashup-dev mailing list
[email protected]
http://www.wso2.org/cgi-bin/mailman/listinfo/mashup-dev
