From: <mie...@us...> - 2008-10-25 15:36:41
|
Revision: 3608 http://oorexx.svn.sourceforge.net/oorexx/?rev=3608&view=rev Author: miesfeld Date: 2008-10-25 15:36:37 +0000 (Sat, 25 Oct 2008) Log Message: ----------- Temporarily block out the orxscrpt samples from the Windows install package. Modified Paths: -------------- main/trunk/platform/windows/install/oorexx.nsi Modified: main/trunk/platform/windows/install/oorexx.nsi =================================================================== --- main/trunk/platform/windows/install/oorexx.nsi 2008-10-24 23:36:23 UTC (rev 3607) +++ main/trunk/platform/windows/install/oorexx.nsi 2008-10-25 15:36:37 UTC (rev 3608) @@ -268,13 +268,14 @@ ; Distribution files... File "${SRCDIR}\samples\windows\ole\wmi\sysinfo\*.rex" File "${SRCDIR}\samples\windows\ole\wmi\sysinfo\*.rc" - ; Set output path to the installation directory. - SetOutPath $INSTDIR\samples\wsh - ; Distribution files... - File "${SRCDIR}\samples\windows\wsh\*.rex" - File "${SRCDIR}\samples\windows\wsh\*.htm" - File "${SRCDIR}\samples\windows\wsh\*.wsf" - File "${SRCDIR}\samples\windows\wsh\*.wsc" +;;; Temporarily block out the orxscrpt samples +;;; ; Set output path to the installation directory. +;;; SetOutPath $INSTDIR\samples\wsh +;;; ; Distribution files... +;;; File "${SRCDIR}\samples\windows\wsh\*.rex" +;;; File "${SRCDIR}\samples\windows\wsh\*.htm" +;;; File "${SRCDIR}\samples\windows\wsh\*.wsf" +;;; File "${SRCDIR}\samples\windows\wsh\*.wsc" ; Create start menu shortcuts SetOutPath $INSTDIR\samples CreateDirectory "$SMPROGRAMS\${LONGNAME}\${SHORTNAME} Samples" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mie...@us...> - 2009-02-23 18:25:25
|
Revision: 4211 http://oorexx.svn.sourceforge.net/oorexx/?rev=4211&view=rev Author: miesfeld Date: 2009-02-23 18:25:21 +0000 (Mon, 23 Feb 2009) Log Message: ----------- [ 2618794 ] UnInstaller deletes unrelated files Patch supplied by Brandon Cherry. Thank Brandon. Modified Paths: -------------- main/trunk/platform/windows/install/oorexx.nsi Modified: main/trunk/platform/windows/install/oorexx.nsi =================================================================== --- main/trunk/platform/windows/install/oorexx.nsi 2009-02-23 17:46:38 UTC (rev 4210) +++ main/trunk/platform/windows/install/oorexx.nsi 2009-02-23 18:25:21 UTC (rev 4211) @@ -42,6 +42,48 @@ ;define MUI_CUSTOMFUNCTION_GUIINIT myGuiInit +!define UninstLog "uninstall.log" +Var UninstLog + +!macro AddItem Path + FileWrite $UninstLog "${Path}$\r$\n" +!macroend +!define AddItem "!insertmacro AddItem" + +!macro File FilePath FileName + FileWrite $UninstLog "$OUTDIR\${FileName}$\r$\n" + File "${FilePath}${FileName}" +!macroend +!define File "!insertmacro File" + +!macro CreateDirectory Path + CreateDirectory "${Path}" + FileWrite $UninstLog "${Path}$\r$\n" +!macroend +!define CreateDirectory "!insertmacro CreateDirectory" + +!macro SetOutPath Path + SetOutPath "${Path}" + FileWrite $UninstLog "${Path}$\r$\n" +!macroend +!define SetOutPath "!insertmacro SetOutPath" + +!macro WriteUninstaller Path + WriteUninstaller "${Path}" + FileWrite $UninstLog "${Path}$\r$\n" +!macroend +!define WriteUninstaller "!insertmacro WriteUninstaller" + +Section -openlogfile + CreateDirectory "$INSTDIR" + IfFileExists "$INSTDIR\${UninstLog}" +3 + FileOpen $UninstLog "$INSTDIR\${UninstLog}" w + Goto +4 + SetFileAttributes "$INSTDIR\${UninstLog}" NORMAL + FileOpen $UninstLog "$INSTDIR\${UninstLog}" a + FileSeek $UninstLog 0 END +SectionEnd + ;-------------------------------- ;Configuration @@ -99,57 +141,63 @@ Section "${LONGNAME} Core (required)" SecMain SectionIn 1 RO ; Set output path to the installation directory. - SetOutPath $INSTDIR + ${SetOutPath} $INSTDIR ; Set the REXX_HOME environment variable Push "REXX_HOME" Push $INSTDIR Push $IsAdminUser ; "true" or "false" Call WriteEnvStr ; Distribution executables... - File "${BINDIR}\rexx.exe" - File "${BINDIR}\rexx.img" - File "${BINDIR}\rexxc.exe" - File "${BINDIR}\rxsubcom.exe" - File "${BINDIR}\rxqueue.exe" - File "${BINDIR}\rxapi.exe" - File "${BINDIR}\rexxhide.exe" - File "${BINDIR}\rexxpaws.exe" + ${File} "${BINDIR}\" "rexx.exe" + ${File} "${BINDIR}\" "rexx.img" + ${File} "${BINDIR}\" "rexxc.exe" + ${File} "${BINDIR}\" "rxsubcom.exe" + ${File} "${BINDIR}\" "rxqueue.exe" + ${File} "${BINDIR}\" "rxapi.exe" + ${File} "${BINDIR}\" "rexxhide.exe" + ${File} "${BINDIR}\" "rexxpaws.exe" ; Distribution DLLs... - File "${BINDIR}\rexx.dll" - File "${BINDIR}\rexxapi.dll" - File "${BINDIR}\rexxutil.dll" - File "${BINDIR}\rxmath.dll" - File "${BINDIR}\rxsock.dll" - File "${BINDIR}\rxregexp.dll" - File "${BINDIR}\rxwinsys.dll" - File "${BINDIR}\oodialog.dll" - File "${BINDIR}\orexxole.dll" + ${File} "${BINDIR}\" "rexx.dll" + ${File} "${BINDIR}\" "rexxapi.dll" + ${File} "${BINDIR}\" "rexxutil.dll" + ${File} "${BINDIR}\" "rxmath.dll" + ${File} "${BINDIR}\" "rxsock.dll" + ${File} "${BINDIR}\" "rxregexp.dll" + ${File} "${BINDIR}\" "rxwinsys.dll" + ${File} "${BINDIR}\" "oodialog.dll" + ${File} "${BINDIR}\" "orexxole.dll" ; CLASS files... - File "${BINDIR}\winsystm.cls" - File "${BINDIR}\rxregexp.cls" - File "${BINDIR}\rxftp.cls" - File "${BINDIR}\orexxole.cls" - File "${BINDIR}\oodialog.cls" - File "${BINDIR}\oodwin32.cls" - File "${BINDIR}\oodplain.cls" - CreateDirectory "$SMPROGRAMS\${LONGNAME}" + ${File} "${BINDIR}\" "winsystm.cls" + ${File} "${BINDIR}\" "rxregexp.cls" + ${File} "${BINDIR}\" "rxftp.cls" + ${File} "${BINDIR}\" "orexxole.cls" + ${File} "${BINDIR}\" "oodialog.cls" + ${File} "${BINDIR}\" "oodwin32.cls" + ${File} "${BINDIR}\" "oodplain.cls" + ${CreateDirectory} "$SMPROGRAMS\${LONGNAME}" ; rexxtry is technically a sample, but it is heavily used, so add it to ; the executables. - File "${SRCDIR}\samples\rexxtry.rex" + ${File} "${SRCDIR}\samples\" "rexxtry.rex" CreateShortCut "$SMPROGRAMS\${LONGNAME}\Try Rexx.lnk" "$INSTDIR\rexx.exe" '"$INSTDIR\rexxtry.rex"' "$INSTDIR\rexx.exe" + ${AddItem} "$SMPROGRAMS\${LONGNAME}\Try Rexx.lnk" ; Other files... - File "${SRCDIR}\platform\windows\rexx.ico" - File "${SRCDIR}\CPLv1.0.txt" + ${File} "${SRCDIR}\platform\windows\" "rexx.ico" + ${File} "${SRCDIR}\" "CPLv1.0.txt" ; readmes ; Set output path to the installation directory. - SetOutPath $INSTDIR\doc - File "${SRCDIR}\doc\readme.pdf" + ${SetOutPath} $INSTDIR\doc + ${File} "${SRCDIR}\doc\" "readme.pdf" File /oname=CHANGES.txt "${SRCDIR}\CHANGES" File /oname=ReleaseNotes.txt "${SRCDIR}\ReleaseNotes" - CreateDirectory "$SMPROGRAMS\${LONGNAME}\Documentation" + ${AddItem} $INSTDIR\doc\CHANGES.txt + ${AddItem} $INSTDIR\doc\ReleaseNotes.txt + ${CreateDirectory} "$SMPROGRAMS\${LONGNAME}\Documentation" CreateShortCut "$SMPROGRAMS\${LONGNAME}\Documentation\ooRexx README.lnk" "$INSTDIR\doc\readme.pdf" "" "$INSTDIR\doc\readme.pdf" 0 + ${AddItem} "$SMPROGRAMS\${LONGNAME}\Documentation\ooRexx README.lnk" CreateShortCut "$SMPROGRAMS\${LONGNAME}\Documentation\ooRexx CHANGES.lnk" "$INSTDIR\doc\CHANGES.txt" "" "$INSTDIR\doc\CHANGES.txt" 0 + ${AddItem} "$SMPROGRAMS\${LONGNAME}\Documentation\ooRexx CHANGES.lnk" CreateShortCut "$SMPROGRAMS\${LONGNAME}\Documentation\ooRexx ReleaseNotes.lnk" "$INSTDIR\doc\ReleaseNotes.txt" "" "$INSTDIR\doc\ReleaseNotes.txt" 0 + ${AddItem} "$SMPROGRAMS\${LONGNAME}\Documentation\ooRexx ReleaseNotes.lnk" ;;;; Comment out orxscrpt stuff temporarily ; Set output path to the installation directory just in case @@ -167,8 +215,11 @@ Call AddToPath ; Add Start Menu items CreateShortCut "$SMPROGRAMS\${LONGNAME}\Uninstall ${SHORTNAME}.lnk" "$INSTDIR\uninstall.exe" "" "$INSTDIR\uninstall.exe" 0 + ${AddItem} "$SMPROGRAMS\${LONGNAME}\Uninstall ${SHORTNAME}.lnk" CreateShortCut "$SMPROGRAMS\${LONGNAME}\LICENSE.lnk" "$INSTDIR\CPLv1.0.txt" "" "$INSTDIR\CPLv1.0.txt" 0 + ${AddItem} "$SMPROGRAMS\${LONGNAME}\LICENSE.lnk" WriteINIStr "$SMPROGRAMS\${LONGNAME}\ooRexx Home Page.url" "InternetShortcut" "URL" "http://www.oorexx.org/" + ${AddItem} "$SMPROGRAMS\${LONGNAME}\ooRexx Home Page.url" ; Write the uninstall keys WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${SHORTNAME}" "DisplayName" "${LONGNAME}" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${SHORTNAME}" "DisplayIcon" "${DISPLAYICON}" @@ -182,7 +233,7 @@ WriteRegExpandStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${SHORTNAME}" "UnInstallLocation" "$INSTDIR" ; dont quote it WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${SHORTNAME}" "NoModify" 0x00000001 WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${SHORTNAME}" "NoRepair" 0x00000001 - WriteUninstaller "$INSTDIR\${UNINSTALLER}" + ${WriteUninstaller} "$INSTDIR\${UNINSTALLER}" ; associate .REX with ooRexx (REXXScript) StrCpy $5 0 @@ -207,166 +258,174 @@ Section "${LONGNAME} Samples" SecDemo DetailPrint "********** Samples **********" ; Set output path to the installation directory. - SetOutPath $INSTDIR\samples - File "${SRCDIR}\samples\rexxcps.rex" - File "${SRCDIR}\samples\ccreply.rex" - File "${SRCDIR}\samples\complex.rex" - File "${SRCDIR}\samples\factor.rex" - File "${SRCDIR}\samples\greply.rex" - File "${SRCDIR}\samples\guess.rex" - File "${SRCDIR}\samples\ktguard.rex" - File "${SRCDIR}\samples\makestring.rex" - File "${SRCDIR}\samples\month.rex" - File "${SRCDIR}\samples\windows\philfork.rex" - File "${SRCDIR}\samples\pipe.rex" - File "${SRCDIR}\samples\properties.rex" - File "${SRCDIR}\samples\qdate.rex" - File "${SRCDIR}\samples\qtime.rex" - File "${SRCDIR}\samples\scclient.rex" - File "${SRCDIR}\samples\scserver.rex" - File "${SRCDIR}\samples\semcls.rex" - File "${SRCDIR}\samples\sfclient.rex" - File "${SRCDIR}\samples\sfserver.rex" - File "${SRCDIR}\samples\stack.rex" - File "${SRCDIR}\samples\usecomp.rex" - File "${SRCDIR}\samples\usepipe.rex" - File "${SRCDIR}\samples\windows\rexutils\drives.rex" + ${SetOutPath} $INSTDIR\samples + ${File} "${SRCDIR}\samples\" "rexxcps.rex" + ${File} "${SRCDIR}\samples\" "ccreply.rex" + ${File} "${SRCDIR}\samples\" "complex.rex" + ${File} "${SRCDIR}\samples\" "factor.rex" + ${File} "${SRCDIR}\samples\" "greply.rex" + ${File} "${SRCDIR}\samples\" "guess.rex" + ${File} "${SRCDIR}\samples\" "ktguard.rex" + ${File} "${SRCDIR}\samples\" "makestring.rex" + ${File} "${SRCDIR}\samples\" "month.rex" + ${File} "${SRCDIR}\samples\windows\" "philfork.rex" + ${File} "${SRCDIR}\samples\" "pipe.rex" + ${File} "${SRCDIR}\samples\" "properties.rex" + ${File} "${SRCDIR}\samples\" "qdate.rex" + ${File} "${SRCDIR}\samples\" "qtime.rex" + ${File} "${SRCDIR}\samples\" "scclient.rex" + ${File} "${SRCDIR}\samples\" "scserver.rex" + ${File} "${SRCDIR}\samples\" "semcls.rex" + ${File} "${SRCDIR}\samples\" "sfclient.rex" + ${File} "${SRCDIR}\samples\" "sfserver.rex" + ${File} "${SRCDIR}\samples\" "stack.rex" + ${File} "${SRCDIR}\samples\" "usecomp.rex" + ${File} "${SRCDIR}\samples\" "usepipe.rex" + ${File} "${SRCDIR}\samples\windows\rexutils\" "drives.rex" + ${CreateDirectory} $INSTDIR\samples\ole ; Set output path to the installation directory. - SetOutPath $INSTDIR\samples\ole\adsi + ${SetOutPath} $INSTDIR\samples\ole\adsi ; Distribution files... - File "${SRCDIR}\samples\windows\ole\adsi\*.rex" + ${File} "${SRCDIR}\samples\windows\ole\adsi\" "*.rex" ; Set output path to the installation directory. - SetOutPath $INSTDIR\samples\ole\adsi + ${SetOutPath} $INSTDIR\samples\ole\apps ; Distribution files... - File "${SRCDIR}\samples\windows\ole\adsi\*.rex" + ${File} "${SRCDIR}\samples\windows\ole\apps\" "*.rex" + ${File} "${SRCDIR}\samples\windows\ole\apps\" "*.mwp" ; Set output path to the installation directory. - SetOutPath $INSTDIR\samples\ole\apps + ${SetOutPath} $INSTDIR\samples\ole\methinfo ; Distribution files... - File "${SRCDIR}\samples\windows\ole\apps\*.rex" - File "${SRCDIR}\samples\windows\ole\apps\*.mwp" + ${File} "${SRCDIR}\samples\windows\ole\methinfo\" "*.rex" + ${File} "${SRCDIR}\samples\windows\ole\methinfo\" "*.cls" ; Set output path to the installation directory. - SetOutPath $INSTDIR\samples\ole\methinfo + ${SetOutPath} $INSTDIR\samples\ole\oleinfo ; Distribution files... - File "${SRCDIR}\samples\windows\ole\methinfo\*.rex" - File "${SRCDIR}\samples\windows\ole\methinfo\*.cls" + ${File} "${SRCDIR}\samples\windows\ole\oleinfo\" "*.rex" + ${File} "${SRCDIR}\samples\windows\ole\oleinfo\" "*.txt" + ${File} "${SRCDIR}\samples\windows\ole\oleinfo\" "*.bmp" + ${File} "${SRCDIR}\samples\windows\ole\oleinfo\" "*.rc" ; Set output path to the installation directory. - SetOutPath $INSTDIR\samples\ole\oleinfo + ${SetOutPath} $INSTDIR\samples\ole\wmi ; Distribution files... - File "${SRCDIR}\samples\windows\ole\oleinfo\*.rex" - File "${SRCDIR}\samples\windows\ole\oleinfo\*.txt" - File "${SRCDIR}\samples\windows\ole\oleinfo\*.bmp" - File "${SRCDIR}\samples\windows\ole\oleinfo\*.rc" + ${File} "${SRCDIR}\samples\windows\ole\wmi\" "*.rex" ; Set output path to the installation directory. - SetOutPath $INSTDIR\samples\ole\wmi + ${SetOutPath} $INSTDIR\samples\ole\wmi\sysinfo ; Distribution files... - File "${SRCDIR}\samples\windows\ole\wmi\*.rex" - ; Set output path to the installation directory. - SetOutPath $INSTDIR\samples\ole\wmi\sysinfo - ; Distribution files... - File "${SRCDIR}\samples\windows\ole\wmi\sysinfo\*.rex" - File "${SRCDIR}\samples\windows\ole\wmi\sysinfo\*.rc" + ${File} "${SRCDIR}\samples\windows\ole\wmi\sysinfo\" "*.rex" + ${File} "${SRCDIR}\samples\windows\ole\wmi\sysinfo\" "*.rc" ;;; Temporarily block out the orxscrpt samples ;;; ; Set output path to the installation directory. ;;; SetOutPath $INSTDIR\samples\wsh ;;; ; Distribution files... -;;; File "${SRCDIR}\samples\windows\wsh\*.rex" -;;; File "${SRCDIR}\samples\windows\wsh\*.htm" -;;; File "${SRCDIR}\samples\windows\wsh\*.wsf" -;;; File "${SRCDIR}\samples\windows\wsh\*.wsc" +;;; ${File} "${SRCDIR}\samples\windows\wsh\" "*.rex" +;;; ${File} "${SRCDIR}\samples\windows\wsh\" "*.htm" +;;; ${File} "${SRCDIR}\samples\windows\wsh\" "*.wsf" +;;; ${File} "${SRCDIR}\samples\windows\wsh\" "*.wsc" ; Set output path to the installation directory. - SetOutPath $INSTDIR\samples\winsystem - File "${SRCDIR}\samples\windows\winsystem\*.rex" - File "${SRCDIR}\samples\windows\winsystem\*.rc" - File "${SRCDIR}\samples\windows\winsystem\*.h" - File "${SRCDIR}\samples\windows\winsystem\*.frm" + ${SetOutPath} $INSTDIR\samples\winsystem + ${File} "${SRCDIR}\samples\windows\winsystem\" "*.rex" + ${File} "${SRCDIR}\samples\windows\winsystem\" "*.rc" + ${File} "${SRCDIR}\samples\windows\winsystem\" "*.h" + ${File} "${SRCDIR}\samples\windows\winsystem\" "*.frm" ; Create start menu shortcuts SetOutPath $INSTDIR\samples - CreateDirectory "$SMPROGRAMS\${LONGNAME}\${SHORTNAME} Samples" + ${CreateDirectory} "$SMPROGRAMS\${LONGNAME}\${SHORTNAME} Samples" CreateShortCut "$SMPROGRAMS\${LONGNAME}\${SHORTNAME} Samples\RexxCPS.lnk" "$INSTDIR\rexxpaws.exe" '"$INSTDIR\samples\rexxcps.rex"' "$INSTDIR\rexx.exe" + ${AddItem} "$SMPROGRAMS\${LONGNAME}\${SHORTNAME} Samples\RexxCPS.lnk" CreateShortCut "$SMPROGRAMS\${LONGNAME}\${SHORTNAME} Samples\Quick Date.lnk" "$INSTDIR\rexxpaws.exe" '"$INSTDIR\samples\qdate.rex"' "$INSTDIR\rexx.exe" + ${AddItem} "$SMPROGRAMS\${LONGNAME}\${SHORTNAME} Samples\Quick Date.lnk" CreateShortCut "$SMPROGRAMS\${LONGNAME}\${SHORTNAME} Samples\Quick Time.lnk" "$INSTDIR\rexxpaws.exe" '"$INSTDIR\samples\qtime.rex"' "$INSTDIR\rexx.exe" + ${AddItem} "$SMPROGRAMS\${LONGNAME}\${SHORTNAME} Samples\Quick Time.lnk" CreateShortCut "$SMPROGRAMS\${LONGNAME}\${SHORTNAME} Samples\Display Event Log.lnk" "$INSTDIR\rexxpaws.exe" '"$INSTDIR\samples\winsystem\eventlog.rex"' "$INSTDIR\rexx.exe" + ${AddItem} "$SMPROGRAMS\${LONGNAME}\${SHORTNAME} Samples\Display Event Log.lnk" CreateShortCut "$SMPROGRAMS\${LONGNAME}\${SHORTNAME} Samples\Display Drive Info.lnk" "$INSTDIR\rexxpaws.exe" '"$INSTDIR\samples\drives.rex"' "$INSTDIR\rexx.exe" + ${AddItem} "$SMPROGRAMS\${LONGNAME}\${SHORTNAME} Samples\Display Drive Info.lnk" CreateShortCut "$SMPROGRAMS\${LONGNAME}\${SHORTNAME} Samples\Windows Manager.lnk" "$INSTDIR\rexxhide.exe" '"$INSTDIR\samples\winsystem\usewmgr.rex"' "$INSTDIR\rexx.exe" + ${AddItem} "$SMPROGRAMS\${LONGNAME}\${SHORTNAME} Samples\Windows Manager.lnk" CreateShortCut "$SMPROGRAMS\${LONGNAME}\${SHORTNAME} Samples\MS Access.lnk" "$INSTDIR\rexxpaws.exe" '"$INSTDIR\samples\ole\apps\MSAccessDemo.rex"' "$INSTDIR\rexx.exe" + ${AddItem} "$SMPROGRAMS\${LONGNAME}\${SHORTNAME} Samples\MS Access.lnk" ; ; OOdialog samples ; - SetOutPath $INSTDIR\samples\oodialog + ${SetOutPath} $INSTDIR\samples\oodialog ; Distribution files... - File "${SRCDIR}\extensions\platform\windows\oodialog\oodialog.ico" - File "${BINDIR}\oodialog.cls" - File "${BINDIR}\oodwin32.cls" - File "${BINDIR}\oodplain.cls" - File "${SRCDIR}\samples\windows\oodialog\*.rex" - File "${SRCDIR}\samples\windows\oodialog\*.inp" - File "${SRCDIR}\samples\windows\oodialog\*.ico" + ${File} "${SRCDIR}\extensions\platform\windows\oodialog\" "oodialog.ico" + ${File} "${BINDIR}\" "oodialog.cls" + ${File} "${BINDIR}\" "oodwin32.cls" + ${File} "${BINDIR}\" "oodplain.cls" + ${File} "${SRCDIR}\samples\windows\oodialog\" "*.rex" + ${File} "${SRCDIR}\samples\windows\oodialog\" "*.inp" + ${File} "${SRCDIR}\samples\windows\oodialog\" "*.ico" ; Set output path to the installation directory. - SetOutPath $INSTDIR\samples\oodialog\bmp + ${SetOutPath} $INSTDIR\samples\oodialog\bmp ; Distribution files... - File "${SRCDIR}\samples\windows\oodialog\bmp\*.bmp" + ${File} "${SRCDIR}\samples\windows\oodialog\bmp\" "*.bmp" ; Set output path to the installation directory. - SetOutPath $INSTDIR\samples\oodialog\rc + ${SetOutPath} $INSTDIR\samples\oodialog\rc ; Distribution files... - File "${SRCDIR}\samples\windows\oodialog\rc\*.rc" + ${File} "${SRCDIR}\samples\windows\oodialog\rc\" "*.rc" ; Set output path to the installation directory. - SetOutPath $INSTDIR\samples\oodialog\res + ${SetOutPath} $INSTDIR\samples\oodialog\res ; Distribution files... - File "${SRCDIR}\samples\windows\oodialog\res\*.res" - File "${SRCDIR}\samples\windows\oodialog\res\*.dll" + ${File} "${SRCDIR}\samples\windows\oodialog\res\" "*.res" + ${File} "${SRCDIR}\samples\windows\oodialog\res\" "*.dll" ; Set output path to the installation directory. - SetOutPath $INSTDIR\samples\oodialog\wav + ${SetOutPath} $INSTDIR\samples\oodialog\wav ; Distribution files... - File "${SRCDIR}\samples\windows\oodialog\wav\*.wav" - File "${SRCDIR}\samples\windows\oodialog\wav\*.txt" + ${File} "${SRCDIR}\samples\windows\oodialog\wav\" "*.wav" + ${File} "${SRCDIR}\samples\windows\oodialog\wav\" "*.txt" ; Set output path to the installation directory. - SetOutPath $INSTDIR\samples\oodialog\examples + ${SetOutPath} $INSTDIR\samples\oodialog\examples ; Distribution files... - File "${SRCDIR}\samples\windows\oodialog\examples\*.rex" - File "${SRCDIR}\samples\windows\oodialog\examples\*.txt" + ${File} "${SRCDIR}\samples\windows\oodialog\examples\" "*.rex" + ${File} "${SRCDIR}\samples\windows\oodialog\examples\" "*.txt" ; Set output path to the installation directory. - SetOutPath $INSTDIR\samples\oodialog\examples\resources + ${SetOutPath} $INSTDIR\samples\oodialog\examples\resources ; Distribution files... - File "${SRCDIR}\samples\windows\oodialog\examples\resources\*.bmp" - File "${SRCDIR}\samples\windows\oodialog\examples\resources\*.h" - File "${SRCDIR}\samples\windows\oodialog\examples\resources\*.rc" + ${File} "${SRCDIR}\samples\windows\oodialog\examples\resources\" "*.bmp" + ${File} "${SRCDIR}\samples\windows\oodialog\examples\resources\" "*.h" + ${File} "${SRCDIR}\samples\windows\oodialog\examples\resources\" "*.rc" ; Set output path to the installation directory. - SetOutPath $INSTDIR\samples\oodialog\tutorial + ${SetOutPath} $INSTDIR\samples\oodialog\tutorial ; Distribution files... - File "${SRCDIR}\samples\windows\oodialog\tutorial\*.rex" - File "${SRCDIR}\samples\windows\oodialog\tutorial\*.bmp" - File "${SRCDIR}\samples\windows\oodialog\tutorial\*.rc" + ${File} "${SRCDIR}\samples\windows\oodialog\tutorial\" "*.rex" + ${File} "${SRCDIR}\samples\windows\oodialog\tutorial\" "*.bmp" + ${File} "${SRCDIR}\samples\windows\oodialog\tutorial\" "*.rc" ; Set output path to the installation directory. - SetOutPath $INSTDIR\samples\oodialog\source + ${SetOutPath} $INSTDIR\samples\oodialog\source ; Distribution files... - File "${BINDIR}\oodialog.cls" - File "${BINDIR}\oodwin32.cls" - File "${BINDIR}\oodplain.cls" - File "${SRCDIR}\extensions\platform\windows\oodialog\advctrl.cls" - File "${SRCDIR}\extensions\platform\windows\oodialog\anibuttn.cls" - File "${SRCDIR}\extensions\platform\windows\oodialog\basedlg.cls" - File "${SRCDIR}\extensions\platform\windows\oodialog\build.rex" - File "${SRCDIR}\extensions\platform\windows\oodialog\catdlg.cls" - File "${SRCDIR}\extensions\platform\windows\oodialog\dialog.cls" - File "${SRCDIR}\extensions\platform\windows\oodialog\dlgext.cls" - File "${SRCDIR}\extensions\platform\windows\oodialog\dyndlg.cls" - File "${SRCDIR}\extensions\platform\windows\oodialog\makedll.bat" - File "${SRCDIR}\extensions\platform\windows\oodialog\msgext.cls" - File "${SRCDIR}\extensions\platform\windows\oodialog\oodutils.cls" - File "${SRCDIR}\extensions\platform\windows\oodialog\plbdlg.cls" - File "${SRCDIR}\extensions\platform\windows\oodialog\pludlg.cls" - File "${SRCDIR}\extensions\platform\windows\oodialog\propsht.cls" - File "${SRCDIR}\extensions\platform\windows\oodialog\resdlg.cls" - File "${SRCDIR}\extensions\platform\windows\oodialog\stddlg.cls" - File "${SRCDIR}\extensions\platform\windows\oodialog\stdext.cls" - File "${SRCDIR}\extensions\platform\windows\oodialog\userdlg.cls" + ${File} "${BINDIR}\" "oodialog.cls" + ${File} "${BINDIR}\" "oodwin32.cls" + ${File} "${BINDIR}\" "oodplain.cls" + ${File} "${SRCDIR}\extensions\platform\windows\oodialog\" "advctrl.cls" + ${File} "${SRCDIR}\extensions\platform\windows\oodialog\" "anibuttn.cls" + ${File} "${SRCDIR}\extensions\platform\windows\oodialog\" "basedlg.cls" + ${File} "${SRCDIR}\extensions\platform\windows\oodialog\" "build.rex" + ${File} "${SRCDIR}\extensions\platform\windows\oodialog\" "catdlg.cls" + ${File} "${SRCDIR}\extensions\platform\windows\oodialog\" "dialog.cls" + ${File} "${SRCDIR}\extensions\platform\windows\oodialog\" "dlgext.cls" + ${File} "${SRCDIR}\extensions\platform\windows\oodialog\" "dyndlg.cls" + ${File} "${SRCDIR}\extensions\platform\windows\oodialog\" "makedll.bat" + ${File} "${SRCDIR}\extensions\platform\windows\oodialog\" "msgext.cls" + ${File} "${SRCDIR}\extensions\platform\windows\oodialog\" "oodutils.cls" + ${File} "${SRCDIR}\extensions\platform\windows\oodialog\" "plbdlg.cls" + ${File} "${SRCDIR}\extensions\platform\windows\oodialog\" "pludlg.cls" + ${File} "${SRCDIR}\extensions\platform\windows\oodialog\" "propsht.cls" + ${File} "${SRCDIR}\extensions\platform\windows\oodialog\" "resdlg.cls" + ${File} "${SRCDIR}\extensions\platform\windows\oodialog\" "stddlg.cls" + ${File} "${SRCDIR}\extensions\platform\windows\oodialog\" "stdext.cls" + ${File} "${SRCDIR}\extensions\platform\windows\oodialog\" "userdlg.cls" ; Create start menu shortcuts SetOutPath $INSTDIR\samples\oodialog - CreateDirectory "$SMPROGRAMS\${LONGNAME}\${SHORTNAME} Samples\OODialog" + ${CreateDirectory} "$SMPROGRAMS\${LONGNAME}\${SHORTNAME} Samples\OODialog" CreateShortCut "$SMPROGRAMS\${LONGNAME}\${SHORTNAME} Samples\OODialog\Samples.lnk" "$INSTDIR\rexxhide.exe" '"$INSTDIR\samples\oodialog\sample.rex"' "$INSTDIR\samples\oodialog\oodialog.ico" + ${AddItem} "$SMPROGRAMS\${LONGNAME}\${SHORTNAME} Samples\OODialog\Samples.lnk" CreateShortCut "$SMPROGRAMS\${LONGNAME}\${SHORTNAME} Samples\OODialog\Calculator.lnk" "$INSTDIR\rexxhide.exe" '"$INSTDIR\samples\oodialog\calculator.rex"' "$INSTDIR\samples\oodialog\oodialog.ico" + ${AddItem} "$SMPROGRAMS\${LONGNAME}\${SHORTNAME} Samples\OODialog\Calculator.lnk" CreateShortCut "$SMPROGRAMS\${LONGNAME}\${SHORTNAME} Samples\OODialog\Change Editor.lnk" "$INSTDIR\rexxhide.exe" '"$INSTDIR\samples\oodialog\editrex.rex"' "$INSTDIR\samples\oodialog\oodialog.ico" + ${AddItem} "$SMPROGRAMS\${LONGNAME}\${SHORTNAME} Samples\OODialog\Change Editor.lnk" CreateShortCut "$SMPROGRAMS\${LONGNAME}\${SHORTNAME} Samples\OODialog\FTYPE Changer.lnk" "$INSTDIR\rexxhide.exe" '"$INSTDIR\samples\oodialog\ftyperex.rex"' "$INSTDIR\samples\oodialog\oodialog.ico" + ${AddItem} "$SMPROGRAMS\${LONGNAME}\${SHORTNAME} Samples\OODialog\FTYPE Changer.lnk" SectionEnd ;------------------------------------------------------------------------ @@ -375,78 +434,81 @@ Section "${LONGNAME} Development Kit" SecDev DetailPrint "********** Development Kit **********" ; Set output path to the installation directory. - SetOutPath $INSTDIR\api + ${SetOutPath} $INSTDIR\api ; Distribution files... - File "${BINDIR}\rexx.lib" - File "${BINDIR}\rexxapi.lib" - File "${SRCDIR}\api\oorexxapi.h" - File "${SRCDIR}\api\rexx.h" - File "${SRCDIR}\api\oorexxerrors.h" - File "${SRCDIR}\api\rexxapidefs.h" - File "${SRCDIR}\api\platform\windows\rexxapitypes.h" - File "${SRCDIR}\api\platform\windows\rexxplatformapis.h" - File "${SRCDIR}\api\platform\windows\rexxplatformdefs.h" - File "${SRCDIR}\samples\windows\readme.txt" + ${File} "${BINDIR}\" "rexx.lib" + ${File} "${BINDIR}\" "rexxapi.lib" + ${File} "${SRCDIR}\api\" "oorexxapi.h" + ${File} "${SRCDIR}\api\" "rexx.h" + ${File} "${SRCDIR}\api\" "oorexxerrors.h" + ${File} "${SRCDIR}\api\" "rexxapidefs.h" + ${File} "${SRCDIR}\api\platform\windows\" "rexxapitypes.h" + ${File} "${SRCDIR}\api\platform\windows\" "rexxplatformapis.h" + ${File} "${SRCDIR}\api\platform\windows\" "rexxplatformdefs.h" + ${File} "${SRCDIR}\samples\windows\" "readme.txt" ; Set output path to the installation directory. - SetOutPath $INSTDIR\api\callrxnt + ${SetOutPath} $INSTDIR\api\callrxnt ; Distribution files... - File "${SRCDIR}\samples\windows\api\callrxnt\*.fnc" - File "${SRCDIR}\samples\windows\api\callrxnt\*.c" - File "${SRCDIR}\samples\windows\api\callrxnt\*.ico" - File "${SRCDIR}\samples\windows\api\callrxnt\*.mak" - File "${SRCDIR}\samples\windows\api\callrxnt\*.exe" + ${File} "${SRCDIR}\samples\windows\api\callrxnt\" "*.fnc" + ${File} "${SRCDIR}\samples\windows\api\callrxnt\" "*.c" + ${File} "${SRCDIR}\samples\windows\api\callrxnt\" "*.ico" + ${File} "${SRCDIR}\samples\windows\api\callrxnt\" "*.mak" + ${File} "${SRCDIR}\samples\windows\api\callrxnt\" "*.exe" ; Set output path to the installation directory. - SetOutPath $INSTDIR\api\callrxwn + ${SetOutPath} $INSTDIR\api\callrxwn ; Distribution files... - File "${SRCDIR}\samples\windows\api\callrxwn\*.fnc" - File "${SRCDIR}\samples\windows\api\callrxwn\*.c" - File "${SRCDIR}\samples\windows\api\callrxwn\*.h" - File "${SRCDIR}\samples\windows\api\callrxwn\*.ico" - File "${SRCDIR}\samples\windows\api\callrxwn\*.mak" - File "${SRCDIR}\samples\windows\api\callrxwn\*.exe" - File "${SRCDIR}\samples\windows\api\callrxwn\*.rc" + ${File} "${SRCDIR}\samples\windows\api\callrxwn\" "*.fnc" + ${File} "${SRCDIR}\samples\windows\api\callrxwn\" "*.c" + ${File} "${SRCDIR}\samples\windows\api\callrxwn\" "*.h" + ${File} "${SRCDIR}\samples\windows\api\callrxwn\" "*.ico" + ${File} "${SRCDIR}\samples\windows\api\callrxwn\" "*.mak" + ${File} "${SRCDIR}\samples\windows\api\callrxwn\" "*.exe" + ${File} "${SRCDIR}\samples\windows\api\callrxwn\" "*.rc" ; Set output path to the installation directory. - SetOutPath $INSTDIR\api\rexxexit + ${SetOutPath} $INSTDIR\api\rexxexit ; Distribution files... - File "${SRCDIR}\samples\windows\api\rexxexit\*.c" - File "${SRCDIR}\samples\windows\api\rexxexit\*.ico" - File "${SRCDIR}\samples\windows\api\rexxexit\*.mak" - File "${SRCDIR}\samples\windows\api\rexxexit\*.exe" - File "${SRCDIR}\samples\rexxtry.rex" + ${File} "${SRCDIR}\samples\windows\api\rexxexit\" "*.c" + ${File} "${SRCDIR}\samples\windows\api\rexxexit\" "*.ico" + ${File} "${SRCDIR}\samples\windows\api\rexxexit\" "*.mak" + ${File} "${SRCDIR}\samples\windows\api\rexxexit\" "*.exe" + ${File} "${SRCDIR}\samples\" "rexxtry.rex" ; Set output path to the installation directory. - SetOutPath $INSTDIR\api\wpipe + ${SetOutPath} $INSTDIR\api\wpipe ; Distribution files... - File "${SRCDIR}\samples\windows\api\wpipe\readme.txt" + ${File} "${SRCDIR}\samples\windows\api\wpipe\" "readme.txt" ; Set output path to the installation directory. - SetOutPath $INSTDIR\api\wpipe\wpipe1 + ${SetOutPath} $INSTDIR\api\wpipe\wpipe1 ; Distribution files... - File "${SRCDIR}\samples\windows\api\wpipe\wpipe1\*.c" - File "${SRCDIR}\samples\windows\api\wpipe\wpipe1\*.def" - File "${SRCDIR}\samples\windows\api\wpipe\wpipe1\*.rex" - File "${SRCDIR}\samples\windows\api\wpipe\wpipe1\*.mak" - File "${SRCDIR}\samples\windows\api\wpipe\wpipe1\*.dll" + ${File} "${SRCDIR}\samples\windows\api\wpipe\wpipe1\" "*.c" + ${File} "${SRCDIR}\samples\windows\api\wpipe\wpipe1\" "*.def" + ${File} "${SRCDIR}\samples\windows\api\wpipe\wpipe1\" "*.rex" + ${File} "${SRCDIR}\samples\windows\api\wpipe\wpipe1\" "*.mak" + ${File} "${SRCDIR}\samples\windows\api\wpipe\wpipe1\" "*.dll" ; Set output path to the installation directory. - SetOutPath $INSTDIR\api\wpipe\wpipe2 + ${SetOutPath} $INSTDIR\api\wpipe\wpipe2 ; Distribution files... - File "${SRCDIR}\samples\windows\api\wpipe\wpipe2\*.c" - File "${SRCDIR}\samples\windows\api\wpipe\wpipe2\*.def" - File "${SRCDIR}\samples\windows\api\wpipe\wpipe2\*.rex" - File "${SRCDIR}\samples\windows\api\wpipe\wpipe2\*.mak" - File "${SRCDIR}\samples\windows\api\wpipe\wpipe2\*.dll" + ${File} "${SRCDIR}\samples\windows\api\wpipe\wpipe2\" "*.c" + ${File} "${SRCDIR}\samples\windows\api\wpipe\wpipe2\" "*.def" + ${File} "${SRCDIR}\samples\windows\api\wpipe\wpipe2\" "*.rex" + ${File} "${SRCDIR}\samples\windows\api\wpipe\wpipe2\" "*.mak" + ${File} "${SRCDIR}\samples\windows\api\wpipe\wpipe2\" "*.dll" ; Set output path to the installation directory. - SetOutPath $INSTDIR\api\wpipe\wpipe3 + ${SetOutPath} $INSTDIR\api\wpipe\wpipe3 ; Distribution files... - File "${SRCDIR}\samples\windows\api\wpipe\wpipe3\*.c" - File "${SRCDIR}\samples\windows\api\wpipe\wpipe3\*.def" - File "${SRCDIR}\samples\windows\api\wpipe\wpipe3\*.rex" - File "${SRCDIR}\samples\windows\api\wpipe\wpipe3\*.mak" - File "${SRCDIR}\samples\windows\api\wpipe\wpipe3\*.dll" + ${File} "${SRCDIR}\samples\windows\api\wpipe\wpipe3\" "*.c" + ${File} "${SRCDIR}\samples\windows\api\wpipe\wpipe3\" "*.def" + ${File} "${SRCDIR}\samples\windows\api\wpipe\wpipe3\" "*.rex" + ${File} "${SRCDIR}\samples\windows\api\wpipe\wpipe3\" "*.mak" + ${File} "${SRCDIR}\samples\windows\api\wpipe\wpipe3\" "*.dll" ; Create start menu shortcuts SetOutPath $INSTDIR\api - CreateDirectory "$SMPROGRAMS\${LONGNAME}\${SHORTNAME} Samples\API" + ${CreateDirectory} "$SMPROGRAMS\${LONGNAME}\${SHORTNAME} Samples\API" CreateShortCut "$SMPROGRAMS\${LONGNAME}\${SHORTNAME} Samples\API\Call ooRexx in a Console.lnk" "$INSTDIR\api\callrxnt\callrxnt.exe" "" "$INSTDIR\api\callrxnt\callrxnt.ico" + ${AddItem} "$SMPROGRAMS\${LONGNAME}\${SHORTNAME} Samples\API\Call ooRexx in a Console.lnk" CreateShortCut "$SMPROGRAMS\${LONGNAME}\${SHORTNAME} Samples\API\Call ooRexx in a Window.lnk" "$INSTDIR\api\callrxwn\callrxwn.exe" "" "$INSTDIR\api\callrxwn\callrxwn.ico" + ${AddItem} "$SMPROGRAMS\${LONGNAME}\${SHORTNAME} Samples\API\Call ooRexx in a Window.lnk" CreateShortCut "$SMPROGRAMS\${LONGNAME}\${SHORTNAME} Samples\API\Call ooRexx with Exits.lnk" "$INSTDIR\api\rexxexit\rexxexit.exe" "rexxtry.rex" "$INSTDIR\api\rexxexit\rexxexit.ico" + ${AddItem} "$SMPROGRAMS\${LONGNAME}\${SHORTNAME} Samples\API\Call ooRexx with Exits.lnk" SectionEnd ;------------------------------------------------------------------------ @@ -455,23 +517,29 @@ Section "${LONGNAME} Documentation" SecDoc DetailPrint "********** Documentation **********" ; Set output path to the installation directory. - SetOutPath $INSTDIR\doc - File "${SRCDIR}\doc\rexxpg.pdf" - File "${SRCDIR}\doc\rexxref.pdf" - File "${SRCDIR}\doc\rxmath.pdf" - File "${SRCDIR}\doc\rxsock.pdf" - File "${SRCDIR}\doc\rxftp.pdf" - File "${SRCDIR}\doc\oodialog.pdf" - File "${SRCDIR}\doc\winextensions.pdf" + ${SetOutPath} $INSTDIR\doc + ${File} "${SRCDIR}\doc\" "rexxpg.pdf" + ${File} "${SRCDIR}\doc\" "rexxref.pdf" + ${File} "${SRCDIR}\doc\" "rxmath.pdf" + ${File} "${SRCDIR}\doc\" "rxsock.pdf" + ${File} "${SRCDIR}\doc\" "rxftp.pdf" + ${File} "${SRCDIR}\doc\" "oodialog.pdf" + ${File} "${SRCDIR}\doc\" "winextensions.pdf" ; Create start menu shortcuts - CreateDirectory "$SMPROGRAMS\${LONGNAME}\Documentation" CreateShortCut "$SMPROGRAMS\${LONGNAME}\Documentation\ooRexx Reference.lnk" "$INSTDIR\doc\rexxref.pdf" "" "$INSTDIR\doc\rexxref.pdf" 0 + ${AddItem} "$SMPROGRAMS\${LONGNAME}\Documentation\ooRexx Reference.lnk" CreateShortCut "$SMPROGRAMS\${LONGNAME}\Documentation\ooRexx Programming Guide.lnk" "$INSTDIR\doc\rexxpg.pdf" "" "$INSTDIR\doc\rexxpg.pdf" 0 + ${AddItem} "$SMPROGRAMS\${LONGNAME}\Documentation\ooRexx Programming Guide.lnk" CreateShortCut "$SMPROGRAMS\${LONGNAME}\Documentation\ooRexx Mathematical Functions Reference.lnk" "$INSTDIR\doc\rxmath.pdf" "" "$INSTDIR\doc\rxmath.pdf" 0 + ${AddItem} "$SMPROGRAMS\${LONGNAME}\Documentation\ooRexx Mathematical Functions Reference.lnk" CreateShortCut "$SMPROGRAMS\${LONGNAME}\Documentation\ooRexx TCP-IP Sockets Functions Reference.lnk" "$INSTDIR\doc\rxsock.pdf" "" "$INSTDIR\doc\rxsock.pdf" 0 + ${AddItem} "$SMPROGRAMS\${LONGNAME}\Documentation\ooRexx TCP-IP Sockets Functions Reference.lnk" CreateShortCut "$SMPROGRAMS\${LONGNAME}\Documentation\ooRexx rxFTP Class Reference.lnk" "$INSTDIR\doc\rxftp.pdf" "" "$INSTDIR\doc\rxftp.pdf" 0 + ${AddItem} "$SMPROGRAMS\${LONGNAME}\Documentation\ooRexx rxFTP Class Reference.lnk" CreateShortCut "$SMPROGRAMS\${LONGNAME}\Documentation\ooRexx ooDIalog Method Reference.lnk" "$INSTDIR\doc\oodialog.pdf" "" "$INSTDIR\doc\oodialog.pdf" 0 + ${AddItem} "$SMPROGRAMS\${LONGNAME}\Documentation\ooRexx ooDIalog Method Reference.lnk" CreateShortCut "$SMPROGRAMS\${LONGNAME}\Documentation\ooRexx Windows Extensions Reference.lnk" "$INSTDIR\doc\winextensions.pdf" "" "$INSTDIR\doc\winextensions.pdf" 0 + ${AddItem} "$SMPROGRAMS\${LONGNAME}\Documentation\ooRexx Windows Extensions Reference.lnk" SectionEnd @@ -632,6 +700,11 @@ exitss: FunctionEnd +Section -closelogfile + FileClose $UninstLog + SetFileAttributes "$INSTDIR\${UninstLog}" READONLY|SYSTEM|HIDDEN +SectionEnd + ;======================================================================== ;Uninstaller Section @@ -688,18 +761,65 @@ Push $IsAdminUser ; "true" or "false" Call un.DeleteEnvStr - ; remove all installed files - RMDir /r "$INSTDIR" - ; Remove the installation stuff DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${SHORTNAME}" DeleteRegKey HKLM "SOFTWARE\${LONGNAME}" +; !insertmacro MUI_UNFINISHHEADER + + + ; Can't uninstall if uninstall log is missing! + IfFileExists "$INSTDIR\${UninstLog}" logExists + MessageBox MB_YESNO|MB_ICONSTOP "${UninstLog} not found!$\r$\nWould you like to remove all files under $INSTDIR?$\r$\n(WARNING! This will remove ANY folders or files put there after the last installation.)" /SD IDNO IDYES deltree + Abort + deltree: + ; remove all installed files + RMDir /r "$INSTDIR" ; remove shortcuts directory and everything in it RMDir /r "$SMPROGRAMS\${LONGNAME}" + Goto done -; !insertmacro MUI_UNFINISHHEADER + logExists: + Push $R0 + Push $R1 + Push $R2 + SetFileAttributes "$INSTDIR\${UninstLog}" NORMAL + FileOpen $UninstLog "$INSTDIR\${UninstLog}" r + StrCpy $R1 0 + GetLineCount: + ClearErrors + FileRead $UninstLog $R0 + IntOp $R1 $R1 + 1 + IfErrors 0 GetLineCount + + LoopRead: + FileSeek $UninstLog 0 SET + StrCpy $R2 0 + FindLine: + FileRead $UninstLog $R0 + IntOp $R2 $R2 + 1 + StrCmp $R1 $R2 0 FindLine + + StrCpy $R0 $R0 -2 + IfFileExists "$R0\*.*" 0 +3 + RMDir $R0 #is dir + Goto +3 + IfFileExists $R0 0 +2 + Delete $R0 #is file + + IntOp $R1 $R1 - 1 + StrCmp $R1 0 LoopDone + Goto LoopRead + LoopDone: + FileClose $UninstLog + Delete "$INSTDIR\${UninstLog}" + RMDir "$INSTDIR" + Pop $R2 + Pop $R1 + Pop $R0 + + done: SectionEnd ;======================================================================== This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mie...@us...> - 2009-02-23 18:56:04
|
Revision: 4213 http://oorexx.svn.sourceforge.net/oorexx/?rev=4213&view=rev Author: miesfeld Date: 2009-02-23 18:56:00 +0000 (Mon, 23 Feb 2009) Log Message: ----------- Fix Windows installation program so that it does not absolutely delete the installation directory on return from running the uninstall program. The installer should only delete the uninstall program and remove the directory if it is not empty. Modified Paths: -------------- main/trunk/platform/windows/install/oorexx.nsi Modified: main/trunk/platform/windows/install/oorexx.nsi =================================================================== --- main/trunk/platform/windows/install/oorexx.nsi 2009-02-23 18:40:34 UTC (rev 4212) +++ main/trunk/platform/windows/install/oorexx.nsi 2009-02-23 18:56:00 UTC (rev 4213) @@ -577,7 +577,8 @@ ExecWait '$R1 _?=$R2' IfErrors no_remove_uninstaller IfFileExists "$INSTDIR\${KEYFILE}" no_remove_uninstaller - RMDir /r "$R2" + Delete "$R2\${UNINSTALLER}" + RMDir "$R2" no_remove_uninstaller: BringToFront This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mie...@us...> - 2009-03-04 21:09:21
|
Revision: 4259 http://oorexx.svn.sourceforge.net/oorexx/?rev=4259&view=rev Author: miesfeld Date: 2009-03-04 21:09:12 +0000 (Wed, 04 Mar 2009) Log Message: ----------- Personal idiosyncrasy, use ooDialog instead of OODialog in Windows install Modified Paths: -------------- main/trunk/platform/windows/install/oorexx.nsi Modified: main/trunk/platform/windows/install/oorexx.nsi =================================================================== --- main/trunk/platform/windows/install/oorexx.nsi 2009-03-04 21:05:11 UTC (rev 4258) +++ main/trunk/platform/windows/install/oorexx.nsi 2009-03-04 21:09:12 UTC (rev 4259) @@ -418,15 +418,15 @@ ${File} "${SRCDIR}\extensions\platform\windows\oodialog\" "userdlg.cls" ; Create start menu shortcuts SetOutPath $INSTDIR\samples\oodialog - ${CreateDirectory} "$SMPROGRAMS\${LONGNAME}\${SHORTNAME} Samples\OODialog" - CreateShortCut "$SMPROGRAMS\${LONGNAME}\${SHORTNAME} Samples\OODialog\Samples.lnk" "$INSTDIR\rexxhide.exe" '"$INSTDIR\samples\oodialog\sample.rex"' "$INSTDIR\samples\oodialog\oodialog.ico" - ${AddItem} "$SMPROGRAMS\${LONGNAME}\${SHORTNAME} Samples\OODialog\Samples.lnk" - CreateShortCut "$SMPROGRAMS\${LONGNAME}\${SHORTNAME} Samples\OODialog\Calculator.lnk" "$INSTDIR\rexxhide.exe" '"$INSTDIR\samples\oodialog\calculator.rex"' "$INSTDIR\samples\oodialog\oodialog.ico" - ${AddItem} "$SMPROGRAMS\${LONGNAME}\${SHORTNAME} Samples\OODialog\Calculator.lnk" - CreateShortCut "$SMPROGRAMS\${LONGNAME}\${SHORTNAME} Samples\OODialog\Change Editor.lnk" "$INSTDIR\rexxhide.exe" '"$INSTDIR\samples\oodialog\editrex.rex"' "$INSTDIR\samples\oodialog\oodialog.ico" - ${AddItem} "$SMPROGRAMS\${LONGNAME}\${SHORTNAME} Samples\OODialog\Change Editor.lnk" - CreateShortCut "$SMPROGRAMS\${LONGNAME}\${SHORTNAME} Samples\OODialog\FTYPE Changer.lnk" "$INSTDIR\rexxhide.exe" '"$INSTDIR\samples\oodialog\ftyperex.rex"' "$INSTDIR\samples\oodialog\oodialog.ico" - ${AddItem} "$SMPROGRAMS\${LONGNAME}\${SHORTNAME} Samples\OODialog\FTYPE Changer.lnk" + ${CreateDirectory} "$SMPROGRAMS\${LONGNAME}\${SHORTNAME} Samples\ooDialog" + CreateShortCut "$SMPROGRAMS\${LONGNAME}\${SHORTNAME} Samples\ooDialog\Samples.lnk" "$INSTDIR\rexxhide.exe" '"$INSTDIR\samples\oodialog\sample.rex"' "$INSTDIR\samples\oodialog\oodialog.ico" + ${AddItem} "$SMPROGRAMS\${LONGNAME}\${SHORTNAME} Samples\ooDialog\Samples.lnk" + CreateShortCut "$SMPROGRAMS\${LONGNAME}\${SHORTNAME} Samples\ooDialog\Calculator.lnk" "$INSTDIR\rexxhide.exe" '"$INSTDIR\samples\oodialog\calculator.rex"' "$INSTDIR\samples\oodialog\oodialog.ico" + ${AddItem} "$SMPROGRAMS\${LONGNAME}\${SHORTNAME} Samples\ooDialog\Calculator.lnk" + CreateShortCut "$SMPROGRAMS\${LONGNAME}\${SHORTNAME} Samples\ooDialog\Change Editor.lnk" "$INSTDIR\rexxhide.exe" '"$INSTDIR\samples\oodialog\editrex.rex"' "$INSTDIR\samples\oodialog\oodialog.ico" + ${AddItem} "$SMPROGRAMS\${LONGNAME}\${SHORTNAME} Samples\ooDialog\Change Editor.lnk" + CreateShortCut "$SMPROGRAMS\${LONGNAME}\${SHORTNAME} Samples\ooDialog\FTYPE Changer.lnk" "$INSTDIR\rexxhide.exe" '"$INSTDIR\samples\oodialog\ftyperex.rex"' "$INSTDIR\samples\oodialog\oodialog.ico" + ${AddItem} "$SMPROGRAMS\${LONGNAME}\${SHORTNAME} Samples\ooDialog\FTYPE Changer.lnk" SectionEnd ;------------------------------------------------------------------------ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mie...@us...> - 2009-04-22 23:35:01
|
Revision: 4479 http://oorexx.svn.sourceforge.net/oorexx/?rev=4479&view=rev Author: miesfeld Date: 2009-04-22 23:34:51 +0000 (Wed, 22 Apr 2009) Log Message: ----------- [2775749] Vista - after install warning from OS Modified Paths: -------------- main/trunk/platform/windows/install/oorexx.nsi Modified: main/trunk/platform/windows/install/oorexx.nsi =================================================================== --- main/trunk/platform/windows/install/oorexx.nsi 2009-04-22 23:19:15 UTC (rev 4478) +++ main/trunk/platform/windows/install/oorexx.nsi 2009-04-22 23:34:51 UTC (rev 4479) @@ -92,6 +92,7 @@ ShowInstdetails show SetOverwrite on SetPluginUnload alwaysoff + RequestExecutionLevel admin ;Folder-select dialog InstallDir "$PROGRAMFILES\${SHORTNAME}" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mie...@us...> - 2009-04-23 00:36:13
|
Revision: 4481 http://oorexx.svn.sourceforge.net/oorexx/?rev=4481&view=rev Author: miesfeld Date: 2009-04-23 00:36:10 +0000 (Thu, 23 Apr 2009) Log Message: ----------- [2775712] No stop rxapi confirmation box on Vista Modified Paths: -------------- main/trunk/platform/windows/install/oorexx.nsi Modified: main/trunk/platform/windows/install/oorexx.nsi =================================================================== --- main/trunk/platform/windows/install/oorexx.nsi 2009-04-23 00:35:18 UTC (rev 4480) +++ main/trunk/platform/windows/install/oorexx.nsi 2009-04-23 00:36:10 UTC (rev 4481) @@ -652,17 +652,28 @@ Function CheckForRxAPI ; - ; Determines if rxapi.exe is running + ; Determines if rxapi.exe is running. On Vista, FindProcDll does not work. + ; Rather than fix FindProcDll, (easy to do, but I'm not sure of its license,) + ; we first check if it is running as a service. If so, we stop it. + ; StrCmp $rxapichk 1 NotRunning StrCpy $rxapichk 1 + services::IsServiceRunning 'RXAPI' + Pop $R0 + StrCmp $R0 'Yes' ServiceIsRunning + ; Try FindProcDLL FindProcDLL::FindProc "rxapi.exe" - DetailPrint "rc from FindProcDll $R0" StrCmp $R0 0 NotRunning ; ; rxapi.exe is running, we need to stop it + ServiceIsRunning: MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION|MB_TOPMOST "The Open Object Rexx memory manager (RXAPI) is currently active.$\nSelect OK to stop it (possible loss of data) and continue.$\nSelect CANCEL to continue with the installation without stopping the memory manager." /SD IDOK IDCANCEL NotRunning ; - ; Stop rxapi.exe + ; Stop rxapi.exe. Send the service stop command first. If it is not a + ; service, we don't care, just try kill. + Services::SendServiceCommand 'stop' 'RXAPI' + Pop $R0 + StrCmp $R0 'Ok' NotRunning KillProcDLL::KillProc "rxapi.exe" DetailPrint "rc from KillProcDll $R0" @@ -902,19 +913,29 @@ Function un.CheckForRxAPI ; - ; Determines if rxapi.exe is running + ; Determines if rxapi.exe is running. On Vista, FindProcDll does not work. + ; Rather than fix FindProcDll, (easy to do, but I'm not sure of its license,) + ; we first check if it is running as a service. If so, we stop it. + ; StrCmp $rxapichk 1 NotRunning StrCpy $rxapichk 1 + services::IsServiceRunning 'RXAPI' + Pop $R0 + StrCmp $R0 'Yes' ServiceIsRunning + ; Try FindProcDLL FindProcDLL::FindProc "rxapi.exe" - DetailPrint "rc from FindProcDll $R0" StrCmp $R0 0 NotRunning ; ; rxapi.exe is running, we need to stop it + ServiceIsRunning: MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION|MB_TOPMOST "The Open Object Rexx memory manager (RXAPI) is currently active.$\nSelect OK to stop it (possible loss of data) and continue.$\nSelect CANCEL to continue with the uninstall without stopping the service." /SD IDOK IDCANCEL NotRunning ; - ; Stop rxapi.exe + ; Stop rxapi.exe. Send the service stop command first. If it is not a + ; service, we don't care, just try kill. + Services::SendServiceCommand 'stop' 'RXAPI' + Pop $R0 + StrCmp $R0 'Ok' NotRunning KillProcDLL::KillProc "rxapi.exe" - DetailPrint "rc from KillProcDll $R0" NotRunning: FunctionEnd This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mie...@us...> - 2009-05-11 00:14:20
|
Revision: 4628 http://oorexx.svn.sourceforge.net/oorexx/?rev=4628&view=rev Author: miesfeld Date: 2009-05-11 00:12:20 +0000 (Mon, 11 May 2009) Log Message: ----------- Add code to the installer that sets up the .rex file association for a non-admin install. Previously I guess we assumed this couldn't be done. Beginning with W2K, Microsoft has provided a mechanism for users to write their own personal file associations that over-ride the system-wide settings. This area of the registry is writeable by any user. So, the installer can write the file association settings here if it fails to write to the system-wide area. Modified Paths: -------------- main/trunk/platform/windows/install/oorexx.nsi Modified: main/trunk/platform/windows/install/oorexx.nsi =================================================================== --- main/trunk/platform/windows/install/oorexx.nsi 2009-05-10 23:48:28 UTC (rev 4627) +++ main/trunk/platform/windows/install/oorexx.nsi 2009-05-11 00:12:20 UTC (rev 4628) @@ -245,7 +245,6 @@ Push 1 Push ".REX" Call DoFileAssociation - Call DoFileAssociationDetails ; read the result of the custom rxapi page if an administrator StrCmp $IsAdminUser "false" NotAdmin @@ -704,36 +703,52 @@ Strcmp $R1 "" exitfa ; do the association DetailPrint "Registering $R1 extension to run with ooRexx" + ClearErrors WriteRegStr HKCR $R1 "" "REXXScript" + IfErrors trycurrentuser ; Failed to write to the registy, try the user customizable area. + WriteRegStr HKCR "REXXScript" "" "ooRexx Rexx Program" + WriteRegStr HKCR "REXXScript\shell" "" "open" + WriteRegStr HKCR "REXXScript\DefaultIcon" "" "$INSTDIR\rexx.exe,0" + WriteRegStr HKCR "REXXScript\shell\open" "" "Run" + WriteRegStr HKCR "REXXScript\shell\open\command" "" '"$INSTDIR\rexx.exe" "%1" %*' + WriteRegStr HKCR "REXXScript\shell\edit" "" "Edit" + WriteRegStr HKCR "REXXScript\shell\edit\command" "" 'notepad.exe "%1"' + WriteRegStr HKCR "REXXScript\shellex\DropHandler" "" "{60254CA5-953B-11CF-8C96-00AA00B8708C}" ; ; Append $R1 to .PATHEXT for NT-based systems, for Administrators only ; Call IsNT Pop $1 - StrCmp $1 0 exitfa - StrCmp $IsAdminUser "false" exitfa + StrCmp $1 0 notifyshell + StrCmp $IsAdminUser "false" notifyshell Push $R1 Push $IsAdminUser ; should only be "true" at this point Push "PATHEXT" Call AddToPath + Goto notifyshell + ; + trycurrentuser: All users can write to this location to set up custom file + ; associations. Any association in this area over-rides the + ; system wide file association, for this user. If there is + ; an error, there is nothing to do about and it is just ignored. + ; + WriteRegStr HKCU "SOFTWARE\Classes\$R1" "" "REXXScript" + WriteRegStr HKCU "SOFTWARE\Classes\REXXScript" "" "ooRexx Rexx Program" + WriteRegStr HKCU "SOFTWARE\Classes\REXXScript\shell" "" "open" + WriteRegStr HKCU "SOFTWARE\Classes\REXXScript\DefaultIcon" "" "$INSTDIR\rexx.exe,0" + WriteRegStr HKCU "SOFTWARE\Classes\REXXScript\shell\open" "" "Run" + WriteRegStr HKCU "SOFTWARE\Classes\REXXScript\shell\open\command" "" '"$INSTDIR\rexx.exe" "%1" %*' + WriteRegStr HKCU "SOFTWARE\Classes\REXXScript\shell\edit" "" "Edit" + WriteRegStr HKCU "SOFTWARE\Classes\REXXScript\shell\edit\command" "" 'notepad.exe "%1"' + WriteRegStr HKCU "SOFTWARE\Classes\REXXScript\shellex\DropHandler" "" "{60254CA5-953B-11CF-8C96-00AA00B8708C}" + ; + notifyshell: + ; + System::Call 'Shell32::SHChangeNotify(i ${SHCNE_ASSOCCHANGED}, i ${SHCNF_IDLIST}, i 0, i 0)' exitfa: Return FunctionEnd -Function DoFileAssociationDetails - ; do the association details - WriteRegStr HKCR "REXXScript" "" "ooRexx Rexx Program" - WriteRegStr HKCR "REXXScript\shell" "" "open" - WriteRegStr HKCR "REXXScript\DefaultIcon" "" "$INSTDIR\rexx.exe,0" - WriteRegStr HKCR "REXXScript\shell\open" "" "Run" - WriteRegStr HKCR "REXXScript\shell\open\command" "" '"$INSTDIR\rexx.exe" "%1" %*' - WriteRegStr HKCR "REXXScript\shell\edit" "" "Edit" - WriteRegStr HKCR "REXXScript\shell\edit\command" "" 'notepad.exe "%1"' - WriteRegStr HKCR "REXXScript\shellex\DropHandler" "" "{60254CA5-953B-11CF-8C96-00AA00B8708C}" - System::Call 'Shell32::SHChangeNotify(i ${SHCNE_ASSOCCHANGED}, i ${SHCNF_IDLIST}, i 0, i 0)' - Return -FunctionEnd - Function Installrxapi ; $R1 is start flag ; $R0 is install flag @@ -765,6 +780,11 @@ ;======================================================================== ;Uninstaller Section +; +; Not this: If the install was done by a non-admin user, the .rex file association may have been written +; to the HKEY_CURRENT_USER\SOFTWARE\Classes area. You would think that we need to check for +; that and specifically delete those keys. However, testing shows that the current code always +; removes those keys. Tested on a number of machines with a number of different users. Section "Uninstall" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mie...@us...> - 2009-05-11 18:47:03
|
Revision: 4635 http://oorexx.svn.sourceforge.net/oorexx/?rev=4635&view=rev Author: miesfeld Date: 2009-05-11 18:46:50 +0000 (Mon, 11 May 2009) Log Message: ----------- Fix typo Modified Paths: -------------- main/trunk/platform/windows/install/oorexx.nsi Modified: main/trunk/platform/windows/install/oorexx.nsi =================================================================== --- main/trunk/platform/windows/install/oorexx.nsi 2009-05-11 18:46:16 UTC (rev 4634) +++ main/trunk/platform/windows/install/oorexx.nsi 2009-05-11 18:46:50 UTC (rev 4635) @@ -727,7 +727,8 @@ Call AddToPath Goto notifyshell ; - trycurrentuser: All users can write to this location to set up custom file + trycurrentuser: + ; All users can write to this location to set up custom file ; associations. Any association in this area over-rides the ; system wide file association, for this user. If there is ; an error, there is nothing to do about and it is just ignored. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mie...@us...> - 2009-09-05 18:19:45
|
Revision: 5149 http://oorexx.svn.sourceforge.net/oorexx/?rev=5149&view=rev Author: miesfeld Date: 2009-09-05 18:19:31 +0000 (Sat, 05 Sep 2009) Log Message: ----------- 2852483 ooDialog class files should not be placed with samples Modified Paths: -------------- main/trunk/platform/windows/install/oorexx.nsi Modified: main/trunk/platform/windows/install/oorexx.nsi =================================================================== --- main/trunk/platform/windows/install/oorexx.nsi 2009-09-05 17:32:34 UTC (rev 5148) +++ main/trunk/platform/windows/install/oorexx.nsi 2009-09-05 18:19:31 UTC (rev 5149) @@ -378,9 +378,6 @@ ${SetOutPath} $INSTDIR\samples\oodialog ; Distribution files... ${File} "${SRCDIR}\extensions\platform\windows\oodialog\" "oodialog.ico" - ${File} "${BINDIR}\" "oodialog.cls" - ${File} "${BINDIR}\" "oodwin32.cls" - ${File} "${BINDIR}\" "oodplain.cls" ${File} "${SRCDIR}\samples\windows\oodialog\" "*.rex" ${File} "${SRCDIR}\samples\windows\oodialog\" "*.inp" ${File} "${SRCDIR}\samples\windows\oodialog\" "*.ico" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mie...@us...> - 2009-12-28 03:47:10
|
Revision: 5463 http://oorexx.svn.sourceforge.net/oorexx/?rev=5463&view=rev Author: miesfeld Date: 2009-12-28 03:47:03 +0000 (Mon, 28 Dec 2009) Log Message: ----------- Include the new ooDialog samples in the distribution Modified Paths: -------------- main/trunk/platform/windows/install/oorexx.nsi Modified: main/trunk/platform/windows/install/oorexx.nsi =================================================================== --- main/trunk/platform/windows/install/oorexx.nsi 2009-12-28 01:58:12 UTC (rev 5462) +++ main/trunk/platform/windows/install/oorexx.nsi 2009-12-28 03:47:03 UTC (rev 5463) @@ -386,6 +386,13 @@ ; Distribution files... ${File} "${SRCDIR}\samples\windows\oodialog\bmp\" "*.bmp" ; Set output path to the installation directory. + ${SetOutPath} $INSTDIR\samples\oodialog\controls + ; Distribution files... + ${File} "${SRCDIR}\samples\windows\oodialog\controls\" "*.rex" + ${File} "${SRCDIR}\samples\windows\oodialog\controls\" "*.rc" + ${File} "${SRCDIR}\samples\windows\oodialog\controls\" "*.h" + ${File} "${SRCDIR}\samples\windows\oodialog\controls\" "*.txt" + ; Set output path to the installation directory. ${SetOutPath} $INSTDIR\samples\oodialog\examples ; Distribution files... ${File} "${SRCDIR}\samples\windows\oodialog\examples\" "*.rex" @@ -406,6 +413,10 @@ ${File} "${SRCDIR}\samples\windows\oodialog\res\" "*.res" ${File} "${SRCDIR}\samples\windows\oodialog\res\" "*.dll" ; Set output path to the installation directory. + ${SetOutPath} $INSTDIR\samples\oodialog\simple + ; Distribution files... + ${File} "${SRCDIR}\samples\windows\oodialog\simple\" "*.rex" + ; Set output path to the installation directory. ${SetOutPath} $INSTDIR\samples\oodialog\wav ; Distribution files... ${File} "${SRCDIR}\samples\windows\oodialog\wav\" "*.wav" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mie...@us...> - 2010-03-14 20:21:48
|
Revision: 5701 http://oorexx.svn.sourceforge.net/oorexx/?rev=5701&view=rev Author: miesfeld Date: 2010-03-14 20:21:42 +0000 (Sun, 14 Mar 2010) Log Message: ----------- Patch [2970136] Upgrade installer to MUI2 interface, patch supplied by Brandon Cherry Modified Paths: -------------- main/trunk/platform/windows/install/oorexx.nsi Modified: main/trunk/platform/windows/install/oorexx.nsi =================================================================== --- main/trunk/platform/windows/install/oorexx.nsi 2010-03-14 19:56:39 UTC (rev 5700) +++ main/trunk/platform/windows/install/oorexx.nsi 2010-03-14 20:21:42 UTC (rev 5701) @@ -21,7 +21,7 @@ Name "${LONGNAME} ${VERSION}" -!include "MUI.nsh" +!include "MUI2.nsh" !include "Library.nsh" !define MUI_CUSTOMPAGECOMMANDS @@ -96,9 +96,6 @@ ;Folder-select dialog InstallDir "$PROGRAMFILES\${SHORTNAME}" - - LangString TEXT_IO_PAGETITLE_RXAPI ${LANG_ENGLISH} "The ooRexx rxapi process" - LangString TEXT_IO_SUBTITLE_RXAPI ${LANG_ENGLISH} "Install rxapi as a Windows Service" ;-------------------------------- ;Pages @@ -109,7 +106,7 @@ !insertmacro MUI_PAGE_DIRECTORY ; Page custom SetCustomAssoc ; Page custom SetCustomLanguage - Page custom SetCustomRxAPI + Page custom SetCustomRxAPI SetCustomRxAPILeave !insertmacro MUI_PAGE_INSTFILES !insertmacro MUI_PAGE_FINISH @@ -125,13 +122,16 @@ ;-------------------------------- ;Reserved files - ReserveFile "oorexx_ss.ini" - !insertmacro MUI_RESERVEFILE_INSTALLOPTIONS - ;-------------------------------- ; Variables Var rxapichk Var IsAdminUser +Var RxAPIDialog +Var RxAPILabel +Var RxAPICheckBoxInstall +Var RxAPIInstall +Var RxAPICheckBoxStart +Var RxAPIStart ;======================================================================== ;Installer Sections @@ -251,10 +251,7 @@ ; read the result of the custom rxapi page if an administrator StrCmp $IsAdminUser "false" NotAdmin - ReadIniStr $R0 "$PLUGINSDIR\oorexx_ss.ini" "Field 2" State - ReadIniStr $R1 "$PLUGINSDIR\oorexx_ss.ini" "Field 3" State - Push $R0 - Push $R1 + Call Installrxapi NotAdmin: SectionEnd @@ -609,10 +606,6 @@ ;Installer Functions Function .onInit -; !insertmacro MUI_INSTALLOPTIONS_EXTRACT "oorexx_fa.ini" - !insertmacro MUI_INSTALLOPTIONS_EXTRACT "oorexx_ss.ini" -; !insertmacro MUI_INSTALLOPTIONS_EXTRACT "oorexx_mt.ini" - StrCmp ${CPU} "x86_64" 0 +2 strcpy $INSTDIR "$PROGRAMFILES64\${SHORTNAME}" @@ -662,13 +655,42 @@ ; checks if the user is an admin and skips the page if not Function SetCustomRxAPI + StrCpy $RxAPIInstall 0 + StrCpy $RxAPIStart 0 + StrCmp $IsAdminUser "true" NoAbort Abort NoAbort: - !insertmacro MUI_HEADER_TEXT "$(TEXT_IO_PAGETITLE_RXAPI)" "$(TEXT_IO_SUBTITLE_RXAPI)" - !insertmacro MUI_INSTALLOPTIONS_DISPLAY "oorexx_ss.ini" + StrCpy $RxAPIInstall 1 + StrCpy $RxAPIStart 1 + + !insertmacro MUI_HEADER_TEXT "The ooRexx rxapi process" "Install rxapi as a Windows Service" + nsDialogs::Create /NOUNLOAD 1018 + Pop $RxAPIDialog + + ${If} $RxAPIDialog == error + Abort + ${EndIf} + + ${NSD_CreateLabel} 0 0 100% 25u "ooRexx starts a process, rxapi.exe, the first time a Rexx program executes.$\r$\nTo speed up execution of Rexx programs, rxapi.exe can be installed as a Windows Service$\r$\n and started automatically when the system boots up." + Pop $RxAPILabel + + ${NSD_CreateCheckBox} 0 30u 100% 15u "Install rxapi as a Service" + Pop $RxAPICheckBoxInstall + ${NSD_Check} $RxAPICheckBoxInstall + + ${NSD_CreateCheckBox} 0 50u 100% 15u "Start the rxapi Service" + Pop $RxAPICheckBoxStart + ${NSD_Check} $RxAPICheckBoxStart + + nsDialogs::Show FunctionEnd +Function SetCustomRxAPILeave + ${NSD_GetState} $RxAPICheckBoxInstall $RxAPIInstall + ${NSD_GetState} $RxAPICheckBoxStart $RxAPIStart +FunctionEnd + Function CheckForRxAPI ; ; Determines if rxapi.exe is running. On Vista, FindProcDll does not work. @@ -765,11 +787,7 @@ FunctionEnd Function Installrxapi - ; $R1 is start flag - ; $R0 is install flag - Pop $R1 - Pop $R0 - Strcmp $R0 0 exitss + Strcmp $RxAPIInstall 0 exitss ; do the install of rxapi DetailPrint "Installing rxapi as a Windows Service" nsExec::ExecToLog "$INSTDIR\rxapi /i /s" @@ -779,7 +797,7 @@ Goto exitss dostart: DetailPrint "rxapi successfully installed as a Windows Service" - StrCmp $R1 0 exitss + StrCmp $RxAPIStart 0 exitss ; start the service Services::SendServiceCommand 'start' 'RXAPI' Pop $R0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mie...@us...> - 2010-08-17 03:32:00
|
Revision: 6114 http://oorexx.svn.sourceforge.net/oorexx/?rev=6114&view=rev Author: miesfeld Date: 2010-08-17 03:31:53 +0000 (Tue, 17 Aug 2010) Log Message: ----------- [2842643] rxapi service does not start Modified Paths: -------------- main/trunk/platform/windows/install/oorexx.nsi Modified: main/trunk/platform/windows/install/oorexx.nsi =================================================================== --- main/trunk/platform/windows/install/oorexx.nsi 2010-08-16 19:29:37 UTC (rev 6113) +++ main/trunk/platform/windows/install/oorexx.nsi 2010-08-17 03:31:53 UTC (rev 6114) @@ -11,16 +11,18 @@ ; oorexx.nsi MUST be in the current directory! !define LONGNAME "Open Object Rexx" ;Long Name (for descriptions) -!define SHORTNAME "ooRexx" ;Short name (no slash) of package +!define SHORTNAME "ooRexx" ;Short name (no slash) of package !define DISPLAYICON "$INSTDIR\rexx.exe,0" !define UNINSTALLER "uninstall.exe" -!define KEYFILE "rexx.exe" +!define KEYFILE1 "rexx.exe" +!define KEYFILE2 "rxapi.dll" !define MUI_ICON "${SRCDIR}\platform\windows\rexx.ico" !define MUI_UNICON "${SRCDIR}\platform\windows\install\uninstall.ico" Name "${LONGNAME} ${VERSION}" +!include "nsProcess.nsh" !include "MUI2.nsh" !include "Library.nsh" @@ -110,8 +112,8 @@ !insertmacro MUI_PAGE_INSTFILES !insertmacro MUI_PAGE_FINISH + !define MUI_PAGE_CUSTOMFUNCTION_LEAVE un.CheckForRxAPI !insertmacro MUI_UNPAGE_WELCOME - !define MUI_PAGE_CUSTOMFUNCTION_LEAVE un.CheckForRxAPI !insertmacro MUI_UNPAGE_CONFIRM !insertmacro MUI_UNPAGE_INSTFILES !insertmacro MUI_UNPAGE_FINISH @@ -621,9 +623,9 @@ ; Uninstall previous version if present ; ReadRegStr $R1 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${SHORTNAME}" "UninstallString" - StrCmp $R1 "" NoUninstall + StrCmp $R1 "" NotInstalled ; - ; ask the user to run the uninstaller + ; demand that the user run the uninstaller ; ReadRegStr $R2 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${SHORTNAME}" "UnInstallLocation" StrCmp $R2 "" NoUninstallLocation @@ -631,21 +633,79 @@ NoUninstallLocation: StrCpy $R2 $INSTDIR StartUninstall: - MessageBox MB_YESNOCANCEL|MB_ICONEXCLAMATION|MB_TOPMOST "A version of ${LONGNAME} is currently installed.$\nIt is recommended that it be uninstalled before proceeding.$\nUninstall previous version?" /SD IDYES IDNO NoUninstall IDCANCEL DoAbort + MessageBox MB_YESNOCANCEL|MB_ICONEXCLAMATION|MB_TOPMOST \ + "A version of ${LONGNAME} is currently installed. If the$\n\ + previous version is not uninstalled it is guaranteed to cause problems.$\n$\n\ + Uninstall the previous version?" /SD IDYES IDNO RefusedUninstall IDCANCEL DoAbort HideWindow ClearErrors - ExecWait '$R1 _?=$R2' - IfErrors no_remove_uninstaller - IfFileExists "$INSTDIR\${KEYFILE}" no_remove_uninstaller + ; the "_?=" sets the uninstall dir and *prevents* the uninstaller from running in the temp dir, which we want + ExecWait '$R1 _?=$R2' $0 + IfErrors UninstallErrors + IntCmp $0 0 SanityCheck + IntCmp $0 1 UserCanceledUninstall + ; Return code is 2 or greater. 2 is uninstall canceled by script, treat greater than the same. + MessageBox MB_OK|MB_ICONEXCLAMATION|MB_TOPMOST \ + "The uninstall of the previous version of ${SHORTNAME} was terminated by$\n\ + the uninstall script. The most likely cause of this is that rxapi is running$\n\ + as a service and could not be stopped, or was not stopped.$\n$\n\ + When the previous version rxapi is not stopped, the new version can$\n\ + not be installed correctly. The installation will abort. You can:$\n$\n\ + 1.) Contact the developers on the SourceForge project for help.$\n$\n\ + 2.) Try stopping rxapi and setting the service to disabled if it is$\n\ + installed as a service. The rerun the installation.$\n$\n\ + 3.) Elect to not stop rxapi and to not remove the previous version. To do$\n\ + this, rerun the installation and click No when asked to uninstall the previous$\n\ + version. Then click Yes when asked if you want to continue." /SD IDOK + Goto DoAbort + + UserCanceledUninstall: + MessageBox MB_OK|MB_ICONEXCLAMATION|MB_TOPMOST \ + "You have elected to cancel the uninstall of the previous version of$\n\ + ${SHORTNAME}. There are very few cases where installing ${LONGNAME}$\n\ + without removing the previous version will work and this installation$\n\ + will abort.$\n$\n\ + If you are determined to install ${SHORTNAME} without removing the$\n\ + previous version, rerun the installation and click No when asked to$\n\ + uninstall the previous version. Then click Yes when asked if you want$\n\ + to continue." /SD IDOK + Goto DoAbort + + SanityCheck: + IfFileExists "$INSTDIR\${KEYFILE1}" UninstallErrors + IfFileExists "$INSTDIR\${KEYFILE2}" UninstallErrors Delete "$R2\${UNINSTALLER}" RMDir "$R2" - no_remove_uninstaller: - BringToFront + BringToFront + Goto NotInstalled + UninstallErrors: + MessageBox MB_OK|MB_ICONEXCLAMATION|MB_TOPMOST \ + "There were unexpected errors uninstalling the previous version$\n\ + of ${SHORTNAME}. There are very few cases where installing ${LONGNAME}$\n\ + without removing the previous version will work and this installation$\n\ + will abort. You should first try rerunning the installtion.$\n$\n\ + If this is the second attempt at installation and you still get this$\n\ + message, you can:$\n$\n\ + 1.) Contact the developers on the SourceForge project for help.$\n$\n\ + 2.) Try removing the previous version manually and rerun the installation.$\n$\n\ + 3.) Elect to not remove the previous version. To do this, rerun the installation$\n\ + and click No when asked to uninstall the previous version. Then click Yes when$\n\ + asked if you want to continue.$\n$\n\ + In all cases, please report this problem to the ${SHORTNAME} project on SourceForge." /SD IDOK + Goto DoAbort - Goto NoUninstall - DoAbort: - Abort - NoUninstall: + RefusedUninstall: + MessageBox MB_YESNO|MB_ICONEXCLAMATION|MB_TOPMOST \ + "There are very few cases where installing ${LONGNAME}$\n\ + without removing the previous version will work. If you think$\n\ + you know better than this, proceed with the installation. However,$\n\ + the ${SHORTNAME} developers will not support this type of installation$\n$\n\ + Click Yes to continue, No to cancel the installation." /SD IDNO IDNO DoAbort + BringToFront + Goto NotInstalled + DoAbort: + Abort + NotInstalled: ; ; Install as All Users if an admin ; @@ -705,27 +765,62 @@ ; Rather than fix FindProcDll, (easy to do, but I'm not sure of its license,) ; we first check if it is running as a service. If so, we stop it. ; + ; TODO we need better than the above. Trying nsProcess plusging, still not + ; sure if it works. + ; StrCmp $rxapichk 1 NotRunning StrCpy $rxapichk 1 services::IsServiceRunning 'RXAPI' Pop $R0 StrCmp $R0 'Yes' ServiceIsRunning - ; Try FindProcDLL - FindProcDLL::FindProc "rxapi.exe" - StrCmp $R0 0 NotRunning + + ; Try FindProcDLL to see if rxapi can be found running. + ;;;FindProcDLL::FindProc "rxapi.exe" + ;;;StrCmp $R0 0 NotRunning + + ; Try nsProcess + ${nsProcess::FindProcess} "rxapi.exe" $0 + StrCmp $0 603 NotRunning + DetailPrint "{nsProcess::FindProcess} rc: $0" + ; ; rxapi.exe is running, we need to stop it ServiceIsRunning: - MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION|MB_TOPMOST "The Open Object Rexx memory manager (RXAPI) is currently active.$\nSelect OK to stop it (possible loss of data) and continue.$\nSelect CANCEL to continue with the installation without stopping the memory manager." /SD IDOK IDCANCEL NotRunning + MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION|MB_TOPMOST \ + "A previous version of the Open Object Rexx memory manager (rxapi) is currently$\n\ + running. A new version of rxapi can not be installed while rxapi is running.$\n$\n\ + Select Ok to stop rxapi and continue. Select Cancel to abort the installation.$\n$\n\ + If, and only if, there are running Rexx programs, stopping the memory manager$\n\ + could possibly cause data loss. If you are worried about this, please cancel the$\n\ + installation, stop all running Rexx programs, and rerun the installation" /SD IDOK IDOK DoStopRxapi + Quit ; ; Stop rxapi.exe. Send the service stop command first. If it is not a - ; service, we don't care, just try kill. + ; service, we don't care, we'll just try to kill it. + DoStopRxapi: Services::SendServiceCommand 'stop' 'RXAPI' Pop $R0 StrCmp $R0 'Ok' NotRunning - KillProcDLL::KillProc "rxapi.exe" - DetailPrint "rc from KillProcDll $R0" + ;; KillProcDLL::KillProc "rxapi.exe" + ;; DetailPrint "rc from KillProcDll $R0" + + ${nsProcess::KillProcess} "rxapi.exe" $0 + StrCmp $0 603 NotRunning + DetailPrint "nsProcess::KillProcess rc: $0" + ; Ensure rxapid is stopped + ${nsProcess::FindProcess} "rxapi.exe" $0 + StrCmp $0 603 NotRunning + DetailPrint "{nsProcess::FindProcess} rc: $0" + MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION|MB_TOPMOST \ + "Can not determine conclusively that the Open Object Rexx memory manager (rxapi) is$\n\ + stopped. Since a new version of rxapi can not be installed while rxapi is running,$\n\ + the installation will quit.$\n$\n\ + Please use the task manager to locate rxapi.exe and end that process, then restart the$\n\ + installation. If you are uncomfortable with using the task manager, contact the$\n\ + ${SHORTNAME} developers on SourceForge for help." /SD IDOK + Quit + NotRunning: FunctionEnd @@ -822,10 +917,10 @@ ;======================================================================== ;Uninstaller Section ; -; Not this: If the install was done by a non-admin user, the .rex file association may have been written -; to the HKEY_CURRENT_USER\SOFTWARE\Classes area. You would think that we need to check for -; that and specifically delete those keys. However, testing shows that the current code always -; removes those keys. Tested on a number of machines with a number of different users. +; Note this: If the install was done by a non-admin user, the .rex file association may have been written +; to the HKEY_CURRENT_USER\SOFTWARE\Classes area. You would think that we need to check for +; that and specifically delete those keys. However, testing shows that the current code always +; removes those keys. Tested on a number of machines with a number of different users. Section "Uninstall" @@ -834,7 +929,8 @@ ;; !insertmacro UnInstallLib REGDLL NOTSHARED REBOOT_PROTECTED "$INSTDIR\orxscrpt.dll" ; ; Stop rxapi.exe (again!) the de-registration process starts rxapi.exe GRRRR!!! - KillProcDLL::KillProc "rxapi.exe" + ;;;; TODO need better than to just kill this + ;;;KillProcDLL::KillProc "rxapi.exe" ; get rid of file association Push ".REX" @@ -846,6 +942,9 @@ Pop $R0 StrCmp $R0 'No' NotAdmin DetailPrint "Uninstalling ooRexx rxapi Service" + services::IsServiceRunning 'RXAPI' ; if the service is not running, sending it a stop command will fail. + Pop $0 + StrCmp $R0 'No' StoppedOK Services::SendServiceCommand 'stop' 'RXAPI' Pop $R0 StrCmp $R0 'Ok' StoppedOK @@ -948,6 +1047,7 @@ ; ; UnInstall as All Users if an admin ; + StrCpy $rxapichk 0 Call un.IsUserAdmin Pop $IsAdminUser StrCmp $IsAdminUser "false" DefaultUser @@ -984,26 +1084,66 @@ ; Rather than fix FindProcDll, (easy to do, but I'm not sure of its license,) ; we first check if it is running as a service. If so, we stop it. ; + ; + StrCmp $rxapichk 1 NotRunning StrCpy $rxapichk 1 services::IsServiceRunning 'RXAPI' Pop $R0 StrCmp $R0 'Yes' ServiceIsRunning - ; Try FindProcDLL - FindProcDLL::FindProc "rxapi.exe" - StrCmp $R0 0 NotRunning + + ;; ; Try FindProcDLL to see if rxapi can be found running. + ;; FindProcDLL::FindProc "rxapi.exe" + ;; StrCmp $R0 0 NotRunning + + ; Try nsProcess to see if rxapi can be found running. + ${nsProcess::FindProcess} "rxapi.exe" $0 + StrCmp $0 603 NotRunning + DetailPrint "{nsProcess::FindProcess} rc: $0" + ; ; rxapi.exe is running, we need to stop it ServiceIsRunning: - MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION|MB_TOPMOST "The Open Object Rexx memory manager (RXAPI) is currently active.$\nSelect OK to stop it (possible loss of data) and continue.$\nSelect CANCEL to continue with the uninstall without stopping the service." /SD IDOK IDCANCEL NotRunning - ; + MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION|MB_TOPMOST \ + "The ${LONGNAME} memory manager (rxapi) is currently running. ${SHORTNAME} can not be$\n\ + completely uninstalled while rxapi is running.$\n$\n\ + Select Ok to stop rxapi and continue. Select Cancel to abort the uninstall.$\n$\n\ + All Rexx programs should be stopped before the uninstall is started. (Or,$\n\ + before the install was started, if upgrading.) If, and only if, there are$\n\ + Rexx programs running, stopping the memory manager could possibly cause data$\n\ + loss. If you are worried about this, please cancel the uninstall, stop all$\n\ + running Rexx programs, and rerun the uninstall, (or install.)" /SD IDOK IDOK DoStopRxapi + SetErrorLevel 1 + Quit + ; Stop rxapi.exe. Send the service stop command first. If it is not a - ; service, we don't care, just try kill. + ; service, we don't care, we'll get back that it is not stopped. Then we just + ; try to kill it. + DoStopRxapi: Services::SendServiceCommand 'stop' 'RXAPI' Pop $R0 StrCmp $R0 'Ok' NotRunning - KillProcDLL::KillProc "rxapi.exe" + ;; KillProcDLL::KillProc "rxapi.exe" + ;; DetailPrint "rc from KillProcDll $R0" + + ${nsProcess::KillProcess} "rxapi.exe" $0 + StrCmp $0 603 NotRunning + DetailPrint "nsProcess::KillProcess rc: $0" + ; Ensure rxapid is stopped + ${nsProcess::FindProcess} "rxapi.exe" $0 + StrCmp $0 603 NotRunning + DetailPrint "{nsProcess::FindProcess} rc: $0" + MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION|MB_TOPMOST \ + "Can not determine conclusively that rxapi is currently stopped. If the$\n\ + installation continues, the file, rxapi.exe, may need to be deleted manually.$\n$\n\ + Select Ok to continue anyway. Select Cancel to abort the uninstall.$\n$\n\ + Continuing the uninstall should not be a problem. When the uninstall finishes$\n\ + simply delete rxapi.exe manually. If this uninstall is part of an install to$\n\ + a new version of ${SHORTNAME}, simply cancel the install, delete the file,$\n\ + restart the installation." /SD IDCANCEL IDOK NotRunning + Quit + NotRunning: FunctionEnd This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mie...@us...> - 2010-09-12 16:53:22
|
Revision: 6189 http://oorexx.svn.sourceforge.net/oorexx/?rev=6189&view=rev Author: miesfeld Date: 2010-09-12 16:53:14 +0000 (Sun, 12 Sep 2010) Log Message: ----------- [2759093] Windows Installation annoyances and requests Begin implementation of some of these requests. Note: there may be a few extra debug messages if you build the installer package for the next few days. The 'upgrade' type install check box works, but the 'upgrade' type of install is not actually done. Modified Paths: -------------- main/trunk/platform/windows/install/oorexx.nsi Modified: main/trunk/platform/windows/install/oorexx.nsi =================================================================== --- main/trunk/platform/windows/install/oorexx.nsi 2010-09-12 15:47:37 UTC (rev 6188) +++ main/trunk/platform/windows/install/oorexx.nsi 2010-09-12 16:53:14 UTC (rev 6189) @@ -20,20 +20,22 @@ !define KEYFILE1 "rexx.exe" !define KEYFILE2 "rxapi.dll" -!define MUI_ICON "${SRCDIR}\platform\windows\rexx.ico" -!define MUI_UNICON "${SRCDIR}\platform\windows\install\uninstall.ico" - Name "${LONGNAME} ${VERSION}" !include "MUI2.nsh" !include "Library.nsh" !include "LogicLib.nsh" +!include "FileFunc.nsh" +!include "WordFunc.nsh" !include "admin.nsh" !include "isnt.nsh" !include "newpath.nsh" !include "WriteEnv.nsh" +!define MUI_ICON "${SRCDIR}\platform\windows\rexx.ico" +!define MUI_UNICON "${SRCDIR}\platform\windows\install\uninstall.ico" + !define MUI_CUSTOMPAGECOMMANDS !define MUI_WELCOMEFINISHPAGE_BITMAP "orange.bmp" !define MUI_UNWELCOMEFINISHPAGE_BITMAP "orange-uninstall.bmp" @@ -97,20 +99,25 @@ InstallDir "$PROGRAMFILES\${SHORTNAME}" ;-------------------------------- ;Pages - + /* Installer pages */ !insertmacro MUI_PAGE_WELCOME !insertmacro MUI_PAGE_LICENSE "${SRCDIR}\CPLv1.0.txt" - !define MUI_PAGE_CUSTOMFUNCTION_PRE CheckForRxAPI + Page custom Uninstall_Old_ooRexx_page Uninstall_Old_ooRexx_Leave + Page custom Uninstall_Type_page Uninstall_Type_Leave + Page custom Ok_Stop_RxAPI_page Ok_Stop_RxAPI_leave + !insertmacro MUI_PAGE_COMPONENTS !insertmacro MUI_PAGE_DIRECTORY ; Page custom SetCustomAssoc ; Page custom SetCustomLanguage - Page custom SetCustomRxAPI SetCustomRxAPILeave + Page custom Rxapi_Options_page Rxapi_Options_leave !insertmacro MUI_PAGE_INSTFILES !insertmacro MUI_PAGE_FINISH - !define MUI_PAGE_CUSTOMFUNCTION_LEAVE un.CheckOkToStopRxapi ; function is called when the welcome page closes + /* Uninstaller pages */ !insertmacro MUI_UNPAGE_WELCOME + UninstPage custom un.Ok_Stop_RxAPI_page un.Ok_Stop_RxAPI_leave + UninstPage custom un.Uninstall_By_Log_page un.Uninstall_By_Log_leave !insertmacro MUI_UNPAGE_CONFIRM !insertmacro MUI_UNPAGE_INSTFILES !insertmacro MUI_UNPAGE_FINISH @@ -123,16 +130,35 @@ ;-------------------------------- ; Variables -Var IsAdminUser ; is the installer being run by an admin: true / false -Var RxapiIsService ; is rxapi installed as a service: true / false -Var RxapiIsRunning ; is rxapi running: true / false -Var RxAPIDialog -Var RxAPILabel -Var RxAPICheckBoxInstall -Var RxAPIInstall -Var RxAPICheckBoxStart -Var RxAPIStart +Var IsAdminUser ; is the installer being run by an admin: true / false +Var RxapiIsService ; is rxapi installed as a service: true / false +Var RxapiIsRunning ; is rxapi running: true / false +Var RegVal_uninstallString ; uninstall string (program) found in regsitry +Var RegVal_uninstallLocation ; location of uninstall program found in registry +Var RegVal_uninstallVersion ; Version / level of uninstaller program. This only exists at 410 or greater +Var DoUpgrade ; try to do an upgrade install true / false +Var UpgradeTypeAvailable ; Level of uninstaller sufficient for upgrade type true / false +; Dialog variables +Var Dialog +Var Label_One +Var Label_Two +Var Uninstall_Previous_CK +Var Force_Install_CK +Var Do_Upgrade_Type_CK +Var RxAPI_Install_Service_CK +Var RxAPI_Start_CK +Var Delete_ooRexx_Tree_CK +Var RxAPIInstallService +Var RxAPIStartService + +Var StopRxAPI_CK +Var StopRxAPI_CK_State + +; Uninstall variables +Var LogFileExists +Var DeleteWholeTree + ;=============================================================================== ;Installer Sections ;=============================================================================== @@ -141,10 +167,10 @@ ; Hidden section to open the log file Section -openlogfile - CreateDirectory "$INSTDIR" - IfFileExists "$INSTDIR\${UninstLog}" +3 - FileOpen $UninstLog "$INSTDIR\${UninstLog}" w - Goto +4 + CreateDirectory "$INSTDIR" + IfFileExists "$INSTDIR\${UninstLog}" +3 + FileOpen $UninstLog "$INSTDIR\${UninstLog}" w + Goto +4 SetFileAttributes "$INSTDIR\${UninstLog}" NORMAL FileOpen $UninstLog "$INSTDIR\${UninstLog}" a FileSeek $UninstLog 0 END @@ -157,11 +183,6 @@ SectionIn 1 RO ; Set output path to the installation directory. ${SetOutPath} $INSTDIR - ; Set the REXX_HOME environment variable - Push "REXX_HOME" - Push $INSTDIR - Push $IsAdminUser ; "true" or "false" - Call WriteEnvStr ; Distribution executables... ${File} "${BINDIR}\" "rexx.exe" ${File} "${BINDIR}\" "rexx.img" @@ -195,38 +216,29 @@ ${File} "${BINDIR}\" "oodialog.cls" ${File} "${BINDIR}\" "oodwin32.cls" ${File} "${BINDIR}\" "oodplain.cls" - ${CreateDirectory} "$SMPROGRAMS\${LONGNAME}" + ; rexxtry is technically a sample, but it is heavily used, so add it to ; the executables. The same thing for the GUI version. ${File} "${SRCDIR}\samples\" "rexxtry.rex" - CreateShortCut "$SMPROGRAMS\${LONGNAME}\Try Rexx.lnk" "$INSTDIR\rexx.exe" '"$INSTDIR\rexxtry.rex"' "$INSTDIR\rexx.exe" - ${AddItem} "$SMPROGRAMS\${LONGNAME}\Try Rexx.lnk" ${File} "${SRCDIR}\samples\windows\oodialog\ooRexxTry\" "ooRexxTry.rex" - CreateShortCut "$SMPROGRAMS\${LONGNAME}\Try Rexx (GUI).lnk" "$INSTDIR\rexx.exe" '"$INSTDIR\ooRexxTry.rex"' "$INSTDIR\rexx.exe" - ${AddItem} "$SMPROGRAMS\${LONGNAME}\Try Rexx (GUI).lnk" + ; Other files... ${File} "${SRCDIR}\platform\windows\" "rexx.ico" ${File} "${SRCDIR}\" "CPLv1.0.txt" + ; readmes - ; Set output path to the installation directory. ${SetOutPath} $INSTDIR\doc ${File} "${SRCDIR}\doc\" "readme.pdf" File /oname=CHANGES.txt "${SRCDIR}\CHANGES" File /oname=ReleaseNotes.txt "${SRCDIR}\ReleaseNotes" ${AddItem} $INSTDIR\doc\CHANGES.txt ${AddItem} $INSTDIR\doc\ReleaseNotes.txt - ${CreateDirectory} "$SMPROGRAMS\${LONGNAME}\Documentation" - CreateShortCut "$SMPROGRAMS\${LONGNAME}\Documentation\ooRexx README.lnk" "$INSTDIR\doc\readme.pdf" "" "$INSTDIR\doc\readme.pdf" 0 - ${AddItem} "$SMPROGRAMS\${LONGNAME}\Documentation\ooRexx README.lnk" - CreateShortCut "$SMPROGRAMS\${LONGNAME}\Documentation\ooRexx CHANGES.lnk" "$INSTDIR\doc\CHANGES.txt" "" "$INSTDIR\doc\CHANGES.txt" 0 - ${AddItem} "$SMPROGRAMS\${LONGNAME}\Documentation\ooRexx CHANGES.lnk" - CreateShortCut "$SMPROGRAMS\${LONGNAME}\Documentation\ooRexx ReleaseNotes.lnk" "$INSTDIR\doc\ReleaseNotes.txt" "" "$INSTDIR\doc\ReleaseNotes.txt" 0 - ${AddItem} "$SMPROGRAMS\${LONGNAME}\Documentation\ooRexx ReleaseNotes.lnk" + ; Set output path to the installation directory just in case + SetOutPath $INSTDIR + ;;;; Comment out orxscrpt stuff temporarily /* - ; Set output path to the installation directory just in case - SetOutPath $INSTDIR ; orxscrpt.dll needs to be registered !insertmacro InstallLib REGDLL NOTSHARED REBOOT_PROTECTED "${BINDIR}\orxscrpt.dll" "$INSTDIR\orxscrpt.dll" "$INSTDIR" @@ -234,19 +246,42 @@ ooRexxProcess::killProcess "rxapi.exe" */ + ; Set the REXX_HOME environment variable + Push "REXX_HOME" + Push $INSTDIR + Push $IsAdminUser ; "true" or "false" + Call WriteEnvStr + ; add the Install directory to the PATH env variable; either system wide or user-specific Push $INSTDIR Push $IsAdminUser ; "true" or "false" Push "PATH" Call AddToPath - ; Add Start Menu items + + ; Add the Start Menu folder and start adding the items. + ${CreateDirectory} "$SMPROGRAMS\${LONGNAME}" + CreateShortCut "$SMPROGRAMS\${LONGNAME}\Try Rexx.lnk" "$INSTDIR\rexx.exe" '"$INSTDIR\rexxtry.rex"' "$INSTDIR\rexx.exe" + ${AddItem} "$SMPROGRAMS\${LONGNAME}\Try Rexx.lnk" + CreateShortCut "$SMPROGRAMS\${LONGNAME}\Try Rexx (GUI).lnk" "$INSTDIR\rexx.exe" '"$INSTDIR\ooRexxTry.rex"' "$INSTDIR\rexx.exe" + ${AddItem} "$SMPROGRAMS\${LONGNAME}\Try Rexx (GUI).lnk" + + ${CreateDirectory} "$SMPROGRAMS\${LONGNAME}\Documentation" + CreateShortCut "$SMPROGRAMS\${LONGNAME}\Documentation\ooRexx README.lnk" "$INSTDIR\doc\readme.pdf" "" "$INSTDIR\doc\readme.pdf" 0 + ${AddItem} "$SMPROGRAMS\${LONGNAME}\Documentation\ooRexx README.lnk" + CreateShortCut "$SMPROGRAMS\${LONGNAME}\Documentation\ooRexx CHANGES.lnk" "$INSTDIR\doc\CHANGES.txt" "" "$INSTDIR\doc\CHANGES.txt" 0 + ${AddItem} "$SMPROGRAMS\${LONGNAME}\Documentation\ooRexx CHANGES.lnk" + CreateShortCut "$SMPROGRAMS\${LONGNAME}\Documentation\ooRexx ReleaseNotes.lnk" "$INSTDIR\doc\ReleaseNotes.txt" "" "$INSTDIR\doc\ReleaseNotes.txt" 0 + ${AddItem} "$SMPROGRAMS\${LONGNAME}\Documentation\ooRexx ReleaseNotes.lnk" + CreateShortCut "$SMPROGRAMS\${LONGNAME}\Uninstall ${SHORTNAME}.lnk" "$INSTDIR\uninstall.exe" "" "$INSTDIR\uninstall.exe" 0 ${AddItem} "$SMPROGRAMS\${LONGNAME}\Uninstall ${SHORTNAME}.lnk" CreateShortCut "$SMPROGRAMS\${LONGNAME}\LICENSE.lnk" "$INSTDIR\CPLv1.0.txt" "" "$INSTDIR\CPLv1.0.txt" 0 ${AddItem} "$SMPROGRAMS\${LONGNAME}\LICENSE.lnk" WriteINIStr "$SMPROGRAMS\${LONGNAME}\ooRexx Home Page.url" "InternetShortcut" "URL" "http://www.oorexx.org/" ${AddItem} "$SMPROGRAMS\${LONGNAME}\ooRexx Home Page.url" + ; Write the uninstall keys + WriteRegExpandStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${SHORTNAME}" "InstallLocation" '"$INSTDIR"' WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${SHORTNAME}" "DisplayName" "${LONGNAME}" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${SHORTNAME}" "DisplayIcon" "${DISPLAYICON}" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${SHORTNAME}" "HelpLink" "http://www.rexxla.org/support.html" @@ -254,11 +289,12 @@ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${SHORTNAME}" "URLInfoAbout" "http://www.rexxla.org/" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${SHORTNAME}" "DisplayVersion" "${VERSION}" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${SHORTNAME}" "Publisher" "Rexx Language Association" + WriteRegExpandStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${SHORTNAME}" "UninstallString" '"$INSTDIR\${UNINSTALLER}"' - WriteRegExpandStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${SHORTNAME}" "InstallLocation" '"$INSTDIR"' WriteRegExpandStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${SHORTNAME}" "UnInstallLocation" "$INSTDIR" ; dont quote it - WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${SHORTNAME}" "NoModify" 0x00000001 - WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${SHORTNAME}" "NoRepair" 0x00000001 + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${SHORTNAME}" "UninstallVersion" "${VERSION}" + WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${SHORTNAME}" "NoModify" 0x00000001 + WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${SHORTNAME}" "NoRepair" 0x00000001 ${WriteUninstaller} "$INSTDIR\${UNINSTALLER}" ; Associate .rex with ooRexx (REXXScript) @@ -630,6 +666,7 @@ SetFileAttributes "$INSTDIR\${UninstLog}" READONLY|SYSTEM|HIDDEN SectionEnd +Var PreviousVersionInstalled ;=============================================================================== ;Installer Functions @@ -644,39 +681,227 @@ ${endif} ; - ; Uninstall previous version if present + ; Install as All Users if an admin ; - ReadRegStr $R1 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${SHORTNAME}" "UninstallString" - ${if} $R1 == "" - Goto NotInstalled + Call IsUserAdmin + Pop $IsAdminUser + ${if} $IsAdminUser == "true" + SetShellVarContext all + StrCpy $RxAPIInstallService ${BST_CHECKED} + StrCpy $RxAPIStartService ${BST_CHECKED} + ${else} + StrCpy $RxAPIInstallService ${BST_UNCHECKED} + StrCpy $RxAPIStartService ${BST_UNCHECKED} ${endif} - ; - ; demand that the user run the uninstaller - ; - ReadRegStr $R2 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${SHORTNAME}" "UnInstallLocation" - ${if} $R2 == "" - ; No location in the registry, we'll try the installation directory. - StrCpy $R2 $INSTDIR + ReadRegStr $RegVal_uninstallString HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${SHORTNAME}" "UninstallString" + ReadRegStr $RegVal_uninstallLocation HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${SHORTNAME}" "UnInstallLocation" + ReadRegStr $RegVal_uninstallVersion HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${SHORTNAME}" "UninstallVersion" + + ; Check for previous version and if the upgrade type of uninstall is available. + ${if} $RegVal_uninstallString == "" + StrCpy $PreviousVersionInstalled 'false' + StrCpy $UpgradeTypeAvailable 'false' + ${else} + StrCpy $PreviousVersionInstalled 'true' + + ${if} $RegVal_uninstallLocation == "" + ; No location in the registry, we'll try the installation directory. + StrCpy $RegVal_uninstallLocation $INSTDIR + ${endif} + + ${if} $RegVal_uninstallVersion == "" + StrCpy $UpgradeTypeAvailable 'false' + ${else} + ${VersionCompare} $RegVal_uninstallVersion "4.1.0.0" $0 + ; Returned in $0: 0 == versions are equal, 1 == version is greater than 410, 2 == version is less than 410 + ${if} $0 < 2 + StrCpy $UpgradeTypeAvailable 'true' + ${else} + StrCpy $UpgradeTypeAvailable 'false' + ${endif} + ${endif} ${endif} - MessageBox MB_YESNOCANCEL|MB_ICONEXCLAMATION|MB_TOPMOST \ - "A version of ${LONGNAME} is currently installed. If the$\n\ - previous version is not uninstalled it is guaranteed to cause problems.$\n$\n\ - Uninstall the previous version?" /SD IDYES IDNO RefusedUninstall IDCANCEL DoAbort +FunctionEnd + +/** Uninstall_Old_ooRexx_page() Custom page function. + */ +Function Uninstall_Old_ooRexx_page + + /* Skip this page if no previous version is present */ + ${if} $PreviousVersionInstalled == "false" + Abort + ${endif} + + !insertmacro MUI_HEADER_TEXT "Previous ooRexx Version." "A previous version of ${LONGNAME} is already installed." + nsDialogs::Create /NOUNLOAD 1018 + Pop $Dialog + + ${If} $Dialog == error + Abort + ${EndIf} + + ${NSD_CreateLabel} 0 0 100% 40u \ + "A version of ${LONGNAME} is currently installed. If the previous version is \ + not uninstalled it is almost certain to cause problems.$\n$\n\ + To uninstall the previous version check the check box. To skip the uninstall step, \ + uncheck the check box." + Pop $Label_One + + ${NSD_CreateCheckBox} 0 44u 100% 8u "Uninstall previous version of ooRexx" + Pop $Uninstall_Previous_CK + ${NSD_Check} $Uninstall_Previous_CK + ${NSD_OnClick} $Uninstall_Previous_CK ShowHideForceInstall + + ${NSD_CreateLabel} 0 70u 100% 48u \ + "There are very few cases where installing ${LONGNAME} without removing the previous \ + version will work. If you think you know better than this, proceed with the installation. \ + However, the ${SHORTNAME} developers will not support this type of installation$\n$\n\ + To proceed with the install without uninstalling the previous version of ooRexx you must \ + check the Force install to continue check box." + Pop $Label_Two + ShowWindow $Label_Two ${SW_HIDE} + + ${NSD_CreateCheckBox} 0 122u 100% 8u "Force install to continue" + Pop $Force_Install_CK + ${NSD_Uncheck} $Force_Install_CK + ShowWindow $Force_Install_CK ${SW_HIDE} + + nsDialogs::Show + +FunctionEnd + +/** ShowHideForceInstall() Callback function. + * + * Called when the Unistall previous ooRexx version check box is clicked. + * + * If the check box is checked, the user wants to uninstall and we hide the + * force check box. If the user unchecks the uninstall check box we show the + * foce check box. + */ +Function ShowHideForceInstall + Pop $Uninstall_Previous_CK + ${NSD_GetState} $Uninstall_Previous_CK $0 + + ${If} $0 == 1 + ShowWindow $Label_Two ${SW_HIDE} + ShowWindow $Force_Install_CK ${SW_HIDE} + ${Else} + ShowWindow $Label_Two ${SW_SHOW} + ShowWindow $Force_Install_CK ${SW_SHOW} + ${NSD_Uncheck} $Force_Install_CK + ${EndIf} +FunctionEnd + +/** Uninstall_Old_ooRexx_Leave() Callback function. + * + * The installer calls this function when the user presses the Next button on + * the uninstall old ooRexx version page. + */ +Function Uninstall_Old_ooRexx_Leave + ${NSD_GetState} $Uninstall_Previous_CK $0 + ${NSD_GetState} $Force_Install_CK $1 + + /* If the user said to not uninstall the previous and did not check force the + * install, then send them back to the page. + */ + ${if} $0 == 0 + ${andif} $1 == 0 + MessageBox MB_OK \ + "To bypass uninstalling the previous version of ooRexx you must check$\n\ + the Force install check box. If it is not the intention to skip the$\n\ + uninstall step, then the Uninstall previous version must be checked.$\n$\n\ + Please check the appropriate check boxes to continue." \ + /SD IDOK + Abort + ${endif} + + /* If the user said to not uninstall the previous and to force the install, + * then we skip the uninstall. To signal this we set the + * PreviousVersionInstalled variable to false. + */ + ${if} $0 == 0 + ${andif} $1 == 1 + StrCpy $PreviousVersionInstalled 'false' + ${endif} + +FunctionEnd + +Function Uninstall_Type_page + + /* Skip this page if no previous version is present */ + ${if} $PreviousVersionInstalled == "false" + Abort + ${endif} + + ${if} $UpgradeTypeAvailable == 'false' + StrCpy $DoUpgrade 'false' + Call Do_The_Uninstall + Abort + ${endif} + + !insertmacro MUI_HEADER_TEXT "Upgrade Previous ooRexx Version." "It is possible to do an 'upgrade' type of install." + nsDialogs::Create /NOUNLOAD 1018 + Pop $Dialog + + ${If} $Dialog == error + Abort + ${EndIf} + + ${NSD_CreateLabel} 0 0 100% 64u \ + "An 'upgrade' type of install will remove all the previously installed files and install \ + the new version of ${SHORTNAME}. However, it will not undo any of the environment, file \ + association, or registry settings done by the previous install.$\n$\n\ + Use this type of install when you have customized these types of settings and do not wish \ + them changed.$\n$\n\ + Note: with this type of install, the install location and other settings can NOT be changed.$\n$\n\" + Pop $Label_One + + ${NSD_CreateCheckBox} 0 68u 100% 8u "Perform an upgrade type of install" + Pop $Do_Upgrade_Type_CK + + nsDialogs::Show + +FunctionEnd + +/** Uninstall_Type_Leave() Callback function. + * + * The installer calls this function when the user presses the Next button on + * the uninstall type page. + */ +Function Uninstall_Type_Leave + ${NSD_GetState} $Do_Upgrade_Type_CK $0 + + ${if} $0 == 1 + StrCpy $DoUpgrade 'true' + ${else} + StrCpy $DoUpgrade 'false' + ${endif} + + Call Do_The_Uninstall + +FunctionEnd + +Function Do_The_Uninstall + HideWindow ClearErrors - ; the "_?=$R2" sets the uninstall dir to $R2 and *prevents* the uninstaller - ; from running in the temp dir, which is what we want. - ExecWait '$R1 _?=$R2' $0 + /* the "_?=$RegVal_uninstallLocation" portion of the command sets the + * uninstall dir to $R2 and *prevents* the uninstaller from running in the + * temp dir, which is what we want. + */ + ExecWait '$RegVal_uninstallString /U=$DoUpgrade _?=$RegVal_uninstallLocation' $0 + IfErrors UninstallErrors ${if} $0 == 0 ; No errors, do a sanity check and finish up. IfFileExists "$INSTDIR\${KEYFILE1}" UninstallErrors IfFileExists "$INSTDIR\${KEYFILE2}" UninstallErrors - Delete "$R2\${UNINSTALLER}" - RMDir "$R2" + Delete "$RegVal_uninstallLocation\${UNINSTALLER}" + RMDir "$RegVal_uninstallLocation" + BringToFront Goto NotInstalled ${endif} @@ -689,9 +914,8 @@ without removing the previous version will work and this installation$\n\ will abort.$\n$\n\ If you are determined to install ${SHORTNAME} without removing the$\n\ - previous version, rerun the installation and click No when asked to$\n\ - uninstall the previous version. Then click Yes when asked if you want$\n\ - to continue." \ + previous version, rerun the installation and select to not uninstall$\n\ + the previous version. Then select to force the installation." \ /SD IDOK Goto DoAbort ${endif} @@ -735,91 +959,200 @@ /SD IDOK Goto DoAbort - RefusedUninstall: - MessageBox MB_YESNO|MB_ICONEXCLAMATION|MB_TOPMOST \ - "There are very few cases where installing ${LONGNAME}$\n\ - without removing the previous version will work. If you think$\n\ - you know better than this, proceed with the installation. However,$\n\ - the ${SHORTNAME} developers will not support this type of installation$\n$\n\ - Click Yes to continue, No to cancel the installation." \ - /SD IDNO IDNO DoAbort - BringToFront - Goto NotInstalled - DoAbort: - Abort + Quit NotInstalled: + ; The previous version is now uninstalled, so we set the variable to reflect that. + StrCpy $PreviousVersionInstalled 'false' +FunctionEnd - ; - ; Install as All Users if an admin - ; - Call IsUserAdmin - Pop $IsAdminUser - ${if} $isAdminUser == "true" - SetShellVarContext all +/** Ok_Stop_RxAPI_page() Custom page function. + * + * This is a custom page that is shown if rxapi is still running. If rxapi.exe + * is not running the page is skipped. On the page, the user is asked for the + * okay to stop rxapi and advised of possible consequences. If the user says + * no, the install will be aborted.. + */ +Function Ok_Stop_RxAPI_page + Call CheckIsRxapiService + Call CheckIsRxapiRunning + + ${if} $RxapiIsRunning == 'false' + Abort ${endif} - Call CheckIsRxapiService - Call CheckIsRxapiRunning + !insertmacro MUI_HEADER_TEXT "The ${LONGNAME} memory manager (rxapi) is currently running" \ + "A new version of rxapi can not be installed while rxapi is running." + nsDialogs::Create /NOUNLOAD 1018 + Pop $Dialog + + ${If} $Dialog == error + Abort + ${EndIf} + + ${NSD_CreateLabel} 0 0 100% 112u \ + "A previous version of the ${LONGNAME} memory manager (rxapi) is currently running. \ + The new version of rxapi can not be installed while the previous version is running.$\n$\n\ + When the Stop rxapi check box is checked, the installation will stop rxapi before \ + proceeding. If the check box is not checked, rxapi will not be stopped.$\n$\n\ + If rxapi is not stopped the install will be canceled.$\n$\n\ + If, and only if, there are Rexx programs running, stopping the memory manager could \ + possibly cause data loss.$\n$\n\ + If you are worried about this, please uncheck the Stop rxapi check box. When the \ + install ends, stop all running Rexx programs, and rerun the installation program." + + Pop $Label_One + + ${NSD_CreateCheckBox} 0 116u 100% 15u "Stop rxapi" + Pop $StopRxAPI_CK + ${NSD_SetState} $StopRxAPI_CK 1 + + ;GetFunctionAddress $0 un.CheckOkToStopRxapiBack + ;nsDialogs::OnBack $0 + + nsDialogs::Show + FunctionEnd -Function SetCustomRxAPI - ; This function is used to display the custom page that asks the user if they - ; want to install rxapi as a service, and if they want rxapi started when the - ; installation finishes. It checks if the user is an admin and skips the - ; page if not. (Admin privileges are required to install a service. ? is - ; that true?) +Function Ok_Stop_RxAPI_leave - StrCpy $RxAPIInstall 0 - StrCpy $RxAPIStart 0 + ${NSD_GetState} $StopRxAPI_CK $StopRxAPI_CK_State + ${if} $StopRxAPI_CK_State == 0 + Quit + ${endif} + + /* + * If the user decided to force the installation without removing the previous + * installation, then it is possible that rxapi is still installed as a + * service. Since stopping a service is the surest means of stopping rxapi, + * we'll check that first. + */ + ${if} $$RxapiIsService == 'true' + Services::SendServiceCommand 'stop' 'RXAPI' + Pop $R0 + ${if} $R0 == 'Ok' + Goto NotRunning + ${endif} + ${else} + ooRexxProcess::killProcess "rxapi.exe" + Pop $R0 + ${if} $R0 == 0 + Goto NotRunning + ${endif} + ${endif} + + /* We'll try one more time to kill rxapi and capture the return code */ + ooRexxProcess::killProcess "rxapi.exe" + Pop $R0 + ${if} $R0 == 0 + Goto NotRunning + ${endif} + + MessageBox MB_OK|MB_ICONEXCLAMATION|MB_TOPMOST \ + "Can not determine conclusively that the Open Object Rexx memory manager (rxapi) is$\n\ + stopped. Since a new version of rxapi can not be installed while rxapi is running,$\n\ + the installation will quit.$\n$\n\ + Please use the task manager to locate rxapi.exe and end that process, then restart the$\n\ + installation. If you are uncomfortable with using the task manager, contact the$\n\ + ${SHORTNAME} developers on SourceForge for help.$\n$\n\ + If you report this problem, please not that the error code is $R0." /SD IDOK + Quit + + NotRunning: +FunctionEnd + +/** Rxapi_Options_page() Custom page function. + * + * This function is used to display the custom page that asks the user if they + * want to install rxapi as a service, and if they want rxapi started when the + * installation finishes. It checks if the user is an admin and skips the + * page if not. (Admin privileges are required to install a service. ? is that + * true?) + */ +Function Rxapi_Options_page + ${if} $IsAdminUser == 'false' Abort ${endif} - StrCpy $RxAPIInstall 1 - StrCpy $RxAPIStart 1 - !insertmacro MUI_HEADER_TEXT "The ooRexx rxapi process" "Install rxapi as a Windows Service" nsDialogs::Create /NOUNLOAD 1018 - Pop $RxAPIDialog + Pop $Dialog - ${If} $RxAPIDialog == error + ${If} $Dialog == error Abort ${EndIf} - ${NSD_CreateLabel} 0 0 100% 25u \ - "ooRexx starts a process, rxapi.exe, the first time a Rexx program executes.$\r$\n\ - To speed up execution of Rexx programs, rxapi.exe can be installed as a Windows Service$\r$\n\ - and started automatically when the system boots up." - Pop $RxAPILabel + ${NSD_OnBack} Rxapi_Options_leave - ${NSD_CreateCheckBox} 0 30u 100% 15u "Install rxapi as a Service" - Pop $RxAPICheckBoxInstall - ${NSD_Check} $RxAPICheckBoxInstall + ${NSD_CreateLabel} 0 0 100% 80u \ + "ooRexx starts a daemon process, rxapi.exe, the first time a Rexx program executes. This \ + process manages all data that can persist across interpreter invocations or is used for \ + cross-process communications. The rxapi process manages the Rexx data queues, the macrospace, \ + and all of the external function, subcommand handler and exit registrations.$\n$\n\ + On Windows, in all cases, it is best to install rxapi as a Windows service. In Windows Vista \ + and later operating systems, it is strongly recommmended that rxapi is always installed as a \ + service." + Pop $Label_One - ${NSD_CreateCheckBox} 0 50u 100% 15u "Start the rxapi Service" - Pop $RxAPICheckBoxStart - ${NSD_Check} $RxAPICheckBoxStart + ${NSD_CreateCheckBox} 0 86u 100% 15u "Install rxapi as a Windows Service" + Pop $RxAPI_Install_Service_CK + ${NSD_SetState} $RxAPI_Install_Service_CK $RxAPIInstallService + ${NSD_OnClick} $RxAPI_Install_Service_CK EnableStartService + ${NSD_CreateCheckBox} 0 106u 100% 15u "Start the rxapi Service during installation" + Pop $RxAPI_Start_CK + ${NSD_SetState} $RxAPI_Start_CK $RxAPIStartService + ${if} $RxAPIInstallService == 0 + EnableWindow $RxAPI_Start_CK 0 + ${endif} + nsDialogs::Show FunctionEnd -Function SetCustomRxAPILeave - ; This function is called by the installer after the SetCustomRxAPI page is - ; closed. This is what sets the variables to match what the user picked. +/** EnableStartService() Callback function. + * + * Called when the install rxap as a service check box is clicked. + * + * If the check box is checked, we enable the start the service check box, if it + * is unchecked we disable the check box. + */ +Function EnableStartService + Pop $RxAPI_Install_Service_CK + ${NSD_GetState} $RxAPI_Install_Service_CK $0 - ${NSD_GetState} $RxAPICheckBoxInstall $RxAPIInstall - ${NSD_GetState} $RxAPICheckBoxStart $RxAPIStart + ${If} $0 == 1 + EnableWindow $RxAPI_Start_CK 1 + ${NSD_SetState} $RxAPI_Start_CK $RxAPIStartService + ${Else} + EnableWindow $RxAPI_Start_CK 0 + ${NSD_Uncheck} $RxAPI_Start_CK + ${EndIf} FunctionEnd +/** Rxapi_Options_leave() Call back function. + * + * Called by the installer when the user clicks Next or Back buttons on the + * Rxapi_Options_page page. We set the RxAPI option variables to match what the + * user picked. + */ +Function Rxapi_Options_leave + ${NSD_GetState} $RxAPI_Install_Service_CK $RxAPIInstallService + ${NSD_GetState} $RxAPI_Start_CK $RxAPIStartService +FunctionEnd + +/** CheckIsRxapiService() + * + * Determines if rxapi is installed as a service. On return the variable + * RxapiIsService will be set to either 'true' or 'false' + * + */ Function CheckIsRxapiService - ; Determines if rxapi is installed as a service. On return the variable - ; RxapiIsService will be set to either 'true' or 'false' - services::IsServiceInstalled 'RXAPI' Pop $R0 + ${if} $R0 == 'Yes' StrCpy $RxapiIsService 'true' ${else} @@ -827,12 +1160,16 @@ ${endif} FunctionEnd +/** CheckIsRxapirunning() + * + * Determines if a rxapi.exe process is running. On return the variable + * RxapiIsRunning is set to 'true', 'false' or 'unknown N' where N is an error + * return code. + * + * TODO still need to test on Vista / Windows 7 + * + */ Function CheckIsRxapiRunning - ; - ; Determines if rxapi.exe is running. - ; - ; TODO still need to test on Vista / Windows 7 - ; ${if} $RxapiIsService == 'true' services::IsServiceRunning 'RXAPI' Pop $R0 @@ -855,56 +1192,6 @@ ${endif} FunctionEnd -Function CheckForRxAPI - ; - ; If rxapi is running we either stop it, or we quit (abort) the install. - ; - ${if} $RxapiIsRunning == 'true' - MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION|MB_TOPMOST \ - "A previous version of the Open Object Rexx memory manager (rxapi) is currently$\n\ - running. A new version of rxapi can not be installed while rxapi is running.$\n$\n\ - Select Ok to stop rxapi and continue. Select Cancel to abort the installation.$\n$\n\ - If, and only if, there are running Rexx programs, stopping the memory manager$\n\ - could possibly cause data loss. If you are worried about this, please cancel the$\n\ - installation, stop all running Rexx programs, and rerun the installation" /SD IDOK IDOK DoStopRxapi - Quit - - DoStopRxapi: - ${if} $$RxapiIsService == 'true' - Services::SendServiceCommand 'stop' 'RXAPI' - Pop $R0 - ${if} $R0 == 'Ok' - Goto NotRunning - ${endif} - ${else} - ooRexxProcess::killProcess "rxapi.exe" - Pop $R0 - ${if} $R0 == 0 - Goto NotRunning - ${endif} - Call CheckIsRxapiRunning - ${if} $RxapiIsRunning == 'false' - Goto NotRunning - ${endif} - Goto UnsureWillAbort - ${endif} - ${elseif} $RxapiIsRunning == 'false' - Goto NotRunning - ${else} - ; This is the case where we are not sure if it is running or not. - UnsureWillAbort: - MessageBox MB_OK|MB_ICONEXCLAMATION|MB_TOPMOST \ - "Can not determine conclusively that the Open Object Rexx memory manager (rxapi) is$\n\ - stopped. Since a new version of rxapi can not be installed while rxapi is running,$\n\ - the installation will quit.$\n$\n\ - Please use the task manager to locate rxapi.exe and end that process, then restart the$\n\ - installation. If you are uncomfortable with using the task manager, contact the$\n\ - ${SHORTNAME} developers on SourceForge for help." /SD IDOK - Quit - ${endif} - NotRunning: -FunctionEnd - Function .onMouseOverSection !insertmacro MUI_DESCRIPTION_BEGIN @@ -1016,10 +1303,12 @@ Call AddToPath FunctionEnd +/** + */ Function InstallRxapi ; Installs rxapi as a service, if the user elected to do so. - ${if} $RxAPIInstall == 1 + ${if} $RxAPIInstallService == 1 ; User asked to install rxapi as a service. DetailPrint "Installing rxapi as a Windows Service" nsExec::ExecToLog "$INSTDIR\rxapi /i /s" @@ -1027,7 +1316,7 @@ ${if} $R0 == 0 DetailPrint "rxapi successfully installed as a Windows Service" - ${if} $RxAPIStart == 1 + ${if} $RxAPIStartService == 1 ; User also asked to start the service. Services::SendServiceCommand 'start' 'RXAPI' Pop $R0 @@ -1061,6 +1350,7 @@ /* temporarily comment out orxscrpt stuff while it is disabled in the build. + ; orxscrpt.dll needs to be degistered NOTE WSH DLL name may have changed. !insertmacro UnInstallLib REGDLL NOTSHARED REBOOT_PROTECTED "$INSTDIR\orxscrpt.dll" ; @@ -1111,65 +1401,8 @@ DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${SHORTNAME}" DeleteRegKey HKLM "SOFTWARE\${LONGNAME}" - ;;;; MessageBox MB_YESNO|MB_ICONSTOP "Delete ALL !!!" /SD IDNO IDYES delTree + Call un.Delete_Installed_Files - ; Can't uninstall individual files if the uninstall log is missing. - IfFileExists "$INSTDIR\${UninstLog}" logExists - MessageBox MB_YESNO|MB_ICONSTOP \ - "${UninstLog} not found!$\r$\n\ - Would you like to remove all files under $INSTDIR?$\r$\n\ - (WARNING! This will remove ANY folders or files put$\n\ - there after the last installation.)" \ - /SD IDNO IDYES DelTree - Abort - DelTree: - ; remove all installed files - RMDir /r "$INSTDIR" - ; remove shortcuts directory and everything in it - RMDir /r "$SMPROGRAMS\${LONGNAME}" - Goto done - - logExists: - Push $R0 - Push $R1 - Push $R2 - SetFileAttributes "$INSTDIR\${UninstLog}" NORMAL - FileOpen $UninstLog "$INSTDIR\${UninstLog}" r - StrCpy $R1 0 - - GetLineCount: - ClearErrors - FileRead $UninstLog $R0 - IntOp $R1 $R1 + 1 - IfErrors 0 GetLineCount - - LoopRead: - FileSeek $UninstLog 0 SET - StrCpy $R2 0 - FindLine: - FileRead $UninstLog $R0 - IntOp $R2 $R2 + 1 - StrCmp $R1 $R2 0 FindLine - - StrCpy $R0 $R0 -2 - IfFileExists "$R0\*.*" 0 +3 - RMDir $R0 #is dir - Goto +3 - IfFileExists $R0 0 +2 - Delete $R0 #is file - - IntOp $R1 $R1 - 1 - StrCmp $R1 0 LoopDone - Goto LoopRead - LoopDone: - FileClose $UninstLog - Delete "$INSTDIR\${UninstLog}" - RMDir "$INSTDIR" - Pop $R2 - Pop $R1 - Pop $R0 - - done: SectionEnd ;=============================================================================== @@ -1180,26 +1413,93 @@ ; Called by the uninstaller program before any pages are shown. We use it to ; set up the execution variables. + ${GetOptions} "$CMDLINE" "/U=" $R0 + ${if} $R0 == 'true' + StrCpy $DoUpgrade 'true' + ${else} + StrCpy $DoUpgrade 'false' + ${endif} + ; UnInstall as All Users if an admin Call un.IsUserAdmin Pop $IsAdminUser - ${if} $IsAdminUser == "false" + ${if} $IsAdminUser == "true" SetShellVarContext all ${endif} + StrCpy $StopRxAPI_CK_State 1 Call un.CheckIsRxapiService Call un.CheckIsRxapiRunning FunctionEnd +/** un.Delete_Installed_Files() + * + * Deletes the installed files in the manner specified by the user. Either by + * using the log file to delete only files installed by the previous + * installaltion or by simply deleting the whole installation directory. + */ +Function un.Delete_Installed_Files + + ${if} $DeleteWholeTree == 'true' + DetailPrint "Uninstall files by deleting the $INSTDIR directory tree" + RMDir /r "$INSTDIR" + DetailPrint "Removing all Start Menu short cuts by removing the $SMPROGRAMS\${LONGNAME} folder" + RMDir /r "$SMPROGRAMS\${LONGNAME}" + ${else} + DetailPrint "Uninstall files using the install log file" + Push $R0 + Push $R1 + Push $R2 + SetFileAttributes "$INSTDIR\${UninstLog}" NORMAL + FileOpen $UninstLog "$INSTDIR\${UninstLog}" r + StrCpy $R1 0 + + GetLineCount: + ClearErrors + FileRead $UninstLog $R0 + IntOp $R1 $R1 + 1 + IfErrors 0 GetLineCount + + LoopRead: + FileSeek $UninstLog 0 SET + StrCpy $R2 0 + FindLine: + FileRead $UninstLog $R0 + IntOp $R2 $R2 + 1 + StrCmp $R1 $R2 0 FindLine + + StrCpy $R0 $R0 -2 + IfFileExists "$R0\*.*" 0 +3 + RMDir $R0 #is dir + Goto +3 + IfFileExists $R0 0 +2 + Delete $R0 #is file + + IntOp $R1 $R1 - 1 + StrCmp $R1 0 LoopDone + Goto LoopRead + LoopDone: + FileClose $UninstLog + Delete "$INSTDIR\${UninstLog}" + RMDir "$INSTDIR" + Pop $R2 + Pop $R1 + Pop $R0 + ${endif} + +FunctionEnd + +/** un.InstallRxapiService() + * Removes the rxapi service. Only called if RxapiIsService is true. + * + * The uninstaller always quits right at the beginning if it can not stop the + * rxapi. So logically, rxapi should be stopped, and if it isn't, it should be + * stoppable. + * + * Pushes a return code to the top of the stack. 0 for success, otherwise an + * error code. + */ Function un.InstallRxapiService - ; Removes the rxapi service. Only called if RxapiIsService is true. - ; - ; The uninstaller always quits right at the beginning if it can not stop the - ; rxapi. So logically, rxapi should be stopped, and if it isn't, it should be - ; stoppable. - ; - ; Pushes a return code to the top of the stack. 0 for success, otherwise an - ; error code. Call un.CheckIsRxapiRunning ${if} $$RxapiIsRunning == 'true' Services::SendServiceCommand 'stop' 'rxapi' @@ -1224,8 +1524,9 @@ Pop $R0 ${if} $R0 != 0 - ; One reason for this could be that rxapi is deleted. We'll try to handle - ; this case so that a clean uninstall can be done. + ; One reason for this could be that rxapi.exe, the file, has been deleted. + ; We'll try to handle this case by having the service manager delete the + ; service. This can be done even if rxapi.exe is missing. Services::SendServiceCommand 'delete' 'rxapi' Pop $R0 ${if} $R0 != 'Ok' @@ -1323,32 +1624,65 @@ ${endif} FunctionEnd -Function un.CheckOkToStopRxapi - ; Called when the Welcome page closes. If rxapi.exe is running, prompts the - ; user to stop it. If the user says no, we quit the uninstall. - ; - ; Note that when this function returns, either rxapi was not running, or we - ; have the user's permission to stop rxapi, and it is stopped. Otherwise we - ; have quit. - +/** un.Ok_Stop_RxAPI_page() Custom page function. + * + * This is a custom page that follows the Welcome page. If rxapi.exe is not + * running the page is skipped. If rxapi.exe is running, the user is asked for + * the okay to stop it. If the user says no, we quit the uninstall. + */ +Function un.Ok_Stop_RxAPI_page ${if} $RxapiIsRunning == 'false' - Return + Abort ${endif} - ; Ask the user if it is okay to stop rxapi. If she says yes, we stop it. If - ; she says no, we quit the uninstall. - MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION|MB_TOPMOST \ - "The ${LONGNAME} memory manager (rxapi) is currently running. ${SHORTNAME} can not be$\n\ - completely uninstalled while rxapi is running.$\n$\n\ - Select Ok to stop rxapi and continue. Select Cancel to abort the uninstall.$\n$\n\ - If, and only if, there are Rexx programs running, stopping the memory manager$\n\ - could possibly cause data loss. If you are worried about this, please cancel$\n\ - the uninstall, stop all running Rexx programs, and rerun the uninstall, (or install.)"\ - /SD IDOK IDOK DoStopRxapi - SetErrorLevel 1 - Quit + !insertmacro MUI_HEADER_TEXT "The ooRexx rxapi process" "The ${LONGNAME} memory manager (rxapi) is currently running" + nsDialogs::Create /NOUNLOAD 1018 + Pop $Dialog - DoStopRxapi: + ${If} $Dialog == error + Abort + ${EndIf} + + ${NSD_CreateLabel} 0 0 100% 96u \ + "${SHORTNAME} can not be completely uninstalled while rxapi is running.$\n$\n\ + When the Stop rxapi check box is checked, the uninstall will stop rxapi before \ + proceeding. If the check box is not checked, rxapi will not be stopped.$\n$\n\ + If rxapi is not stopped the uninstall will be canceled.$\n$\n\ + If, and only if, there are Rexx programs running, stopping the memory manager could \ + possibly cause data loss.$\n$\n\ + If you are worried about this, please uncheck the Stop rxapi check box. When the \ + uninstall (or install) ends, stop all running Rexx programs, and rerun the uninstall, \ + (or install.)" + + Pop $Label_One + + ${NSD_CreateCheckBox} 0 100u 100% 15u "Stop rxapi" + Pop $StopRxAPI_CK + ${NSD_SetState} $StopRxAPI_CK $StopRxAPI_CK_State + + GetFunctionAddress $0 un.CheckOkToStopRxapiBack + nsDialogs::OnBack $0 + + nsDialogs::Show + +FunctionEnd + +/** un.Ok_Stop_RxAPI_leave() Call back function. + * + * Invoked by the uninstaller when the user clicks Next on the Ok to stop rxapi + * page. We check if the user agreed to stopping rxapi. If not we quit the + * uninstaller. Otherwise we stop rxapi. If we can not stop rxapi, we also + * quit the uninstaller. + */ +Function un.Ok_Stop_RxAPI_leave + + ${NSD_GetState} $StopRxAPI_CK $StopRxAPI_CK_State + + ${if} $StopRxAPI_CK_State == 0 + SetErrorLevel 1 + Quit + ${endif} + Call un.StopRxapi Pop $R0 ${if} $R0 == 'Ok' @@ -1372,8 +1706,104 @@ /SD IDOK SetErrorLevel 2 Quit + FunctionEnd +Function un.CheckOkToStopRxapiBack + ${NSD_GetState} $StopRxAPI_CK $StopRxAPI_CK_State +FunctionEnd + +/** un.Uninstall_By_Log_page() Custom page function. + * + * This is a custom page that follows the page that checks if it is okay to + * stop rxapi. Here we check for the uninstall log. We then give the user the + * option of simply deleting the ooRexx directory tree (50 times faster on my + * system) or using the log file to individually delete only the install files. + * + * If the uninstall log is missing, the user does not have the option of + * deleting individual files and directories. + */ +Function un.Uninstall_By_Log_page + + StrCpy $LogFileExists 'false' + IfFileExists "$INSTDIR\${UninstLog}" 0 +4 + StrCpy $LogFileExists 'true' + + ${if} $LogFileExists == 'false' + !insertmacro MUI_HEADER_TEXT \ + "${UninstLog} NOT found" \ + "The option of only removing files installed by the prior ooRexx installer is not available." + + StrCpy $0 \ + "Because the ${UninstLog} file is missing, the uninstall process must remove all \ + files in the $INSTDIR directory tree.$\n$\n\ + WARNING: This will remove all folders and files in the $INSTDIR folder, including \ + any folders or files not placed there by the ooRexx installation.$\n$\n\ + If there are any personl folders or files in the $INSTDIR directory tree that need \ + to be saved, please cancel the uninstall, move the files, and restart the uninstall \ + program." + ${else} + !insertmacro MUI_HEADER_TEXT \ + "Choose the method for removing installed files" \ + "Delete only installed files or delete entire directory tree?" + + StrCpy $0 \ + "The uninstall program can use an install log to delete only the folders and files \ + placed in the $INSTDIR directory tree by the original installation program.$\n$\n\ + Optionally, the entire $INSTDIR directory tree can be deleted.$\n$\n\ + WARNING: Deleting the entire directory tree will remove all folders and files in the \ + $INSTDIR folder. This will include any folders or files not placed there by the ooRexx \ + installation." + + ${endif} + + nsDialogs::Create /NOUNLOAD 1018 + Pop $Dialog + + ${If} $Dialog == error + Abort + ${EndIf} + + ${if} $LogFileExists == 'false' + ${NSD_CreateLabel} 0 0 100% 80u $0 + Pop $Label_One + + ${NSD_CreateCheckBox} 0 84u 100% 8u "Delete entire directory tree" + Pop $Delete_ooRexx_Tree_CK + ${NSD_Check} $Delete_ooRexx_Tree_CK + EnableWindow $Delete_ooRexx_Tree_CK 0 + ${else} + ${NSD_CreateLabel} 0 0 100% 64u $0 + Pop $Label_One + + ${NSD_CreateLabel} 0 80u 100% 16u "To DELETE the entire $INSTDIR directory tree, check the check box." + Pop $Label_Two + + ${NSD_CreateCheckBox} 0 100u 100% 8u "Delete entire directory tree" + Pop $Delete_ooRexx_Tree_CK + ${endif} + + nsDialogs::Show + +FunctionEnd + +/** un.Uninstall_By_Log_leave() Call back function. + * + * Invoked by the uninstaller when the user clicks Next on the uninstall using + * the log page. + */ +Function un.Uninstall_By_Log_leave + + ${NSD_GetState} $Delete_ooRexx_Tree_CK $0 + + ${if} $0 == 1 + StrCpy $DeleteWholeTree 'true' + ${else} + StrCpy $DeleteWholeTree 'false' + ${endif} + +FunctionEnd + Function un.StopRxapi ; Stop rxapi.exe. If rxapi is installed as a service, the stop command should ; stop it. Otherwise, we use killProcess. @@ -1390,17 +1820,23 @@ Pop $R0 ${endif} - Call un.CheckIsRxapiRunning + StrCpy $4 $R0 ; TEMP + Call un.CheckIsRxapiRunning ; TODO this function seems to return true sometimes when rxapi is not running ${if} $RxapiIsRunning == 'false' Push 'Ok' return ${endif} + MessageBox MB_OK "un.StopRxapi AFTER stop checkIsRxapiRunning reports true RxapiIsService=$RxapiIsRunning popped R0=$4" + ; Still running, try one more time, although this is probably a waste of time. - ; But, we will capture the error code for debugging. + ; But, we will capture the error code for debugging. Note that if the return + ; from killProcess is 1, then the process was not found, so it is killed. See + ; the above TODO ooRexxProcess::killProcess 'rxapi' Pop $R0 ${if} $R0 == 0 + ${orif} $R1 == 1 Push 'Ok' ${else} Push $R0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mie...@us...> - 2010-09-16 03:31:30
|
Revision: 6192 http://oorexx.svn.sourceforge.net/oorexx/?rev=6192&view=rev Author: miesfeld Date: 2010-09-16 03:31:22 +0000 (Thu, 16 Sep 2010) Log Message: ----------- [2759093] Windows Installation annoyances and requests This commit enhances the Windows installation package with the ability to an 'upgrade' type of install. This type of install removes those files installed by the previous version and installs the files of the new version, only. All environment and registry settings are left exactly as they currently exist. In addition there are number of interface improvements, fixes of areas of possible confusion, and checks for a consistent install. It also creates file associations for rexxpaws and rexxhide. The file associations are hard coded at this time, but a future enhancement will allow the user to set the file extension they choose for each executable, or to skip the association completely. Modified Paths: -------------- main/trunk/platform/windows/install/oorexx.nsi Modified: main/trunk/platform/windows/install/oorexx.nsi =================================================================== --- main/trunk/platform/windows/install/oorexx.nsi 2010-09-15 21:48:33 UTC (rev 6191) +++ main/trunk/platform/windows/install/oorexx.nsi 2010-09-16 03:31:22 UTC (rev 6192) @@ -31,7 +31,11 @@ !include "isnt.nsh" !include "newpath.nsh" !include "WriteEnv.nsh" +!include "StrFunc.nsh" +; Docs for the string functions say they need to be declared before use: +${StrTok} +${UnStrTok} !define MUI_ICON "${SRCDIR}\platform\windows\rexx.ico" !define MUI_UNICON "${SRCDIR}\platform\windows\install\uninstall.ico" @@ -54,6 +58,8 @@ ;define MUI_CUSTOMFUNCTION_GUIINIT myGuiInit +!define MUI_CUSTOMFUNCTION_UNABORT un.onCancelButton + !define UninstLog "uninstall.log" Var UninstLog @@ -97,6 +103,11 @@ SetPluginUnload alwaysoff RequestExecutionLevel admin InstallDir "$PROGRAMFILES\${SHORTNAME}" + + ;InstType "Defualt" + ;InstType "Simple" + ;InstType /COMPONENTSONLYONCUSTOM + ;-------------------------------- ;Pages /* Installer pages */ @@ -106,7 +117,9 @@ Page custom Uninstall_Type_page Uninstall_Type_Leave Page custom Ok_Stop_RxAPI_page Ok_Stop_RxAPI_leave + !define MUI_PAGE_CUSTOMFUNCTION_SHOW Components_Page_show !insertmacro MUI_PAGE_COMPONENTS + !define MUI_PAGE_CUSTOMFUNCTION_SHOW Directory_Page_show !insertmacro MUI_PAGE_DIRECTORY ; Page custom SetCustomAssoc ; Page custom SetCustomLanguage @@ -136,8 +149,14 @@ Var RegVal_uninstallString ; uninstall string (program) found in regsitry Var RegVal_uninstallLocation ; location of uninstall program found in registry Var RegVal_uninstallVersion ; Version / level of uninstaller program. This only exists at 410 or greater +Var RegVal_rexxAssociation ; File association string for rexx.exe (.ext / ftype - i.e. .rex RexxScript) +Var RegVal_rexxHideAssociation ; File association string for rexxhide.exe (.ext / ftype - i.e. .rxg RexxHide) +Var RegVal_rexxPawsAssociation ; File association string for rexxpaws.exe (.ext / ftype - i.e. .rxp RexxPaws) +Var AssociationProgramName ; Executable being associated (i.e rexxpaws.exe, rexx.exe, etc..) +Var AssociationText ; Descriptive text that goes in registry (i.e. ooRexx Rexx GUI Program) Var DoUpgrade ; try to do an upgrade install true / false Var UpgradeTypeAvailable ; Level of uninstaller sufficient for upgrade type true / false +Var PreviousVersionInstalled ; A previous version is installed true / false ; Dialog variables Var Dialog @@ -156,6 +175,7 @@ Var StopRxAPI_CK_State ; Uninstall variables +Var InStopRxapiPage Var LogFileExists Var DeleteWholeTree @@ -237,8 +257,7 @@ ; Set output path to the installation directory just in case SetOutPath $INSTDIR -;;;; Comment out orxscrpt stuff temporarily - /* + /* Comment out orxscrpt stuff temporarily ; orxscrpt.dll needs to be registered !insertmacro InstallLib REGDLL NOTSHARED REBOOT_PROTECTED "${BINDIR}\orxscrpt.dll" "$INSTDIR\orxscrpt.dll" "$INSTDIR" @@ -246,18 +265,6 @@ ooRexxProcess::killProcess "rxapi.exe" */ - ; Set the REXX_HOME environment variable - Push "REXX_HOME" - Push $INSTDIR - Push $IsAdminUser ; "true" or "false" - Call WriteEnvStr - - ; add the Install directory to the PATH env variable; either system wide or user-specific - Push $INSTDIR - Push $IsAdminUser ; "true" or "false" - Push "PATH" - Call AddToPath - ; Add the Start Menu folder and start adding the items. ${CreateDirectory} "$SMPROGRAMS\${LONGNAME}" CreateShortCut "$SMPROGRAMS\${LONGNAME}\Try Rexx.lnk" "$INSTDIR\rexx.exe" '"$INSTDIR\rexxtry.rex"' "$INSTDIR\rexx.exe" @@ -280,7 +287,48 @@ WriteINIStr "$SMPROGRAMS\${LONGNAME}\ooRexx Home Page.url" "InternetShortcut" "URL" "http://www.oorexx.org/" ${AddItem} "$SMPROGRAMS\${LONGNAME}\ooRexx Home Page.url" - ; Write the uninstall keys + ; If we are doing an upgrade, these settings are all left however they were. + ${if} $DoUpgrade == 'false' + ; TEMP TEMP A custom page will be added where the user can specify what they + ; want. Until then ... + ; If any of the association values are empty, fill them in with the default: + ${if} $RegVal_rexxAssociation == '' + StrCpy $RegVal_rexxAssociation '.rex RexxScript' + ${endif} + ${if} $RegVal_rexxHideAssociation == '' + StrCpy $RegVal_rexxHideAssociation '.rxg RexxHide' + ${endif} + ${if} $RegVal_rexxPawsAssociation == '' + StrCpy $RegVal_rexxPawsAssociation '.rxp RexxPawws' + ${endif} + + ; Set the environment variables, PATH, REXX_HOME, etc.. + Call DoEnvVariables + + ; Do the file associations, like associate .rex with ooRexx (REXXScript). + ; The function itself figures out what needs to be done based on some + ; variable settings. + + Call DoFileAssociations + + ; If an administrator, install rxapi as a service depending on what the user + ; selected. + ${if} $IsAdminUser == "true" + Call InstallRxapi + ${endif} + ${else} + ; We are doing an upgrade, but if rxapi was installed as a service + ; previously, the user has the choice of starting it. + ${if} $RxapiIsService == 'true' + Call StartRxapi + ${endif} + ${endif} + + + ; Write the uninstall keys. Note that the uninstaller always deletes these + ; keys, even if doing an upgrade. So we need to still write the file + ; assoication keys. For an upgrade install, these will be exactly what we + ; read in on init. WriteRegExpandStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${SHORTNAME}" "InstallLocation" '"$INSTDIR"' WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${SHORTNAME}" "DisplayName" "${LONGNAME}" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${SHORTNAME}" "DisplayIcon" "${DISPLAYICON}" @@ -295,23 +343,13 @@ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${SHORTNAME}" "UninstallVersion" "${VERSION}" WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${SHORTNAME}" "NoModify" 0x00000001 WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${SHORTNAME}" "NoRepair" 0x00000001 - ${WriteUninstaller} "$INSTDIR\${UNINSTALLER}" - ; Associate .rex with ooRexx (REXXScript) - Push 1 - Push ".rex" - Call DoFileAssociation + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${SHORTNAME}" "RexxAssociation" $RegVal_rexxAssociation + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${SHORTNAME}" "RexxHideAssociation" $RegVal_rexxHideAssociation + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${SHORTNAME}" "RexxPawsAssociation" $RegVal_rexxPawsAssociation - ; Add .rex to the PATHEXT - Push ".rex" - Call AddToPathExt + ${WriteUninstaller} "$INSTDIR\${UNINSTALLER}" - ; If an administrator, install rxapi as a service depending on what the user - ; selected. - ${if} $IsAdminUser == "true" - Call InstallRxapi - ${endif} - SectionEnd ;------------------------------------------------------------------------------- @@ -666,15 +704,20 @@ SetFileAttributes "$INSTDIR\${UninstLog}" READONLY|SYSTEM|HIDDEN SectionEnd -Var PreviousVersionInstalled - ;=============================================================================== ;Installer Functions ;=============================================================================== +/** .onInit() Call back function + * + * Called by the installer before any page is shown. We use it to check for a + * previously installed ooRexx and to set execution variables. + * + * Note that if we end up doing an upgrade type of install, + * RegVal_uninstallLocation needs to be copied to the INSTDIR variable so that + * we install in the same place as previous. + */ Function .onInit - ; Called by the installer before any page is shown. We use it to check for a - ; previously installed ooRexx and to set execution variables. ${if} ${CPU} == "x86_64" strcpy $INSTDIR "$PROGRAMFILES64\${SHORTNAME}" @@ -697,6 +740,9 @@ ReadRegStr $RegVal_uninstallString HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${SHORTNAME}" "UninstallString" ReadRegStr $RegVal_uninstallLocation HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${SHORTNAME}" "UnInstallLocation" ReadRegStr $RegVal_uninstallVersion HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${SHORTNAME}" "UninstallVersion" + ReadRegStr $RegVal_rexxAssociation HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${SHORTNAME}" "RexxAssociation" + ReadRegStr $RegVal_rexxHideAssociation HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${SHORTNAME}" "RexxHideAssociation" + ReadRegStr $RegVal_rexxPawsAssociation HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${SHORTNAME}" "RexxPawsAssociation" ; Check for previous version and if the upgrade type of uninstall is available. ${if} $RegVal_uninstallString == "" @@ -723,9 +769,21 @@ ${endif} ${endif} + ; We never do an upgrade type of install unless the user requests it. + StrCpy $DoUpgrade 'false' + FunctionEnd /** Uninstall_Old_ooRexx_page() Custom page function. + * + * This page is show when a previously installed version ooRexx is detected. It + * explains to the user that it is necessary to uninstall the previous version + * and forces the user to check a secondary check box to "force" the install to + * continue without uninstalling the previous version. + * + * The intent is to make it difficult to not do the uninstall and ensure that + * the user knows installing over the top of an existing install is not + * supported. */ Function Uninstall_Old_ooRexx_page @@ -828,6 +886,14 @@ FunctionEnd +/** Uninstall_Type_page() Custom page function. + * + * This page is show when a previously installed version ooRexx is detected, + * and the uninstaller version is capable of doing an upgrade type of install. + * + * It gives the user the option of only deleting the installed files while + * leaving the environment, registry, etc., setting untouched. + */ Function Uninstall_Type_page /* Skip this page if no previous version is present */ @@ -836,7 +902,6 @@ ${endif} ${if} $UpgradeTypeAvailable == 'false' - StrCpy $DoUpgrade 'false' Call Do_The_Uninstall Abort ${endif} @@ -853,14 +918,18 @@ "An 'upgrade' type of install will remove all the previously installed files and install \ the new version of ${SHORTNAME}. However, it will not undo any of the environment, file \ association, or registry settings done by the previous install.$\n$\n\ - Use this type of install when you have customized these types of settings and do not wish \ - them changed.$\n$\n\ + Use this type of install to quickly replace the old version files with the new version \ + files. Or, when you have customized these types of settings and do not wish them changed.$\n$\n\ Note: with this type of install, the install location and other settings can NOT be changed.$\n$\n\" Pop $Label_One ${NSD_CreateCheckBox} 0 68u 100% 8u "Perform an upgrade type of install" Pop $Do_Upgrade_Type_CK + ; Set focus to the page dialog rather than the installer dialog, set focus to + ; the check box, and then show the page dialog + SendMessage $Dialog ${WM_SETFOCUS} $HWNDPARENT 0 + SendMessage $Dialog ${WM_NEXTDLGCTL} $Do_Upgrade_Type_CK 1 nsDialogs::Show FunctionEnd @@ -883,8 +952,33 @@ FunctionEnd +/** Do_The_Uninstall() + * + * Executes the uninstall program and waits for its return. The user could + * have: + * Finished the uninstall + * Canceled the uninstall because they want to stop any running Rexx programs + * Canceled the uninstll for some other reason + * + * In addition, the script may have aborted the uninstall for some unexplained + * error. + * + * In all cases we quit the install. We put up a message box to explain why we + * are quitting in most cases, the only exception is if the user choose to quit + * to stop any running Rexx programs. + * + * @note If we are doing an upgrade install, then we need to install to the + * same location as the original install. This could easily be different + * than what $INSTDIR currently is, so we set $INSTDIR to our uninstall + * location. For an upgrade install, the portion of the installer that + * allows the user to pick the install location will be disable. + */ Function Do_The_Uninstall + ${if} $DoUpgrade == 'true' + StrCpy $INSTDIR $RegVal_uninstallLocation + ${endif} + HideWindow ClearErrors @@ -920,8 +1014,16 @@ Goto DoAbort ${endif} - ; Return code is 2 or greater. 2 is uninstall canceled by script, treat - ; anything greater than 2 in the same way. + ${if} $0 == 4 + ; The user wants to quit to stop rxapi. Only set to 4 if the user cancels + ; on the page where she is asked to stop rxapi. On that page she is given + ; the option to quit completely. + Goto DoAbort + ${endif} + + + ; Return code is 2 or greater, but not 4. 2 is uninstall canceled by script, + ; we treat anything greater than 2 in the same way. MessageBox MB_OK|MB_ICONEXCLAMATION|MB_TOPMOST \ "The uninstall of the previous version of ${SHORTNAME} was terminated by$\n\ the uninstall script. The most likely cause of this is that the rxapi$\n\ @@ -1023,33 +1125,15 @@ Quit ${endif} - /* - * If the user decided to force the installation without removing the previous - * installation, then it is possible that rxapi is still installed as a - * service. Since stopping a service is the surest means of stopping rxapi, - * we'll check that first. - */ - ${if} $$RxapiIsService == 'true' - Services::SendServiceCommand 'stop' 'RXAPI' - Pop $R0 - ${if} $R0 == 'Ok' - Goto NotRunning - ${endif} - ${else} - ooRexxProcess::killProcess "rxapi.exe" - Pop $R0 - ${if} $R0 == 0 - Goto NotRunning - ${endif} - ${endif} - - /* We'll try one more time to kill rxapi and capture the return code */ - ooRexxProcess::killProcess "rxapi.exe" + Call StopRxapi Pop $R0 - ${if} $R0 == 0 + ${if} $R0 == 'Ok' Goto NotRunning ${endif} + ; rxapi was not stopped, the error code is now at top of stack + Pop $R0 + MessageBox MB_OK|MB_ICONEXCLAMATION|MB_TOPMOST \ "Can not determine conclusively that the Open Object Rexx memory manager (rxapi) is$\n\ stopped. Since a new version of rxapi can not be installed while rxapi is running,$\n\ @@ -1057,12 +1141,58 @@ Please use the task manager to locate rxapi.exe and end that process, then restart the$\n\ installation. If you are uncomfortable with using the task manager, contact the$\n\ ${SHORTNAME} developers on SourceForge for help.$\n$\n\ - If you report this problem, please not that the error code is $R0." /SD IDOK + If you report this problem, please note that the error code is $R0." /SD IDOK Quit NotRunning: FunctionEnd +/** Components_Page_show() Call back function + * + * Invoked by the installer right before the components page is shown. + * + * If this is an upgrade install, we don't allow the user to quit from here on + * out. On this page we also don't let the user go back + * + * When it is not an upgrade install, nothing is done. + */ +Function Components_Page_show + + ${if} $DoUpgrade == 'true' + ; Disable Back button + GetDlgItem $0 $HWNDPARENT 3 + EnableWindow $0 0 + + Call PageDisableQuit + ${endif} + +FunctionEnd + +/** Directory_Page_show() Call back function + * + * Invoked by the installer right before the directory page is shown. + * + * If this is an upgrade install, the install location can not be changed. We + * use function to show the user the install location, but not let them change + * the location. + * + * When it is not an upgrade install, nothing is done. + */ +Function Directory_Page_show + + ${if} $DoUpgrade == 'true' + SendMessage $mui.DirectoryPage.Text ${WM_SETTEXT} 0 \ + "STR:Setup will install ${LONGNAME} ${VERSION} in the following folder. The location can not be \ + changed for an upgrade type of install. Click Next to continue." + + EnableWindow $mui.DirectoryPage.Directory 0 + EnableWindow $mui.DirectoryPage.BrowseButton 0 + + Call PageDisableQuit + ${endif} + +FunctionEnd + /** Rxapi_Options_page() Custom page function. * * This function is used to display the custom page that asks the user if they @@ -1077,7 +1207,20 @@ Abort ${endif} - !insertmacro MUI_HEADER_TEXT "The ooRexx rxapi process" "Install rxapi as a Windows Service" + ; If doing an upgrade and rxapi was NOT previously installed as a service, we + ; skip this page + ${if} $DoUpgrade == 'true' + ${andif} $RxapiIsService == 'false' + Abort + ${endif} + + ${if} $DoUpgrade == 'true' + !insertmacro MUI_HEADER_TEXT "ooRexx rxapi is installed as a Windows Service." "Choose whether \ + to start the rxapi Service during installation." + ${else} + !insertmacro MUI_HEADER_TEXT "The ooRexx rxapi process." "Install rxapi as a Windows Service." + ${endif} + nsDialogs::Create /NOUNLOAD 1018 Pop $Dialog @@ -1099,9 +1242,19 @@ ${NSD_CreateCheckBox} 0 86u 100% 15u "Install rxapi as a Windows Service" Pop $RxAPI_Install_Service_CK - ${NSD_SetState} $RxAPI_Install_Service_CK $RxAPIInstallService - ${NSD_OnClick} $RxAPI_Install_Service_CK EnableStartService + ; If we are doing an upgrade, then we are only here if rxapi was previously + ; installed as a service. If so we don't allow the user to change this. + ${if} $DoUpgrade == 'true' + ${NSD_SetState} $RxAPI_Install_Service_CK 1 + EnableWindow $RxAPI_Install_Service_CK 0 + EnableWindow $Label_One 0 + Call PageDisableQuit + ${else} + ${NSD_SetState} $RxAPI_Install_Service_CK $RxAPIInstallService + ${NSD_OnClick} $RxAPI_Install_Service_CK EnableStartService + ${endif} + ${NSD_CreateCheckBox} 0 106u 100% 15u "Start the rxapi Service during installation" Pop $RxAPI_Start_CK ${NSD_SetState} $RxAPI_Start_CK $RxAPIStartService @@ -1118,6 +1271,9 @@ * * If the check box is checked, we enable the start the service check box, if it * is unchecked we disable the check box. + * + * Note: If we are doing an upgrade, then NSD_OnClick is not set. So we don't + * need to worry about getting during an upgrade install. */ Function EnableStartService Pop $RxAPI_Install_Service_CK @@ -1143,55 +1299,40 @@ ${NSD_GetState} $RxAPI_Start_CK $RxAPIStartService FunctionEnd -/** CheckIsRxapiService() +/** PageDisableQuit() * - * Determines if rxapi is installed as a service. On return the variable - * RxapiIsService will be set to either 'true' or 'false' - * + * Prevents the user from closing (quitting) the installer from the current + * page. The function could be generic, but at this point only works if we + * are doing an upgrade install. */ -Function CheckIsRxapiService - services::IsServiceInstalled 'RXAPI' - Pop $R0 +Function PageDisableQuit - ${if} $R0 == 'Yes' - StrCpy $RxapiIsService 'true' - ${else} - StrCpy $RxapiIsService 'false' + ; Really this should only be called when DoUpgrade is true, but we'll use + ; a little defensive programming. + ${if} $DoUpgrade == 'true' + ; Disable the close button on title bar. + push $1 + System::Call "user32::GetSystemMenu(i $HWNDPARENT,i 0) i.s" + pop $1 + System::Call "user32::EnableMenuItem(i $1,i 0xF060,i 1)" + pop $1 + + ; Disable Cancel button + GetDlgItem $0 $HWNDPARENT 2 + EnableWindow $0 0 + + ; Set focus to the Next button + GetDlgItem $0 $HWNDPARENT 1 + SendMessage $HWNDPARENT ${WM_NEXTDLGCTL} $0 1 ${endif} + FunctionEnd -/** CheckIsRxapirunning() +/** .onMouseOverSection() Call back function * - * Determines if a rxapi.exe process is running. On return the variable - * RxapiIsRunning is set to 'true', 'false' or 'unknown N' where N is an error - * return code. - * - * TODO still need to test on Vista / Windows 7 - * + * Invoked when the user puts the mouse over one of the componets that can be + * installed. This is what provides the description of each component. */ -Function CheckIsRxapiRunning - ${if} $RxapiIsService == 'true' - services::IsServiceRunning 'RXAPI' - Pop $R0 - ${if} $R0 == 'Yes' - StrCpy $RxapiIsRunning 'true' - ${else} - StrCpy $RxapiIsRunning 'false' - ${endif} - ${else} - ooRexxProcess::findProcess "rxapi.exe" - Pop $R0 - DetailPrint "ooRexxProcess::findProcess rc: $R0" - ${if} $R0 == '0' - StrCpy $RxapiIsRunning 'true' - ${elseif} $R0 == '1' - StrCpy $RxapiIsRunning 'false' - ${else} - StrCpy $RxapiIsRunning 'unknown $R0' - ${endif} - ${endif} -FunctionEnd - Function .onMouseOverSection !insertmacro MUI_DESCRIPTION_BEGIN @@ -1203,110 +1344,180 @@ FunctionEnd -Function DoFileAssociation - ; Does the file associations for ooRexx. Right now we only do .rex and the - ; arguments are a little pointless. - ; - ; TODO - I added the section to install into the user customizable area some - ; years ago. Really what we should be doing, rather than this IsAdmin - ; stuff is deciding if this is a machine-wide install (All Users) or - ; a single-user install. - ; - ; Usage: - ; Push <doIt> - ; Push <ext> - ; - ; Here: - ; Pop $R1 -> $R1 contains the extension, .rex is the only case for now. - ; Pop $R0 -> $R0 contains doIt, 0 or 1. +/** DoEnvVariables() + * + * Sets up the variable environemnt variables. + */ +Function DoEnvVariables - Pop $R1 - Pop $R0 - ${if} $R0 == 0 - Return + Push "REXX_HOME" + Push $INSTDIR + Push $IsAdminUser ; "true" or "false" + Call WriteEnvStr + + ; Add the install directory to the PATH env variable, either system wide or + ; user-specific + Push $INSTDIR + Push $IsAdminUser ; "true" or "false" + Push "PATH" + Call AddToPath + + ; Do the PATHEXT extensions + Push ".rex" + Call AddToPathExt +FunctionEnd + +/** DoFileAssociations() + * + * Does the file associations for ooRexx. + * + */ +Function DoFileAssociations + + ${if} $RegVal_rexxAssociation != '' + StrCpy $AssociationProgramName 'rexx.exe' + Call AssociateExtensionWithExe ${endif} - ${if} $R1 == "" - Return + + ${if} $RegVal_rexxHideAssociation != '' + StrCpy $AssociationProgramName 'rexxhide.exe' + Call AssociateExtensionWithExe ${endif} + ${if} $RegVal_rexxPawsAssociation != '' + StrCpy $AssociationProgramName 'rexxpaws.exe' + Call AssociateExtensionWithExe + ${endif} + + System::Call 'Shell32::SHChangeNotify(i ${SHCNE_ASSOCCHANGED}, i ${SHCNF_IDLIST}, i 0, i 0)' +FunctionEnd + +/** AssociateExtensionWithExe() + * + * Associates a file extension and file type with one of the ooRexx executables, + * rexx.exe, rexxhide.exe, or rexxpaws. We are only called when we have + * something to do. + * + * TODO - I added the section to install into the user customizable area some + * years ago. Really what we should be doing, rather than this IsAdmin + * stuff is deciding if this is a machine-wide install (All Users) or + * a single-user install. Then use SHCTX or SHELL_CONTEXT to just write + * once. SHCTX will use HKCR if it is an all users install and HKCU for + * a single user install. + * + */ +Function AssociateExtensionWithExe + + ; We will put the file extension in $0 and the ftype in $1 + ${if} $AssociationProgramName == 'rexx.exe' + ${StrTok} $0 $RegVal_rexxAssociation " " "0" "0" + ${StrTok} $1 $RegVal_rexxAssociation " " "1" "0" + StrCpy $AssociationText "ooRexx Rexx Progam" + ${elseif} $AssociationProgramName == 'rexxhide.exe' + ${StrTok} $0 $RegVal_rexxHideAssociation " " "0" "0" + ${StrTok} $1 $RegVal_rexxHideAssociation " " "1" "0" + StrCpy $AssociationText "ooRexx Rexx GUI Progam" + ${elseif} $AssociationProgramName == 'rexxpaws.exe' + ${StrTok} $0 $RegVal_rexxPawsAssociation " " "0" "0" + ${StrTok} $1 $RegVal_rexxPawsAssociation " " "1" "0" + StrCpy $AssociationText "ooRexx Rexx pausing Progam" + ${else} + DetailPrint "Unrecoverable ERROR. The ftype association executable: $AssociationProgramName is not recognized." + Goto DoneWithRexxExe + ${endif} + + ${if} $0 == '' + ${orif} $1 == '' + DetailPrint "Unrecoverable ERROR. Empty string in $AssociationProgramName association" + DetailPrint " Word one=<$0> word two=<$1>" + Goto DoneWithRexxExe + ${endif} + ClearErrors - WriteRegStr HKCR $R1 "" "REXXScript" + ; Write key $0 (.rex for example) with default value of $1 (RexxScript for example.) + WriteRegStr HKCR $0 "" $1 IfErrors TryCurrentUser - DetailPrint "Registering $R1 extension to run with ooRexx for all users" + DetailPrint "Registered $0 extension as ftype $1 to open with $AssociationProgramName for all users" Goto WriteHKCRRegKeys TryCurrentUser: ; Failed to write to the registy, try the user customizable area. ClearErrors - WriteRegStr HKCU $R1 "" "REXXScript" + WriteRegStr HKCU $0 "" $1 IfErrors 0 - DetailPrint "Failed to register $R1 extension to run with ooRexx for all users and the current user" - Return + DetailPrint "Could NOT associate $0 extension with $AssociationProgramName for either all users or the current user" + Goto DonewithRexxExe - DetailPrint "Registering $R1 extension to run with ooRexx for the current user" - WriteRegStr HKCU "SOFTWARE\Classes\REXXScript" "" "ooRexx Rexx Program" - WriteRegStr HKCU "SOFTWARE\Classes\REXXScript\shell" "" "open" - WriteRegStr HKCU "SOFTWARE\Classes\REXXScript\DefaultIcon" "" "$INSTDIR\rexx.exe,0" - WriteRegStr HKCU "SOFTWARE\Classes\REXXScript\shell\open" "" "Run" - WriteRegStr HKCU "SOFTWARE\Classes\REXXScript\shell\open\command" "" '"$INSTDIR\rexx.exe" "%1" %*' - WriteRegStr HKCU "SOFTWARE\Classes\REXXScript\shell\edit" "" "Edit" - WriteRegStr HKCU "SOFTWARE\Classes\REXXScript\shell\edit\command" "" 'notepad.exe "%1"' - WriteRegStr HKCU "SOFTWARE\Classes\REXXScript\shellex\DropHandler" "" "{60254CA5-953B-11CF-8C96-00AA00B8708C}" - Goto NotifyTheShell + DetailPrint "Registered $0 extension as ftype $1 to open with $AssociationProgramName for the current user." + WriteRegStr HKCU "SOFTWARE\Classes\$1" "" $AssociationText + WriteRegStr HKCU "SOFTWARE\Classes\$1\shell" "" "open" + WriteRegStr HKCU "SOFTWARE\Classes\$1\DefaultIcon" "" "$INSTDIR\$AssociationProgramName,0" + WriteRegStr HKCU "SOFTWARE\Classes\$1\shell\open" "" "Run" + WriteRegStr HKCU "SOFTWARE\Classes\$1\shell\open\command" "" '"$INSTDIR\$AssociationProgramName" "%1" %*' + WriteRegStr HKCU "SOFTWARE\Classes\$1\shell\edit" "" "Edit" + WriteRegStr HKCU "SOFTWARE\Classes\$1\shell\edit\command" "" 'notepad.exe "%1"' + WriteRegStr HKCU "SOFTWARE\Classes\$1\shellex\DropHandler" "" "{60254CA5-953B-11CF-8C96-00AA00B8708C}" + Goto DoneWithRexxExe WriteHKCRRegKeys: - WriteRegStr HKCR "REXXScript" "" "ooRexx Rexx Program" - WriteRegStr HKCR "REXXScript\shell" "" "open" - WriteRegStr HKCR "REXXScript\DefaultIcon" "" "$INSTDIR\rexx.exe,0" - WriteRegStr HKCR "REXXScript\shell\open" "" "Run" - WriteRegStr HKCR "REXXScript\shell\open\command" "" '"$INSTDIR\rexx.exe" "%1" %*' - WriteRegStr HKCR "REXXScript\shell\edit" "" "Edit" - WriteRegStr HKCR "REXXScript\shell\edit\command" "" 'notepad.exe "%1"' - WriteRegStr HKCR "REXXScript\shellex\DropHandler" "" "{60254CA5-953B-11CF-8C96-00AA00B8708C}" + WriteRegStr HKCR "$1" "" $AssociationText + WriteRegStr HKCR "$1\shell" "" "open" + WriteRegStr HKCR "$1\DefaultIcon" "" "$INSTDIR\$AssociationProgramName,0" + WriteRegStr HKCR "$1\shell\open" "" "Run" + WriteRegStr HKCR "$1\shell\open\command" "" '"$INSTDIR\$AssociationProgramName" "%1" %*' + WriteRegStr HKCR "$1\shell\edit" "" "Edit" + WriteRegStr HKCR "$1\shell\edit\command" "" 'notepad.exe "%1"' + WriteRegStr HKCR "$1\shellex\DropHandler" "" "{60254CA5-953B-11CF-8C96-00AA00B8708C}" - - NotifyTheShell: - System::Call 'Shell32::SHChangeNotify(i ${SHCNE_ASSOCCHANGED}, i ${SHCNF_IDLIST}, i 0, i 0)' + DoneWithRexxExe: FunctionEnd +/** AddToPathExt() + * + * Adds the file extension(s) associated with the ooRexx executables to PATHEXT. + * + * Right now the user can not specifies these, but a future enhancement will add + * that feature. + * + * @notes - This could be done for a single-user install, but remember that + * the user specific PATHEXT *replaces* the system wide PATHEXT, so + * we would need to read the system wide value and add the extension + * to it and then write it to the user specific PATHEXT. + */ Function AddToPathExt - ; Adds the specified file extension to PATHEXT Right now we only do .rex and - ; the argument is a little pointless. - ; - ; @notes - This could be done for a single-user install, but remember that - ; the user specific PATHEXT *replaces* the system wide PATHEXT, so - ; we would need to read the system wide value and add the extension - ; to it. - ; - ; Usage: - ; Push <ext> - ; - ; Here: - ; Pop $R0 -> $R0 now contains the extension to add to PATHEXT. - Pop $R0 - - ${if} $IsAdminUser == "false" + ${if} $IsAdminUser == "false" ; TODO fix this Return ${endif} - Call IsNT - Pop $1 - ${if} $1 == 0 - Return - ${endif} + ${StrTok} $0 $RegVal_rexxAssociation " " "0" "0" + DetailPrint "Adding the $0 extension to PATHEXT" + Push $0 + Push $IsAdminUser ; should only be "true" at this point + Push "PATHEXT" + Call AddToPath - DetailPrint "Adding the $R1 extension to PATHEXT" - Push $R0 + ${StrTok} $0 $RegVal_rexxHideAssociation " " "0" "0" + DetailPrint "Adding the $0 extension to PATHEXT" + Push $0 Push $IsAdminUser ; should only be "true" at this point Push "PATHEXT" Call AddToPath + + ${StrTok} $0 $RegVal_rexxPawsAssociation " " "0" "0" + DetailPrint "Adding the $0 extension to PATHEXT" + Push $0 + Push $IsAdminUser ; should only be "true" at this point + Push "PATHEXT" + Call AddToPath + FunctionEnd -/** +/** InstallRxapi() + * + * Installs rxapi as a service, if the user elected to do so. */ Function InstallRxapi - ; Installs rxapi as a service, if the user elected to do so. ${if} $RxAPIInstallService == 1 ; User asked to install rxapi as a service. @@ -1316,25 +1527,137 @@ ${if} $R0 == 0 DetailPrint "rxapi successfully installed as a Windows Service" - ${if} $RxAPIStartService == 1 - ; User also asked to start the service. - Services::SendServiceCommand 'start' 'RXAPI' - Pop $R0 - - ${if} $R0 == 'Ok' - DetailPrint "The rxapi service was successfully sent the start command" - ${else} - MessageBox MB_OK|MB_ICONEXCLAMATION|MB_TOPMOST "Failed to start the ooRexx rxapi service: $R0\n" /SD IDOK - ${endif} - ${endif} + Call StartRxapi ${else} MessageBox MB_OK|MB_ICONEXCLAMATION|MB_TOPMOST "Failed to install rxapi as a Windows Service: $R0\n" /SD IDOK ${endif} ${endif} FunctionEnd +/** CheckIsRxapiService() + * + * Determines if rxapi is installed as a service. On return the variable + * RxapiIsService will be set to either 'true' or 'false' + * + */ +Function CheckIsRxapiService + services::IsServiceInstalled 'RXAPI' + Pop $R0 + + ${if} $R0 == 'Yes' + StrCpy $RxapiIsService 'true' + ${else} + StrCpy $RxapiIsService 'false' + ${endif} +FunctionEnd + +/** CheckIsRxapirunning() + * + * Determines if a rxapi.exe process is running. On return the variable + * RxapiIsRunning is set to 'true', 'false' or 'unknown N' where N is an error + * return code. + * + * TODO still need to test on Vista / Windows 7 + * + */ +Function CheckIsRxapiRunning + ${if} $RxapiIsService == 'true' + services::IsServiceRunning 'RXAPI' + Pop $R0 + ${if} $R0 == 'Yes' + StrCpy $RxapiIsRunning 'true' + ${else} + StrCpy $RxapiIsRunning 'false' + ${endif} + ${else} + ooRexxProcess::findProcess "rxapi.exe" + Pop $R0 + DetailPrint "ooRexxProcess::findProcess rc: $R0" + ${if} $R0 == '0' + StrCpy $RxapiIsRunning 'true' + ${elseif} $R0 == '1' + StrCpy $RxapiIsRunning 'false' + ${else} + StrCpy $RxapiIsRunning 'unknown $R0' + ${endif} + ${endif} +FunctionEnd + +/** StartRxapi() + * + * Starts the rxapi service process, if the user elected to do so. + */ +Function StartRxapi + + ${if} $RxAPIStartService == 1 + ; User asked to start the rxapi service. + Services::SendServiceCommand 'start' 'RXAPI' + Pop $R0 + + ${if} $R0 == 'Ok' + DetailPrint "The rxapi service was successfully sent the start command" + ${else} + MessageBox MB_OK|MB_ICONEXCLAMATION|MB_TOPMOST "Failed to start the ooRexx rxapi service: $R0" /SD IDOK + ${endif} + ${endif} + +FunctionEnd + +/** StopRxapi() + * + * Stop the rxapi.exe process. + * + * If rxapi is installed as a service, the stop command should stop it. + * Otherwise, we use killProcess. + * + * On return top of stack will contain 'Ok' for success or 'Error'. If there + * was an error top of stack minus 1 will contain the error code from + * ooRexx::killProcess. + * + * @remarks There was a problem I was having with CheckisRxapiRunning saying + * rxapi was running when it actually was not. + * + * When a service is sent the stop command it may take some time for + * it to report its state to the service control manager. In addition + * the state may first be changed to stop pending. In both of these + * cases CheckIsRxapirunning would report that rxapi is running. So, + * a .3 sleep is added, which hopefully fixes the problem. + */ +Function StopRxapi + + ${if} $RxapiIsService == 'true' + Services::SendServiceCommand 'stop' 'RXAPI' + Pop $R0 + Sleep 300 + ${else} + ooRexxProcess::killProcess 'rxapi' + Pop $R0 + ${endif} + + Call CheckIsRxapiRunning + ${if} $RxapiIsRunning == 'false' + Push 'Ok' + return + ${endif} + + ; Still running, try one more time, it may be that the service has a stop + ; pending. Otherwise, this is probably a waste of time. But, we will capture + ; the error code for debugging. Note that if the return from killProcess is + ; 1, then the process was not found, so it is not running. See the @remarks + ; above. + ooRexxProcess::killProcess 'rxapi' + Pop $R0 + ${if} $R0 == 0 + ${orif} $R0 == 1 + Push 'Ok' + ${else} + Push $R0 + Push 'Error' + ${endif} +FunctionEnd + ;=============================================================================== -; Uninstaller Sections +; Uninstaller portion of oorexx.nsi. ;=============================================================================== ; @@ -1343,9 +1666,12 @@ ; that and specifically delete those keys. However, testing shows that the current code always ; removes those keys. Tested on a number of machines with a number of different users. +;=============================================================================== +; Uninstaller Sections +;=============================================================================== + ;------------------------------------------------------------------------------- -; Uninstall - +; Uninstall section Section "Uninstall" /* @@ -1360,46 +1686,42 @@ ooRExxProcess::killProc "rxapi.exe" */ - ${if} $RxapiIsService == 'true' - Call un.InstallRxapiService - Pop $R0 - ${if} $R0 != 0 - MessageBox MB_OK|MB_ICONSTOP \ - "Unexpected error removing the rxapi service.$\n$\n\ - The uninstall will abort. Report this error to$\n\ - the ${SHORTNAME} developers:$\n$\n\ - Uninstall as service failed: $R0" \ - /SD IDOK - SetErrorLevel 3 - Quit + /* If we are doing an upgrade type of install, we leave everything as it was. */ + ${if} $DoUpgrade == 'false' + ${if} $RxapiIsService == 'true' + Call un.InstallRxapiService + Pop $R0 + ${if} $R0 != 0 + MessageBox MB_OK|MB_ICONSTOP \ + "Unexpected error removing the rxapi service.$\n$\n\ + The uninstall will abort. Report this error to$\n\ + the ${SHORTNAME} developers:$\n$\n\ + Uninstall as service failed: $R0" \ + /SD IDOK + SetErrorLevel 3 + Quit + ${endif} ${endif} - ${endif} - ; Get rid of the file association - Push ".rex" - Call un.DeleteFileAssociation + ; Get rid of the file associations. Also removes the extension from + ; PATHEXT. + Call un.DeleteFileAssociations - ; Remove .rex from PATHEXT - Push ".rex" - Call un.AddToPathExt + ; remove directory from PATH + Push $INSTDIR + Push $IsAdminUser ; pushes "true" or "false" + Push "PATH" + Call un.RemoveFromPath - ; remove directory from PATH - Push $INSTDIR - Push $IsAdminUser ; pushes "true" or "false" - Push "PATH" - Call un.RemoveFromPath + ; remove the REXX_HOME environment variable + Push "REXX_HOME" + Push $IsAdminUser ; "true" or "false" + Call un.DeleteEnvStr + ${endif} - ; - DeleteRegKey HKCR "REXXScript" - - ; remove the REXX_HOME environment variable - Push "REXX_HOME" - Push $IsAdminUser ; "true" or "false" - Call un.DeleteEnvStr - - ; Remove the installation stuff + ; Upgrade or not, we always remove the installation stuff. DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${SHORTNAME}" - DeleteRegKey HKLM "SOFTWARE\${LONGNAME}" + ;DeleteRegKey HKLM "SOFTWARE\${LONGNAME}" We don't write anything here, maybe we should? Call un.Delete_Installed_Files @@ -1409,9 +1731,13 @@ ; Uninstaller Functions ;=============================================================================== +/** un.onInit() Callback function. + * + * Called by the uninstaller program before any pages are shown. We use it to + * set up the execution variables. + * + */ Function un.onInit - ; Called by the uninstaller program before any pages are shown. We use it to - ; set up the execution variables. ${GetOptions} "$CMDLINE" "/U=" $R0 ${if} $R0 == 'true' @@ -1420,6 +1746,8 @@ StrCpy $DoUpgrade 'false' ${endif} + StrCpy $DeleteWholeTree 'false' + ; UnInstall as All Users if an admin Call un.IsUserAdmin Pop $IsAdminUser @@ -1427,203 +1755,18 @@ SetShellVarContext all ${endif} + ; Read in the file associations done by the installer. + ReadRegStr $RegVal_rexxAssociation HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${SHORTNAME}" "RexxAssociation" + ReadRegStr $RegVal_rexxHideAssociation HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${SHORTNAME}" "RexxHideAssociation" + ReadRegStr $RegVal_rexxPawsAssociation HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${SHORTNAME}" "RexxPawsAssociation" + StrCpy $StopRxAPI_CK_State 1 + StrCpy $InStopRxapiPage 'false' Call un.CheckIsRxapiService Call un.CheckIsRxapiRunning FunctionEnd -/** un.Delete_Installed_Files() - * - * Deletes the installed files in the manner specified by the user. Either by - * using the log file to delete only files installed by the previous - * installaltion or by simply deleting the whole installation directory. - */ -Function un.Delete_Installed_Files - ${if} $DeleteWholeTree == 'true' - DetailPrint "Uninstall files by deleting the $INSTDIR directory tree" - RMDir /r "$INSTDIR" - DetailPrint "Removing all Start Menu short cuts by removing the $SMPROGRAMS\${LONGNAME} folder" - RMDir /r "$SMPROGRAMS\${LONGNAME}" - ${else} - DetailPrint "Uninstall files using the install log file" - Push $R0 - Push $R1 - Push $R2 - SetFileAttributes "$INSTDIR\${UninstLog}" NORMAL - FileOpen $UninstLog "$INSTDIR\${UninstLog}" r - StrCpy $R1 0 - - GetLineCount: - ClearErrors - FileRead $UninstLog $R0 - IntOp $R1 $R1 + 1 - IfErrors 0 GetLineCount - - LoopRead: - FileSeek $UninstLog 0 SET - StrCpy $R2 0 - FindLine: - FileRead $UninstLog $R0 - IntOp $R2 $R2 + 1 - StrCmp $R1 $R2 0 FindLine - - StrCpy $R0 $R0 -2 - IfFileExists "$R0\*.*" 0 +3 - RMDir $R0 #is dir - Goto +3 - IfFileExists $R0 0 +2 - Delete $R0 #is file - - IntOp $R1 $R1 - 1 - StrCmp $R1 0 LoopDone - Goto LoopRead - LoopDone: - FileClose $UninstLog - Delete "$INSTDIR\${UninstLog}" - RMDir "$INSTDIR" - Pop $R2 - Pop $R1 - Pop $R0 - ${endif} - -FunctionEnd - -/** un.InstallRxapiService() - * Removes the rxapi service. Only called if RxapiIsService is true. - * - * The uninstaller always quits right at the beginning if it can not stop the - * rxapi. So logically, rxapi should be stopped, and if it isn't, it should be - * stoppable. - * - * Pushes a return code to the top of the stack. 0 for success, otherwise an - * error code. - */ -Function un.InstallRxapiService - Call un.CheckIsRxapiRunning - ${if} $$RxapiIsRunning == 'true' - Services::SendServiceCommand 'stop' 'rxapi' - Pop $R0 - - ${if} $R0 != 'Ok' - ; Seems impossible to get here, but if we did, we'll try to kill rxapi. - ; If that fails we give up. - DetailPrint "Service Control Manager failed to stop rxapi, forcing termination" - ooRexxProcess::killProcess 'rxapi' - Pop $R0 - ${if} $R0 != 0 - ${andif} $R0 != 1 - Push $R0 - Return - ${endif} - ${endif} - ${endif} - - DetailPrint "Uninstalling ooRexx rxapi Service" - nsExec::ExecToLog "$INSTDIR\rxapi /u /s" - Pop $R0 - - ${if} $R0 != 0 - ; One reason for this could be that rxapi.exe, the file, has been deleted. - ; We'll try to handle this case by having the service manager delete the - ; service. This can be done even if rxapi.exe is missing. - Services::SendServiceCommand 'delete' 'rxapi' - Pop $R0 - ${if} $R0 != 'Ok' - DetailPrint "Failed to uninstall rxapi as a service. Reason: $R0" - Push $R0 - Return - ${endif} - ${endif} - - DetailPrint "Uninstalled rxapi as a service" - Push 0 -FunctionEnd - -Function un.DeleteFileAssociation - ; Top of stack has the file extension, only "REX" at this time. Pop it off - ; into R0. - Pop $R0 - ReadRegStr $R1 HKCR "$R0" "" - ${if} $R1 == "RexxScript" - ; Only delete the .rex association if we own it, (we use RexxScript for the ftype name.) - DeleteRegKey HKCR "$R0" - DetailPrint "Deleted file association for $R0" - ${endif} -FunctionEnd - -Function un.AddToPathExt - ; Removes the specified file extension from PATHEXT Right now we only do - ; .rex and ; the argument is a little pointless. - ; - ; @notes - This could be done for a single-user install, but remember that - ; ... what? - need to think about how to do this for a single user, - ; could easily hose the system for a user. I.e., end up with no - ; programs running from the command line. - ; - ; Usage: - ; Push <ext> - ; - ; Here: - ; Pop $R0 -> $R0 now contains the extension to add to PATHEXT. - - Pop $R0 - - ${if} $IsAdminUser == "false" - Return - ${endif} - - Call un.IsNT - Pop $1 - ${if} $1 == 0 - Return - ${endif} - - DetailPrint "Removing the $R0 extension from PATHEXT" - Push $R0 - Push $IsAdminUser ; should only be "true" at this point - Push "PATHEXT" - Call un.RemoveFromPath -FunctionEnd - -Function un.CheckIsRxapiService - services::IsServiceInstalled 'RXAPI' - Pop $R0 - ${if} $R0 == 'Yes' - StrCpy $RxapiIsService 'true' - ${else} - StrCpy $RxapiIsService 'false' - ${endif} -FunctionEnd - -Function un.CheckIsRxapiRunning - ; - ; Determines if rxapi.exe is running. - ; - ; TODO still need to test on Vista / Windows 7 - ; - ${if} $RxapiIsService == 'true' - services::IsServiceRunning 'RXAPI' - Pop $R0 - ${if} $R0 == 'Yes' - StrCpy $RxapiIsRunning 'true' - ${else} - StrCpy $RxapiIsRunning 'false' - ${endif} - ${else} - ooRexxProcess::findProcess "rxapi.exe" - Pop $R0 - DetailPrint "ooRexxProcess::findProcess rc: $R0" - ${if} $R0 == '0' - StrCpy $RxapiIsRunning 'true' - ${elseif} $R0 == '1' - StrCpy $RxapiIsRunning 'false' - ${else} - StrCpy $RxapiIsRunning 'unknown $R0' - ${endif} - ${endif} -FunctionEnd - /** un.Ok_Stop_RxAPI_page() Custom page function. * * This is a custom page that follows the Welcome page. If rxapi.exe is not @@ -1635,6 +1778,8 @@ Abort ${endif} + StrCpy $InStopRxapiPage 'true' + !insertmacro MUI_HEADER_TEXT "The ooRexx rxapi process" "The ${LONGNAME} memory manager (rxapi) is currently running" nsDialogs::Create /NOUNLOAD 1018 Pop $Dialog @@ -1643,20 +1788,20 @@ Abort ${EndIf} - ${NSD_CreateLabel} 0 0 100% 96u \ + ${NSD_CreateLabel} 0 0 100% 104u \ "${SHORTNAME} can not be completely uninstalled while rxapi is running.$\n$\n\ When the Stop rxapi check box is checked, the uninstall will stop rxapi before \ proceeding. If the check box is not checked, rxapi will not be stopped.$\n$\n\ If rxapi is not stopped the uninstall will be canceled.$\n$\n\ If, and only if, there are Rexx programs running, stopping the memory manager could \ possibly cause data loss.$\n$\n\ - If you are worried about this, please uncheck the Stop rxapi check box. When the \ - uninstall (or install) ends, stop all running Rexx programs, and rerun the uninstall, \ - (or install.)" + If you are worried about this, cancel the uninstall at this point by using the cancel \ + button or unchecking the Stop rxapi check box. Then stop all running Rexx programs, \ + and rerun the uninstall program, (or the installation program.)" Pop $Label_One - ${NSD_CreateCheckBox} 0 100u 100% 15u "Stop rxapi" + ${NSD_CreateCheckBox} 0 108u 100% 15u "Stop rxapi" Pop $StopRxAPI_CK ${NSD_SetState} $StopRxAPI_CK $StopRxAPI_CK_State @@ -1667,7 +1812,7 @@ FunctionEnd -/** un.Ok_Stop_RxAPI_leave() Call back function. +/** un.Ok_Stop_RxAPI_leave() Custom Page Call back function. * * Invoked by the uninstaller when the user clicks Next on the Ok to stop rxapi * page. We check if the user agreed to stopping rxapi. If not we quit the @@ -1679,10 +1824,12 @@ ${NSD_GetState} $StopRxAPI_CK $StopRxAPI_CK_State ${if} $StopRxAPI_CK_State == 0 - SetErrorLevel 1 + SetErrorLevel 4 Quit ${endif} + StrCpy $InStopRxapiPage 'false' + Call un.StopRxapi Pop $R0 ${if} $R0 == 'Ok' @@ -1711,6 +1858,7 @@ Function un.CheckOkToStopRxapiBack ${NSD_GetState} $StopRxAPI_CK $StopRxAPI_CK_State + StrCpy $InStopRxapiPage 'false' FunctionEnd /** un.Uninstall_By_Log_page() Custom page function. @@ -1757,6 +1905,16 @@ ${endif} + ; If the log file exists and we are doing an upgrade type of uninstall, then + ; we don't show this page. On the other hand, if we are doing an upgrade, but + ; the install log is missing, we do show the page so that the user can cancel + ; here. + + ${if} $DoUpgrade == 'true' + ${andif} $LogFileExists == 'true' + Abort + ${endif} + nsDialogs::Create /NOUNLOAD 1018 Pop $Dialog @@ -1804,39 +1962,322 @@ FunctionEnd +/** un.onCancelButton() Call back function + * + * Invoked by the uninstaller when the user clicks the cancel button. We only + * care if the user was on the ok to stop rxapi page. If so, we set the error + * level to 4 to indicate that, if the uninstall was invoked by the installer, + * we should just quit. + */ +Function un.onCancelButton + ${if} $InStopRxapiPage == 'true' + SetErrorLevel 4 + ${endif} +FunctionEnd + +/** un.Delete_Installed_Files() + * + * Deletes the installed files in the manner specified by the user. Either by + * using the log file to delete only files installed by the previous + * installaltion or by simply deleting the whole installation directory. + */ +Function un.Delete_Installed_Files + + ${if} $DeleteWholeTree == 'true' + DetailPrint "Uninstall files by deleting the $INSTDIR directory tree" + RMDir /r "$INSTDIR" + DetailPrint "Removing all Start Menu short cuts by removing the $SMPROGRAMS\${LONGNAME} folder" + RMDir /r "$SMPROGRAMS\${LONGNAME}" + ${else} + DetailPrint "Uninstall files using the install log file" + Push $R0 + Push $R1 + Push $R2 + SetFileAttributes "$INSTDIR\${UninstLog}" NORMAL + FileOpen $UninstLog "$INSTDIR\${UninstLog}" r + StrCpy $R1 0 + + GetLineCount: + ClearErrors + FileRead $UninstLog $R0 + IntOp $R1 $R1 + 1 + IfErrors 0 GetLineCount + + LoopRead: + FileSeek $UninstLog 0 SET + StrCpy $R2 0 + FindLine: + FileRead $UninstLog $R0 + IntOp $R2 $R2 + 1 + StrCmp $R1 $R2 0 FindLine + + StrCpy $R0 $R0 -2 + IfFileExists "$R0\*.*" 0 +3 + RMDir $R0 #is dir + Goto +3 + IfFileExists $R0 0 +2 + Delete $R0 #is file + + IntOp $R1 $R1 - 1 + StrCmp $R1 0 LoopDone + Goto LoopRead + LoopDone: + FileClose $UninstLog + Delete "$INSTDIR\${UninstLog}" + RMDir "$INSTDIR" + Pop $R2 + Pop $R1 + Pop $R0 + ${endif} + +FunctionEnd + +/** un.InstallRxapiService() + * Removes the rxapi service. Only called if RxapiIsService is true. + * + * The uninstaller always quits right at the beginning if it can not stop the + * rxapi. So logically, rxapi should be stopped, and if it isn't, it should be + * stoppable. + * + * Pushes a return code to the top of the stack. 0 for success, otherwise an + * error code. + */ +Function un.InstallRxapiService + Call un.CheckIsRxapiRunning + ${if} $$RxapiIsRunning == 'true' + Services::SendServiceCommand 'stop' 'rxapi' + Pop $R0 + + ${if} $R0 != 'Ok' + ; Seems impossible to get here, but if we did, we'll try to kill rxapi. + ; If that fails we give up. + DetailPrint "Service Control Manager failed to stop rxapi, forcing termination" + ooRexxProcess::killProcess 'rxapi' + Pop $R0 + ${if} $R0 != 0 + ${andif} $R0 != 1 + Push $R0 + Return + ${endif} + ${endif} + ${endif} + + DetailPrint "Uninstalling ooRexx rxapi Service" + nsExec::ExecToLog "$INSTDIR\rxapi /u /s" + Pop $R0 + + ${if} $R0 != 0 + ; One reason for this could be that rxapi.exe, the file, has been deleted. + ; We'll try to handle this case by having the service manager delete the + ; service. This can be done even if rxapi.exe is missing. + Services::SendServiceCommand 'delete' 'rxapi' + Pop $R0 + ${if} $R0 != 'Ok' + DetailPrint "Failed to uninstall rxapi as a service. Reason: $R0" + Push $R0 + Return + ${endif} + ${endif} + + DetailPrint "Uninstalled rxapi as a service" + Push 0 +FunctionEnd + +/** un.DeleteFileAssociations() + * + * Deletes the file associations set by the installer. + * + * @note Notice that we do the uninstaller differently from the installer. In + * the installer, addToPathExt() determines which extensions to add to + * PATHEXT. Here, un.DeleteFileAssociations decides which extensions to + * remove from the PATHEXT. + * + * TODO need to test this well. TODO need to determine if this is a per machine + * install or a per user install!!!! + */ +Function un.DeleteFileAssociations + + ; We will put the file extension in $0 and the ftype in $1 + + ${if} $RegVal_rexxAssociation != '' + ${UnStrTok} $0 $RegVal_rexxAssociation " " "0" "0" + ${UnStrTok} $1 $RegVal_rexxAssociation " " "1" "0" + + ; Only delete the association if we own it. In other words, the ftype we + ; read from the registry should match the ftype we saved in our uninstall + ; strings. + ReadRegStr $2 HKCR "$0" "" + ${if} $1 == $2 + DeleteRegKey HKCR "$0" + DeleteRegKey HKCR "$1" + DetailPrint "Deleted file association for $0" + + push $0 + Call un.AddToPathExt + ${endif} + ${endif} + + ${if} $RegVal_rexxHideAssociation != '' + ${UnStrTok} $0 $RegVal_rexxHideAssociation " " "0" "0" + ${UnStrTok} $1 $RegVal_rexxHideAssociation " " "1" "0" + + ReadRegStr $2 HKCR "$0" "" + ${if} $1 == $2 + DeleteRegKey HKCR "$0" + DeleteRegKey HKCR "$1" + DetailPrint "Deleted file association for $0" + + push $0 + Call un.AddToPathExt + ${endif} + ${endif} + + ${if} $RegVal_rexxPawsAssociation != '' + ${UnStrTok} $0 $RegVal_rexxPawsAssociation " " "0" "0" + ${UnStrTok} $1 $RegVal_rexxPawsAssociation " " "1" "0" + + ReadRegStr $2 HKCR "$0" "" + ${if} $1 == $2 + DeleteRegKey HKCR "$0" + DeleteRegKey HKCR "$1" + DetailPrint "Deleted file association for $0" + + push $0 + Call un.AddToPathExt + ${endif} + ${endif} + + System::Call 'Shell32::SHChangeNotify(i ${SHCNE_ASSOCCHANGED}, i ${SHCNF_IDLIST}, i 0, i 0)' + +FunctionEnd + +/** un.AddToPathExt() + * + * Removes the specified file extension from PATHEXT. The file extension is + * pushed on the stack to send it here. + * + * @notes - This could be done for a single-user install, but remember that + * ... what? - need to think about how to do this for a single user, + * could easily hose the system for a user. I.e., end up with no + * programs running from the command line. + * + * Usage: + * Push <ext> + * + * Here: + * Pop $R0 -> $R0 now contains the extension to un.add to PATHEXT. I.e., the + * extension to remove. + */ +Function un.AddToPathExt + + Pop $R0 + + ${if} $IsAdminUser == "false" + Return + ${endif} + + DetailPrint "Removing the $R0 extension from PATHEXT." + Push $R0 + Push $IsAdminUser ; should only be "true" at this point + Push "PATHEXT" + Call un.RemoveFromPath +FunctionEnd + +/** un.CheckIsRxapiService() + * + * Checks if rxap is installed as a Windows service. Copies true or false to + * the variable: RxapiIsService as appropriate. + */ +Function un.CheckIsRxapiService + + services::IsServiceInstalled 'RXAPI' + Pop $R0 + ${if} $R0 == 'Yes' + StrCpy $RxapiIsService 'true' + ${else} + StrCpy $RxapiIsService 'false' + ${endif} +FunctionEnd + +/** un.CheckIsRxapiRunning() + * + * Determines if rxapi.exe is running. + * + * On return the top of the stack contains 'true', 'false', or 'unknoww <rc>' + * where the <rc> is the error recturn code from ooRexxProcess::findProcess. + * + * TODO still need to test on Vista / Windows 7 as regular user. + */ +Function un.CheckIsRxapiRunning + + ${if} $RxapiIsService == 'true' + services::IsServiceRunning 'RXAPI' + Pop $R0 + ${if} $R0 == 'Yes' + StrCpy $RxapiIsRunning 'true' + ${else} + StrCpy $RxapiIsRunning 'false' + ${endif} + ${else} + ooRexxProcess::findProcess "rxapi.exe" + Pop $R0 + DetailPrint "ooRexxProcess::findProcess rc: $R0" + ${if} $R0 == '0' + StrCpy $RxapiIsRunning 'true' + ${elseif} $R0 == '1' + StrCpy $RxapiIsRunning 'false' + ${else} + StrCpy $RxapiIsRunning 'unknown $R0' + ${endif} + ${endif} +FunctionEnd + +/** un.StopRxapi() + * + * Stop the rxapi.exe process. + * + * If rxapi is installed as a service, the stop command should stop it. + * Otherwise, we use killProcess. + * + * On return top of stack will contain 'Ok' for success or 'Error'. If there + * was an error top of stack minus 1 will contain the error code from + * ooRexx::killProcess. + * + * @remarks There was a problem I was having with CheckisRxapiRunning saying + * rxapi was running when it actually was not. + * + * When a service is sent the stop command it may take some time for + * it to report its state to the service control manager. In addition + * the state may first be changed to stop pending. In both of these + * cases CheckIsRxapirunning would report that rxapi is running. So, + * a .3 sleep is added, which hopefully fixes the problem. + */ Function un.StopRxapi - ; Stop rxapi.exe. If rxapi is installed as a service, the stop command should - ; stop it. Otherwise, we use killProcess. - ; - ; On return top of stack will contain 'Ok' for success or 'Error'. If there - ; was an error top of stack minus 1 will contain the error code from - ; ooRexx::killProcess. ${if} $RxapiIsService == 'true' Services::SendServiceCommand 'stop' 'RXAPI' Pop $R0 + Sleep 300 ${else} ooRexxProcess::killProcess 'rxapi' Pop $R0 ${endif} - StrCpy $4 $R0 ; TEMP - Call un.CheckIsRxapiRunning ; TODO this function seems to return true sometimes when rxapi is not running + Call un.CheckIsRxapiRunning ${if} $RxapiIsRunning == 'false' Push 'Ok' return ${endif} - MessageBox MB_OK "un.StopRxapi AFTER stop checkIsRxapiRunning reports true RxapiIsService=$RxapiIsRunning popped R0=$4" - - ; Still running, try one more time, although this is probably a waste of time. - ; But, we will capture the error code for debugging. Note that if the return - ; from killProcess is 1, then the process was not found, so it is killed. See - ; the above TODO + ; Still running, try one more time, it may be that the service has a stop + ; pending. Otherwise, this is probably a waste of time. But, we will capture + ; the error code for debugging. Note that if the return from killProcess is + ; 1, then the process was not found, so it is not running. See the @remarks + ; above. ooRexxProcess::killProcess 'rxapi' Pop $R0 ${if} $R0 == 0 - ${orif} $R1 == 1 + ${orif} $R0 == 1 Push 'Ok' ${else} Push $R0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mie...@us...> - 2010-09-18 16:27:05
|
Revision: 6202 http://oorexx.svn.sourceforge.net/oorexx/?rev=6202&view=rev Author: miesfeld Date: 2010-09-18 16:26:57 +0000 (Sat, 18 Sep 2010) Log Message: ----------- In the Windows installer, allow the user to specify their file association settings Modified Paths: -------------- main/trunk/platform/windows/install/oorexx.nsi Modified: main/trunk/platform/windows/install/oorexx.nsi =================================================================== --- main/trunk/platform/windows/install/oorexx.nsi 2010-09-17 14:35:43 UTC (rev 6201) +++ main/trunk/platform/windows/install/oorexx.nsi 2010-09-18 16:26:57 UTC (rev 6202) @@ -13,12 +13,15 @@ ; Note: ; oorexx.nsi MUST be in the current directory. -!define LONGNAME "Open Object Rexx" ;Long Name (for descriptions) -!define SHORTNAME "ooRexx" ;Short name (no slash) of package -!define DISPLAYICON "$INSTDIR\rexx.exe,0" -!define UNINSTALLER "uninstall.exe" -!define KEYFILE1 "rexx.exe" -!define KEYFILE2 "rxapi.dll" +!define LONGNAME "Open Object Rexx" ;Long Name (for descriptions) +!define SHORTNAME "ooRexx" ;Short name (no slash) of package +!define DISPLAYICON "$INSTDIR\rexx.exe,0" +!define UNINSTALLER "uninstall.exe" +!define KEYFILE1 "rexx.exe" +!define KEYFILE2 "rxapi.dll" +!define DefRexxExt ".rex" ; Defualt file extensions +!define DefRexxHideExt ".rexg" +!define DefRexxPawsExt ".rexp" Name "${LONGNAME} ${VERSION}" @@ -56,13 +59,13 @@ !define MUI_UNCONFIRMPAGE !define MUI_UNFINISHPAGE_NOAUTOCLOSE -;define MUI_CUSTOMFUNCTION_GUIINIT myGuiInit - !define MUI_CUSTOMFUNCTION_UNABORT un.onCancelButton !define UninstLog "uninstall.log" Var UninstLog +!define SHACF_FILESYSTEM 1 ; For SHAutoComplete() + !macro AddItem Path FileWrite $UninstLog "${Path}$\r$\n" !macroend @@ -119,11 +122,17 @@ !define MUI_PAGE_CUSTOMFUNCTION_SHOW Components_Page_show !insertmacro MUI_PAGE_COMPONENTS + + !define MUI_PAGE_CUSTOMFUNCTION_PRE Directory_Page_pre !define MUI_PAGE_CUSTOMFUNCTION_SHOW Directory_Page_show !insertmacro MUI_PAGE_DIRECTORY -; Page custom SetCustomAssoc -; Page custom SetCustomLanguage + Page custom Rxapi_Options_page Rxapi_Options_leave + Page custom File_Associations_page File_Associations_leave + Page custom Associate_rexx_page Associate_rexx_leave + Page custom Associate_rexxhide_page Associate_rexxhide_leave + Page custom Associate_rexxpaws_page Associate_rexxpaws_leave + !insertmacro MUI_PAGE_INSTFILES !insertmacro MUI_PAGE_FINISH @@ -131,6 +140,7 @@ !insertmacro MUI_UNPAGE_WELCOME UninstPage custom un.Ok_Stop_RxAPI_page un.Ok_Stop_RxAPI_leave UninstPage custom un.Uninstall_By_Log_page un.Uninstall_By_Log_leave + !define MUI_PAGE_CUSTOMFUNCTION_PRE un.Confirm_Page_pre !insertmacro MUI_UNPAGE_CONFIRM !insertmacro MUI_UNPAGE_INSTFILES !insertmacro MUI_UNPAGE_FINISH @@ -146,37 +156,87 @@ Var IsAdminUser ; is the installer being run by an admin: true / false Var RxapiIsService ; is rxapi installed as a service: true / false Var RxapiIsRunning ; is rxapi running: true / false + +; Var RegVal_uninstallString ; uninstall string (program) found in regsitry Var RegVal_uninstallLocation ; location of uninstall program found in registry Var RegVal_uninstallVersion ; Version / level of uninstaller program. This only exists at 410 or greater Var RegVal_rexxAssociation ; File association string for rexx.exe (.ext / ftype - i.e. .rex RexxScript) -Var RegVal_rexxHideAssociation ; File association string for rexxhide.exe (.ext / ftype - i.e. .rxg RexxHide) -Var RegVal_rexxPawsAssociation ; File association string for rexxpaws.exe (.ext / ftype - i.e. .rxp RexxPaws) +Var RegVal_rexxEditor ; ... and editor file name +Var RegVal_rexxHideAssociation ; File association string for rexxhide.exe (.ext / ftype - i.e. .rexg RexxHide) +Var RegVal_rexxHideEditor ; ... and editor file name +Var RegVal_rexxPawsAssociation ; File association string for rexxpaws.exe (.ext / ftype - i.e. .rexp RexxPaws) +Var RegVal_rexxPawsEditor ; ... and editor file name Var AssociationProgramName ; Executable being associated (i.e rexxpaws.exe, rexx.exe, etc..) Var AssociationText ; Descriptive text that goes in registry (i.e. ooRexx Rexx GUI Program) +Var AssociationEditor ; File path name of editor that goes in registry (i.e. C:\Windows\system32\NotePad.exe) + +Var PreviousVersionInstalled ; A previous version is installed true / false Var DoUpgrade ; try to do an upgrade install true / false +Var DoUpgradeQuick ; don't show options pages with diasabled controls true / false Var UpgradeTypeAvailable ; Level of uninstaller sufficient for upgrade type true / false -Var PreviousVersionInstalled ; A previous version is installed true / false ; Dialog variables Var Dialog Var Label_One Var Label_Two + Var Uninstall_Previous_CK Var Force_Install_CK + Var Do_Upgrade_Type_CK +Var Do_Upgrade_Type_CK_state +Var Do_Upgrade_Quick_CK +Var Do_Upgrade_Quick_CK_state + Var RxAPI_Install_Service_CK Var RxAPI_Start_CK -Var Delete_ooRexx_Tree_CK Var RxAPIInstallService Var RxAPIStartService Var StopRxAPI_CK Var StopRxAPI_CK_State +Var Use_File_Associations_CK +Var Use_File_Associations_CK_state + +; rexx.exe file associations +Var Associate_rexx_CK +Var Associate_rexx_CK_state +Var Rexx_ext_EDIT +Var Rexx_ext_text +Var Rexx_ftype_EDIT +Var Rexx_ftype_text +Var Rexx_editor_EDIT +Var Rexx_editor_text +Var Rexx_editor_PB + +; rexxhide.exe file associations +Var Associate_rexxhide_CK +Var Associate_rexxhide_CK_state +Var RexxHide_ext_EDIT +Var RexxHide_ext_text +Var RexxHide_ftype_EDIT +Var RexxHide_ftype_text +Var RexxHide_editor_EDIT +Var RexxHide_editor_text +Var RexxHide_editor_PB + +; rexxpaws.exe file associations +Var Associate_rexxpaws_CK +Var Associate_rexxpaws_CK_state +Var RexxPaws_ext_EDIT +Var RexxPaws_ext_text +Var RexxPaws_ftype_EDIT +Var RexxPaws_ftype_text +Var RexxPaws_editor_EDIT +Var RexxPaws_editor_text +Var RexxPaws_editor_PB + ; Uninstall variables Var InStopRxapiPage Var LogFileExists +Var Delete_ooRexx_Tree_CK Var DeleteWholeTree ;=============================================================================== @@ -289,28 +349,13 @@ ; If we are doing an upgrade, these settings are all left however they were. ${if} $DoUpgrade == 'false' - ; TEMP TEMP A custom page will be added where the user can specify what they - ; want. Until then ... - ; If any of the association values are empty, fill them in with the default: - ${if} $RegVal_rexxAssociation == '' - StrCpy $RegVal_rexxAssociation '.rex RexxScript' - ${endif} - ${if} $RegVal_rexxHideAssociation == '' - StrCpy $RegVal_rexxHideAssociation '.rxg RexxHide' - ${endif} - ${if} $RegVal_rexxPawsAssociation == '' - StrCpy $RegVal_rexxPawsAssociation '.rxp RexxPawws' - ${endif} + ; Do the file associations first, like associate .rex with ooRexx + ; (REXXScript). DoFileAssociations needs to run before DoEnvVariagles. + Call DoFileAssociations ; Set the environment variables, PATH, REXX_HOME, etc.. Call DoEnvVariables - ; Do the file associations, like associate .rex with ooRexx (REXXScript). - ; The function itself figures out what needs to be done based on some - ; variable settings. - - Call DoFileAssociations - ; If an administrator, install rxapi as a service depending on what the user ; selected. ${if} $IsAdminUser == "true" @@ -345,8 +390,11 @@ WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${SHORTNAME}" "NoRepair" 0x00000001 WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${SHORTNAME}" "RexxAssociation" $RegVal_rexxAssociation + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${SHORTNAME}" "RexxEditor" $RegVal_rexxEditor WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${SHORTNAME}" "RexxHideAssociation" $RegVal_rexxHideAssociation + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${SHORTNAME}" "RexxHideEditor" $RegVal_rexxEditor WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${SHORTNAME}" "RexxPawsAssociation" $RegVal_rexxPawsAssociation + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${SHORTNAME}" "RexxPawsEditor" $RegVal_rexxPawsEditor ${WriteUninstaller} "$INSTDIR\${UNINSTALLER}" @@ -741,36 +789,25 @@ ReadRegStr $RegVal_uninstallLocation HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${SHORTNAME}" "UnInstallLocation" ReadRegStr $RegVal_uninstallVersion HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${SHORTNAME}" "UninstallVersion" ReadRegStr $RegVal_rexxAssociation HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${SHORTNAME}" "RexxAssociation" + ReadRegStr $RegVal_rexxEditor HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${SHORTNAME}" "RexxEditor" ReadRegStr $RegVal_rexxHideAssociation HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${SHORTNAME}" "RexxHideAssociation" + ReadRegStr $RegVal_rexxHideEditor HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${SHORTNAME}" "RexxHideEditor" ReadRegStr $RegVal_rexxPawsAssociation HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${SHORTNAME}" "RexxPawsAssociation" + ReadRegStr $RegVal_rexxPawsEditor HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${SHORTNAME}" "RexxPawsEditor" ; Check for previous version and if the upgrade type of uninstall is available. - ${if} $RegVal_uninstallString == "" - StrCpy $PreviousVersionInstalled 'false' - StrCpy $UpgradeTypeAvailable 'false' - ${else} - StrCpy $PreviousVersionInstalled 'true' + Call CheckInstalledStatus - ${if} $RegVal_uninstallLocation == "" - ; No location in the registry, we'll try the installation directory. - StrCpy $RegVal_uninstallLocation $INSTDIR - ${endif} + ; Set all the dialog control variables for doing file associations to their + ; correct starting values. + Call SetFileAssociationVars - ${if} $RegVal_uninstallVersion == "" - StrCpy $UpgradeTypeAvailable 'false' - ${else} - ${VersionCompare} $RegVal_uninstallVersion "4.1.0.0" $0 - ; Returned in $0: 0 == versions are equal, 1 == version is greater than 410, 2 == version is less than 410 - ${if} $0 < 2 - StrCpy $UpgradeTypeAvailable 'true' - ${else} - StrCpy $UpgradeTypeAvailable 'false' - ${endif} - ${endif} - ${endif} - - ; We never do an upgrade type of install unless the user requests it. + ; We never do an upgrade type of install unless the user requests it. But, we + ; set the default for doing it quick to true. StrCpy $DoUpgrade 'false' + StrCpy $Do_Upgrade_Type_CK_state ${BST_UNCHECKED} + StrCpy $DoUpgradeQuick 'true' + StrCpy $Do_Upgrade_Quick_CK_state ${BST_CHECKED} FunctionEnd @@ -914,7 +951,8 @@ Abort ${EndIf} - ${NSD_CreateLabel} 0 0 100% 64u \ + + ${NSD_CreateLabel} 0u 0u 100% 64u \ "An 'upgrade' type of install will remove all the previously installed files and install \ the new version of ${SHORTNAME}. However, it will not undo any of the environment, file \ association, or registry settings done by the previous install.$\n$\n\ @@ -923,35 +961,94 @@ Note: with this type of install, the install location and other settings can NOT be changed.$\n$\n\" Pop $Label_One - ${NSD_CreateCheckBox} 0 68u 100% 8u "Perform an upgrade type of install" + ${NSD_CreateCheckBox} 0u 68u 100% 8u "Perform an upgrade type of install" Pop $Do_Upgrade_Type_CK + ${NSD_CreateLabel} 0u 92u 100% 24u \ + "A quick upgrade type of install will skip the pages pertaining to options that can not be changed. \ + Otherwise the option pages are shown so the value of the options can be seen, but it is still not \ + possible to change the values." + Pop $Label_Two + + ${NSD_CreateCheckBox} 0u 120u 100% 8u "Perform a quick upgrade type of install" + Pop $Do_Upgrade_Quick_CK + + ${NSD_OnBack} Uninstall_Type_onBack + ${NSD_OnClick} $Do_Upgrade_Type_CK ShowHideQuickUninstall + + ${NSD_SetState} $Do_Upgrade_Type_CK $Do_Upgrade_Type_CK_state + ${NSD_SetState} $Do_Upgrade_Quick_CK $Do_Upgrade_Quick_CK_state + + ${if} $Do_Upgrade_Type_CK_state == ${BST_UNCHECKED} + ShowWindow $Label_Two ${SW_HIDE} + ShowWindow $Do_Upgrade_Quick_CK ${SW_HIDE} + ${endif} + ; Set focus to the page dialog rather than the installer dialog, set focus to ; the check box, and then show the page dialog SendMessage $Dialog ${WM_SETFOCUS} $HWNDPARENT 0 SendMessage $Dialog ${WM_NEXTDLGCTL} $Do_Upgrade_Type_CK 1 + nsDialogs::Show FunctionEnd -/** Uninstall_Type_Leave() Callback function. +/** Uninstall_Type_onBack() Call back function * + * Invoked when the user clicks the back button on the Uninstall type page. We + * save the state of the check boxes on the page. + */ +Function Uninstall_Type_onBack + ${NSD_GetState} $Do_Upgrade_Type_CK $Do_Upgrade_Type_CK_state + ${NSD_GetState} $Do_Upgrade_Quick_CK $Do_Upgrade_Quick_CK_state +FunctionEnd + +/** Uninstall_Type_Leave() Call back function. + * * The installer calls this function when the user presses the Next button on - * the uninstall type page. + * the uninstall type page. We don't save the check box state because we + * immediately run the uninstall and the user won't see this page again. + * Rather, we set the DoUpgrade / DoUpgradeQuick variabels to the proper values. */ Function Uninstall_Type_Leave - ${NSD_GetState} $Do_Upgrade_Type_CK $0 + ${NSD_GetState} $Do_Upgrade_Type_CK $Do_Upgrade_Type_CK_state + ${NSD_GetState} $Do_Upgrade_Quick_CK $Do_Upgrade_Quick_CK_state - ${if} $0 == 1 + ${if} $Do_Upgrade_Type_CK_state == ${BST_CHECKED} StrCpy $DoUpgrade 'true' + + ${if} $Do_Upgrade_Quick_CK_state = ${BST_CHECKED} + StrCpy $DoUpgradeQuick 'true' + ${else} + StrCpy $DoUpgradeQuick 'false' + ${endif} ${else} StrCpy $DoUpgrade 'false' + StrCpy $DoUpgradeQuick 'false' ${endif} Call Do_The_Uninstall FunctionEnd +/** ShowHideQuickUninstall() Call back function + * + * Invoked when the user clicks the Perform an upgrade type of install check + * box. Shows or hides the Perform a quick upgrade type of install check box. + */ +Function ShowHideQuickUninstall + Pop $Do_Upgrade_Type_CK + ${NSD_GetState} $Do_Upgrade_Type_CK $0 + + ${if} $0 == ${BST_CHECKED} + ShowWindow $Label_Two ${SW_SHOW} + ShowWindow $Do_Upgrade_Quick_CK ${SW_SHOW} + ${else} + ShowWindow $Label_Two ${SW_HIDE} + ShowWindow $Do_Upgrade_Quick_CK ${SW_HIDE} + ${endif} +FunctionEnd + /** Do_The_Uninstall() * * Executes the uninstall program and waits for its return. The user could @@ -971,12 +1068,18 @@ * same location as the original install. This could easily be different * than what $INSTDIR currently is, so we set $INSTDIR to our uninstall * location. For an upgrade install, the portion of the installer that - * allows the user to pick the install location will be disable. + * allows the user to pick the install location will be disabled. */ Function Do_The_Uninstall + ; Use $3 for the arg to the uninstall program. ${if} $DoUpgrade == 'true' StrCpy $INSTDIR $RegVal_uninstallLocation + StrCpy $3 "upgrade" + + ${if} $DoUpgradeQuick == 'true' + StrCpy $3 "upgradeQuick" + ${endif} ${endif} HideWindow @@ -986,7 +1089,7 @@ * uninstall dir to $R2 and *prevents* the uninstaller from running in the * temp dir, which is what we want. */ - ExecWait '$RegVal_uninstallString /U=$DoUpgrade _?=$RegVal_uninstallLocation' $0 + ExecWait '$RegVal_uninstallString /U=$3 _?=$RegVal_uninstallLocation' $0 IfErrors UninstallErrors ${if} $0 == 0 @@ -1110,13 +1213,19 @@ Pop $StopRxAPI_CK ${NSD_SetState} $StopRxAPI_CK 1 - ;GetFunctionAddress $0 un.CheckOkToStopRxapiBack - ;nsDialogs::OnBack $0 - nsDialogs::Show FunctionEnd +/** Ok_Stop_RxAPI_leave() Call back function. + * + * Invoked when the user leaves the page that asks for permission to stop the + * rxapi process. We check if the user said okay or not. If the user does not + * say okay we quit the install. + * + * When the user does say okay, we stop rxapi and check that it is indeed + * stopped. If it is not stopped, we inform the user and also quit the install. + */ Function Ok_Stop_RxAPI_leave ${NSD_GetState} $StopRxAPI_CK $StopRxAPI_CK_State @@ -1168,6 +1277,21 @@ FunctionEnd +/** Directory_Page_pre() Call back function + * + * Invoked by the installer before the directory page is created. + * + * If this is a QUICK upgrade install, we skip the page. + */ +Function Directory_Page_pre + + ${if} $DoUpgrade == 'true' + ${andif} $DoUpgradeQuick == 'true' + Abort + ${endif} + +FunctionEnd + /** Directory_Page_show() Call back function * * Invoked by the installer right before the directory page is shown. @@ -1208,10 +1332,17 @@ ${endif} ; If doing an upgrade and rxapi was NOT previously installed as a service, we - ; skip this page + ; skip this page. If we are doing a quick upgrade and rxapi was installed as + ; a server, we start it automatically. ${if} $DoUpgrade == 'true' - ${andif} $RxapiIsService == 'false' - Abort + ${if} $RxapiIsService == 'false' + Abort + ${endif} + ${if} $DoUpgradeQuick == 'true' + ${andif} $RxapiIsService == 'true' + StrCpy $RxAPIStartService '1' + Abort + ${endif} ${endif} ${if} $DoUpgrade == 'true' @@ -1299,6 +1430,605 @@ ${NSD_GetState} $RxAPI_Start_CK $RxAPIStartService FunctionEnd +/** File_Associations_page() Custom page function. + * + * Allows the user to specify whether they want to use Windows file associations + * or not. + * + * The page is not shown when doing an upgrade type of install. + */ +Function File_Associations_page + + ${if} $DoUpgrade == 'true' + Abort + ${endif} + + !insertmacro MUI_HEADER_TEXT "Associate file extensions with the ooRexx executables" \ + "Any, or all, of the ooRexx executables (rexx.exe, rexxhide.exe, or rexxpaws.exe) \ + can be associated with a file extension." + + nsDialogs::Create 1018 + Pop $Dialog + + ${If} $Dialog == error + Abort + ${EndIf} + + ${NSD_OnBack} File_Associations_leave + + ${NSD_CreateLabel} 0 0 100% 120u \ + "Windows file associations define how Windows treats a file type on your system. \ + File associations control, among other things, what happens when a user double-clicks a \ + file, which icon appears for a file by default, and how the file appears when viewed \ + in Windows Explorer.$\n$\n\ + Associating a file extension with an ooRexx executable allows Rexx programs to be executed by \ + double clicking them and to be run from the command line by just typing their file name.$\n$\n\ + You can specify if, and how, file associations are created.$\n$\n\ + Check the check box to have the installer create file associations. The following pages \ + will allow you to specify which associations are created. Uncheck the check box if you \ + do not want any associations to be created." + + Pop $Label_One + + ${NSD_CreateCheckBox} 0 122u 100% 8u "Create Windows file associations" + Pop $Use_File_Associations_CK + ${NSD_SetState} $Use_File_Associations_CK $Use_File_Associations_CK_state + + nsDialogs::Show + +FunctionEnd + +/** File_Associations_leave() Call back function. + * + * Invoked when the user clicks the Back or Next buttons on the File + * Associations page. Saves the state of the Use File Associations check box. + */ +Function File_Associations_leave + + ${NSD_GetState} $Use_File_Associations_CK $Use_File_Associations_CK_state + +FunctionEnd + +/** Associate_rexx_page() Custom page function. + * + * Presents the option to the user of creating a file association for rexx.exe + * + * The page is skipped if not using file associations, or if we are doing a + * quick upgrade. + */ +Function Associate_rexx_page + + ${if} $Use_File_Associations_CK_state == ${BST_UNCHECKED} + Abort + ${endif} + + ${if} $DoUpgrade == 'true' + ${andif} $DoUpgradeQuick == 'true' + Abort + ${endif} + + !insertmacro MUI_HEADER_TEXT "Associate a file extension with rexx.exe" \ + "Traditionally the ${DefRexxExt} file extension is associated with rexx.exe." + + nsDialogs::Create 1018 + Pop $Dialog + + ${If} $Dialog == error + Abort + ${EndIf} + + ${NSD_OnBack} Associate_rexx_leave + + ${NSD_CreateLabel} 0u 0u 100% 48u \ + "Usually in ${LONGNAME} installations the Rexx interpreter, rexx.exe, is associated with the \ + .rex extension using the file type name of RexxScript and the NotePad editor. However, you \ + can specify these values yourself, or not create any file association at all.$\n$\n\ + Note: Unless you have a good understanding of Windows file associations, it is probably \ + best to leave the file type name RexxScript." + + Pop $Label_One + + ${NSD_CreateGroupBox} 0u 56u 100% 84u "File Associations for rexx.exe" + Pop $0 ; Discarded + + ${NSD_CreateCheckBox} 8u 72u 80% 8u "Create rexx.exe file association" + Pop $Associate_rexx_CK + + ${NSD_SetState} $Associate_rexx_CK $Associate_rexx_CK_state + + ; Extension line + ${NSD_CreateLabel} 16u 86u 50u 8u "Extension:" + Pop $0 ; Discarded + + ${NSD_CreateText} 78u 84u 46u 12u $Rexx_ext_text + Pop $Rexx_ext_EDIT + + ; File type line + ${NSD_CreateLabel} 16u 104u 50u 8u "File type name:" + Pop $0 ; Discarded + + ${NSD_CreateText} 78u 102u 46u 12u $Rexx_ftype_text + Pop $Rexx_ftype_EDIT + + ; Editor line + ${NSD_CreateLabel} 16u 122u 60u 8u "Full path to editor:" + Pop $0 ; Discarded + + ${NSD_CreateText} 78u 120u 165u 12u $Rexx_editor_text + Pop $Rexx_editor_EDIT + + ${NSD_CreateButton} 250u 118u 45u 16u "Browse..." + Pop $Rexx_editor_PB + + System::Call shlwapi::SHAutoComplete(i$Rexx_editor_EDIT, i${SHACF_FILESYSTEM}) + + ${if} $Associate_rexx_CK_state == ${BST_UNCHECKED} + ${orif} $DoUpgrade == 'true' + EnableWindow $Rexx_ext_EDIT 0 + EnableWindow $Rexx_ftype_EDIT 0 + EnableWindow $Rexx_editor_EDIT 0 + EnableWindow $Rexx_editor_PB 0 + ${EndIf} + + ${if} $DoUpgrade == 'true' + EnableWindow $Associate_rexx_CK 0 + Call PageDisableQuit + ${EndIf} + + ${NSD_OnClick} $Associate_rexx_CK EnableRexxAssociation + ${NSD_OnClick} $Rexx_editor_PB Get_rexx_editor_file + + nsDialogs::Show + +FunctionEnd + +/** Associate_rexx_leave() Call back function. + * + * This function is called when the Rexx association page is left. We check + * that the text fields are 'sane' and return the user to the page if they + * are not. If the fields are good, the state of the dialog controls is saved. + */ +Function Associate_rexx_leave + + ${NSD_GetState} $Associate_rexx_CK $Associate_rexx_CK_state + + ${if} $Associate_rexx_CK_state == ${BST_CHECKED} + ${NSD_GetText} $Rexx_ext_EDIT $0 + ${NSD_GetText} $Rexx_ftype_EDIT $1 + + ; If either the extension field or the ftype field are blank, abort. + ${if} $0 == "" + ${orif} $1 == "" + MessageBox MB_OK|MB_ICONEXCLAMATION \ + "Creating a file association requires that$\n\ + both the file extension and the file type field$\n\ + be filed in." + + ${if} $0 == "" + SendMessage $Dialog ${WM_NEXTDLGCTL} $Rexx_ext_EDIT 1 + ${else} + SendMessage $Dialog ${WM_NEXTDLGCTL} $Rexx_ftype_EDIT 1 + ${endif} + Abort + ${endif} + + ; Copy the first char of the ext field to $0 if not a '.', abort. + StrCpy $2 $0 1 + ${if} $2 != "." + MessageBox MB_OK|MB_ICONEXCLAMATION \ + "Please include the leading dot '.' of the file$\n\ + extension." + SendMessage $Dialog ${WM_NEXTDLGCTL} $Rexx_ext_EDIT 1 + Abort + ${endif} + ${endif} + + ; Okay text fields are okay. If editor field is blank, it is just not used. + ${NSD_GetText} $Rexx_ext_EDIT $Rexx_ext_text + ${NSD_GetText} $Rexx_ftype_EDIT $Rexx_ftype_text + ${NSD_GetText} $Rexx_editor_EDIT $Rexx_editor_text + +FunctionEnd + +/** Get_rexx_editor_file() + * + * Puts up a file open dialog and allows the user to select a file. If the + * user does not cancel, the edit control is updated with the file selected. + */ +Function Get_rexx_editor_file + Pop $Rexx_editor_PB + ${NSD_GetText} $Rexx_editor_EDIT $0 + + nsDialogs::SelectFileDialog open $0 "*.exe" + pop $0 + ${if} $0 != "" + ${NSD_SetText} $Rexx_editor_EDIT $0 + ${endif} + +FunctionEnd + +/** EnableRexxAssociation() + * + * Called when the user clicks on the Create rexx.exe file association check + * box. Disables, or enables, the controls depending on if the check box is + * checked or not. + */ +Function EnableRexxAssociation + Pop $Associate_rexx_CK + ${NSD_GetState} $Associate_rexx_CK $0 + + ${If} $0 == 1 + EnableWindow $Rexx_ext_EDIT 1 + EnableWindow $Rexx_ftype_EDIT 1 + EnableWindow $Rexx_editor_EDIT 1 + EnableWindow $Rexx_editor_PB 1 + ${Else} + EnableWindow $Rexx_ext_EDIT 0 + EnableWindow $Rexx_ftype_EDIT 0 + EnableWindow $Rexx_editor_EDIT 0 + EnableWindow $Rexx_editor_PB 0 + ${EndIf} +FunctionEnd + +/** Associate_rexxhide_page() Custom page function. + * + * This is a custom page + * + * + * + */ +Function Associate_rexxhide_page + + ${if} $Use_File_Associations_CK_state == ${BST_UNCHECKED} + Abort + ${endif} + + ${if} $DoUpgrade == 'true' + ${andif} $DoUpgradeQuick == 'true' + Abort + ${endif} + + !insertmacro MUI_HEADER_TEXT "Associate a file extension with rexxhide.exe" \ + "The default file extension for rexxhide is $\"${DefRexxPawsExt}$\" with a file type of $\"RexxHide$\"." + + nsDialogs::Create 1018 + Pop $Dialog + + ${If} $Dialog == error + Abort + ${EndIf} + + ${NSD_OnBack} Associate_rexxhide_leave + + ${NSD_CreateLabel} 0u 0u 100% 48u \ + "The rexxhide executable runs Rexx programs without creating a console window. It is typically used \ + for GUI (graphical user interface) programs like ooDialog programs. This allows the program to run \ + without a secondary console window opening up.$\n$\n\ + Check, or uncheck, the check box to create, or not create, a file association for rexxhide." + + Pop $Label_One + + ${NSD_CreateGroupBox} 0u 56u 100% 84u "File Associations for rexxhide.exe" + Pop $0 ; Discarded + + ${NSD_CreateCheckBox} 8u 72u 80% 8u "Create rexxhide.exe file association" + Pop $Associate_rexxhide_CK + + ${NSD_SetState} $Associate_rexxhide_CK $Associate_rexxhide_CK_state + + ; Extension line + ${NSD_CreateLabel} 16u 86u 50u 8u "Extension:" + Pop $0 ; Discarded + + ${NSD_CreateText} 78u 84u 46u 12u $RexxHide_ext_text + Pop $RexxHide_ext_EDIT + + ; File type line + ${NSD_CreateLabel} 16u 104u 50u 8u "File type name:" + Pop $0 ; Discarded + + ${NSD_CreateText} 78u 102u 46u 12u $RexxHide_ftype_text + Pop $RexxHide_ftype_EDIT + + ; Editor line + ${NSD_CreateLabel} 16u 122u 60u 8u "Full path to editor:" + Pop $0 ; Discarded + + ${NSD_CreateText} 78u 120u 165u 12u $RexxHide_editor_text + Pop $RexxHide_editor_EDIT + + ${NSD_CreateButton} 250u 118u 45u 16u "Browse..." + Pop $RexxHide_editor_PB + + System::Call shlwapi::SHAutoComplete(i$RexxHide_editor_EDIT, i${SHACF_FILESYSTEM}) + + ${if} $Associate_rexxhide_CK_state == ${BST_UNCHECKED} + ${orif} $DoUpgrade == 'true' + EnableWindow $RexxHide_ext_EDIT 0 + EnableWindow $RexxHide_ftype_EDIT 0 + EnableWindow $RexxHide_editor_EDIT 0 + EnableWindow $RexxHide_editor_PB 0 + ${EndIf} + + ${if} $DoUpgrade == 'true' + EnableWindow $Associate_rexxhide_CK 0 + Call PageDisableQuit + ${EndIf} + + ${NSD_OnClick} $Associate_rexxhide_CK EnableRexxHideAssociation + ${NSD_OnClick} $RexxHide_editor_PB Get_rexxhide_editor_file + + nsDialogs::Show + +FunctionEnd + +/** Associate_rexxhide_leave() Call back function. + * + * This function is called when the RexxHide association page is left. We check + * that the text fields are 'sane' and return the user to the page if they + * are not. If the text field values are good, the state of the dialog contorls + * is saved. + */ +Function Associate_rexxhide_leave + + ${NSD_GetState} $Associate_rexxhide_CK $Associate_rexxhide_CK_state + + ${if} $Associate_rexxhide_CK_state == ${BST_CHECKED} + ${NSD_GetText} $RexxHide_ext_EDIT $0 + ${NSD_GetText} $RexxHide_ftype_EDIT $1 + + ; If either the extension field or the ftype field are blank, abort. + ${if} $0 == "" + ${orif} $1 == "" + MessageBox MB_OK|MB_ICONEXCLAMATION \ + "Creating a file association requires that$\n\ + both the file extension and the file type field$\n\ + be filed in." + + ${if} $0 == "" + SendMessage $Dialog ${WM_NEXTDLGCTL} $RexxHide_ext_EDIT 1 + ${else} + SendMessage $Dialog ${WM_NEXTDLGCTL} $RexxHide_ftype_EDIT 1 + ${endif} + Abort + ${endif} + + ; Copy the first char of the ext field to $0 if not a '.', abort. + StrCpy $2 $0 1 + ${if} $2 != "." + MessageBox MB_OK|MB_ICONEXCLAMATION \ + "Please include the leading dot '.' of the file$\n\ + extension." + SendMessage $Dialog ${WM_NEXTDLGCTL} $RexxHide_ext_EDIT 1 + Abort + ${endif} + ${endif} + + ; Okay text fields are okay. If editor field is blank, it is just not used. + ${NSD_GetText} $RexxHide_ext_EDIT $RexxHide_ext_text + ${NSD_GetText} $RexxHide_ftype_EDIT $RexxHide_ftype_text + ${NSD_GetText} $RexxHide_editor_EDIT $RexxHide_editor_text + +FunctionEnd + +/** Get_rexxhide_editor_file() + * + * Puts up a file open dialog and allows the user to select a file. If the + * user does not cancel, the edit control is updated with the file selected. + */ +Function Get_rexxhide_editor_file + Pop $RexxHide_editor_PB + ${NSD_GetText} $RexxHide_editor_EDIT $0 + + nsDialogs::SelectFileDialog open $0 "*.exe" + pop $0 + ${if} $0 != "" + ${NSD_SetText} $RexxHide_editor_EDIT $0 + ${endif} + +FunctionEnd + +/** EnableRexxHideAssociation() + * + * Called when the user clicks on the Create rexxhide.exe file association check + * box. Disables, or enables, the controls depending on if the check box is + * checked or not. + */ +Function EnableRexxHideAssociation + Pop $Associate_rexxhide_CK + ${NSD_GetState} $Associate_rexxhide_CK $0 + + ${If} $0 == 1 + EnableWindow $RexxHide_ext_EDIT 1 + EnableWindow $RexxHide_ftype_EDIT 1 + EnableWindow $RexxHide_editor_EDIT 1 + EnableWindow $RexxHide_editor_PB 1 + ${Else} + EnableWindow $RexxHide_ext_EDIT 0 + EnableWindow $RexxHide_ftype_EDIT 0 + EnableWindow $RexxHide_editor_EDIT 0 + EnableWindow $RexxHide_editor_PB 0 + ${EndIf} +FunctionEnd + +/** Associate_rexxpaws_page() Custom page function. + * + * Shows the options for associating rexxpaws with a file extension. + */ +Function Associate_rexxpaws_page + + ${if} $Use_File_Associations_CK_state == ${BST_UNCHECKED} + Abort + ${endif} + + ${if} $DoUpgrade == 'true' + ${andif} $DoUpgradeQuick == 'true' + Abort + ${endif} + + !insertmacro MUI_HEADER_TEXT \ + "Associate a file extension with rexxpaws.exe" \ + "The default file extension for rexxpaws is $\"${DefRexxPawsExt}$\" with a file type of $\"RexxPaws$\"." + + nsDialogs::Create 1018 + Pop $Dialog + + ${If} $Dialog == error + Abort + ${EndIf} + + ${NSD_OnBack} Associate_rexxpaws_leave + + ${NSD_CreateLabel} 0u 0u 100% 48u \ + "The rexxpaws executable runs Rexx programs by opening up a console window and executing the program. \ + When the program finishes, rexxpaws 'pauses' until the user hits any key. This allows the user to \ + read any output of the to be read before the console window closes.$\n$\n\ + Check, or uncheck, the check box to create, or not create, a file association for rexxpaws." + + Pop $Label_One + + ${NSD_CreateGroupBox} 0u 56u 100% 84u "File Associations for rexxpaws.exe" + Pop $0 ; Discarded + + ${NSD_CreateCheckBox} 8u 72u 80% 8u "Create rexxpaws.exe file association" + Pop $Associate_rexxpaws_CK + + ${NSD_SetState} $Associate_rexxpaws_CK $Associate_rexxpaws_CK_state + + ; Extension line + ${NSD_CreateLabel} 16u 86u 50u 8u "Extension:" + Pop $0 ; Discarded + + ${NSD_CreateText} 78u 84u 46u 12u $RexxPaws_ext_text + Pop $RexxPaws_ext_EDIT + + ; File type line + ${NSD_CreateLabel} 16u 104u 50u 8u "File type name:" + Pop $0 ; Discarded + + ${NSD_CreateText} 78u 102u 46u 12u $RexxPaws_ftype_text + Pop $RexxPaws_ftype_EDIT + + ; Editor line + ${NSD_CreateLabel} 16u 122u 60u 8u "Full path to editor:" + Pop $0 ; Discarded + + ${NSD_CreateText} 78u 120u 165u 12u $RexxPaws_editor_text + Pop $RexxPaws_editor_EDIT + + ${NSD_CreateButton} 250u 118u 45u 16u "Browse..." + Pop $RexxPaws_editor_PB + + System::Call shlwapi::SHAutoComplete(i$RexxPaws_editor_EDIT, i${SHACF_FILESYSTEM}) + + ${if} $Associate_rexxpaws_CK_state == ${BST_UNCHECKED} + ${orif} $DoUpgrade == 'true' + EnableWindow $RexxPaws_ext_EDIT 0 + EnableWindow $RexxPaws_ftype_EDIT 0 + EnableWindow $RexxPaws_editor_EDIT 0 + EnableWindow $RexxPaws_editor_PB 0 + ${EndIf} + + ${if} $DoUpgrade == 'true' + EnableWindow $Associate_rexxpaws_CK 0 + Call PageDisableQuit + ${EndIf} + + ${NSD_OnClick} $Associate_rexxpaws_CK EnableRexxPawsAssociation + ${NSD_OnClick} $RexxPaws_editor_PB Get_rexxpaws_editor_file + + nsDialogs::Show + +FunctionEnd + +/** Associate_rexxpaws_leave() Call back function + * + * Invoked when the user clicks the Back or Next buttons on the file association + * for rexxpaws page. Checks for correct values in the text fields and saves + * the state of the controls. + */ +Function Associate_rexxpaws_leave + + ${NSD_GetState} $Associate_rexxpaws_CK $Associate_rexxpaws_CK_state + + ${if} $Associate_rexxpaws_CK_state == ${BST_CHECKED} + ${NSD_GetText} $RexxPaws_ext_EDIT $0 + ${NSD_GetText} $RexxPaws_ftype_EDIT $1 + + ; If either the extension field or the ftype field are blank, abort. + ${if} $0 == "" + ${orif} $1 == "" + MessageBox MB_OK|MB_ICONEXCLAMATION \ + "Creating a file association requires that$\n\ + both the file extension and the file type field$\n\ + be filed in." + + ${if} $0 == "" + SendMessage $Dialog ${WM_NEXTDLGCTL} $RexxPaws_ext_EDIT 1 + ${else} + SendMessage $Dialog ${WM_NEXTDLGCTL} $RexxPaws_ftype_EDIT 1 + ${endif} + Abort + ${endif} + + ; Copy the first char of the ext field to $0 if not a '.', abort. + StrCpy $2 $0 1 + ${if} $2 != "." + MessageBox MB_OK|MB_ICONEXCLAMATION \ + "Please include the leading dot '.' of the file$\n\ + extension." + SendMessage $Dialog ${WM_NEXTDLGCTL} $RexxPaws_ext_EDIT 1 + Abort + ${endif} + ${endif} + + ; Okay text fields are okay. If editor field is blank, it is just not used. + ${NSD_GetText} $RexxPaws_ext_EDIT $RexxPaws_ext_text + ${NSD_GetText} $RexxPaws_ftype_EDIT $RexxPaws_ftype_text + ${NSD_GetText} $RexxPaws_editor_EDIT $RexxPaws_editor_text + +FunctionEnd + +/** Get_rexxpaws_editor_file() + * + * Puts up a file open dialog and allows the user to select a file. If the + * user does not cancel, the edit control is updated with the file selected. + */ +Function Get_rexxpaws_editor_file + Pop $RexxPaws_editor_PB + ${NSD_GetText} $RexxPaws_editor_EDIT $0 + + nsDialogs::SelectFileDialog open $0 "*.exe" + pop $0 + ${if} $0 != "" + ${NSD_SetText} $RexxPaws_editor_EDIT $0 + ${endif} + +FunctionEnd + +/** EnableRexxPawsAssociation() + * + * Called when the user clicks on the Create rexxpaws.exe file association check + * box. Disables, or enables, the controls depending on if the check box is + * checked or not. + */ +Function EnableRexxPawsAssociation + Pop $Associate_rexxpaws_CK + ${NSD_GetState} $Associate_rexxpaws_CK $0 + + ${If} $0 == 1 + EnableWindow $RexxPaws_ext_EDIT 1 + EnableWindow $RexxPaws_ftype_EDIT 1 + EnableWindow $RexxPaws_editor_EDIT 1 + EnableWindow $RexxPaws_editor_PB 1 + ${Else} + EnableWindow $RexxPaws_ext_EDIT 0 + EnableWindow $RexxPaws_ftype_EDIT 0 + EnableWindow $RexxPaws_editor_EDIT 0 + EnableWindow $RexxPaws_editor_PB 0 + ${EndIf} +FunctionEnd + /** PageDisableQuit() * * Prevents the user from closing (quitting) the installer from the current @@ -1363,29 +2093,58 @@ Call AddToPath ; Do the PATHEXT extensions - Push ".rex" Call AddToPathExt FunctionEnd /** DoFileAssociations() * - * Does the file associations for ooRexx. + * Does the file associations for ooRexx. Only called when not doing an + * upgrade. * + * We do two things: + * Fill in the values stored in the uninstall section for ooRexx. These + * values tell the uninstaller, when it runs, what it should delete from the + * registry. + * + * Write out the actual file associations selected by the user to the + * registry. */ Function DoFileAssociations - ${if} $RegVal_rexxAssociation != '' + ; Set everything to blank, then fill in those values the user specified. + StrCpy $RegVal_rexxAssociation "" + StrCpy $RegVal_rexxEditor "" + StrCpy $RegVal_rexxHideAssociation "" + StrCpy $RegVal_rexxHideEditor "" + StrCpy $RegVal_rexxPawsAssociation "" + StrCpy $RegVal_rexxPawsEditor "" + + ${if} $Use_File_Associations_CK_state == ${BST_UNCHECKED} + DetailPrint "Do not use Windows file associations specified." + Return + ${endif} + + ${if} $Associate_rexx_CK_state == ${BST_CHECKED} StrCpy $AssociationProgramName 'rexx.exe' + StrCpy $RegVal_rexxAssociation '$Rexx_ext_text $Rexx_ftype_text' + StrCpy $RegVal_rexxEditor '$Rexx_editor_text' + Call AssociateExtensionWithExe ${endif} - ${if} $RegVal_rexxHideAssociation != '' + ${if} $Associate_rexxhide_CK_state == ${BST_CHECKED} StrCpy $AssociationProgramName 'rexxhide.exe' + StrCpy $RegVal_rexxHideAssociation '$RexxHide_ext_text $RexxHide_ftype_text' + StrCpy $RegVal_rexxHideEditor '$RexxHide_editor_text' + Call AssociateExtensionWithExe ${endif} - ${if} $RegVal_rexxPawsAssociation != '' + ${if} $Associate_rexxpaws_CK_state = ${BST_CHECKED} StrCpy $AssociationProgramName 'rexxpaws.exe' + StrCpy $RegVal_rexxPawsAssociation '$RexxPaws_ext_text $RexxPaws_ftype_text' + StrCpy $RegVal_rexxPawsEditor '$RexxPaws_editor_text' + Call AssociateExtensionWithExe ${endif} @@ -1408,19 +2167,23 @@ */ Function AssociateExtensionWithExe - ; We will put the file extension in $0 and the ftype in $1 + ; We will put the file extension in $0, the ftype in $1, and the editor file + ; name in $2 ${if} $AssociationProgramName == 'rexx.exe' ${StrTok} $0 $RegVal_rexxAssociation " " "0" "0" ${StrTok} $1 $RegVal_rexxAssociation " " "1" "0" StrCpy $AssociationText "ooRexx Rexx Progam" + StrCpy $AssociationEditor '$RegVal_rexxEditor' ${elseif} $AssociationProgramName == 'rexxhide.exe' ${StrTok} $0 $RegVal_rexxHideAssociation " " "0" "0" ${StrTok} $1 $RegVal_rexxHideAssociation " " "1" "0" StrCpy $AssociationText "ooRexx Rexx GUI Progam" + StrCpy $AssociationEditor '$RegVal_rexxHideEditor' ${elseif} $AssociationProgramName == 'rexxpaws.exe' ${StrTok} $0 $RegVal_rexxPawsAssociation " " "0" "0" ${StrTok} $1 $RegVal_rexxPawsAssociation " " "1" "0" StrCpy $AssociationText "ooRexx Rexx pausing Progam" + StrCpy $AssociationEditor "$RegVal_rexxPawsEditor" ${else} DetailPrint "Unrecoverable ERROR. The ftype association executable: $AssociationProgramName is not recognized." Goto DoneWithRexxExe @@ -1454,8 +2217,12 @@ WriteRegStr HKCU "SOFTWARE\Classes\$1\DefaultIcon" "" "$INSTDIR\$AssociationProgramName,0" WriteRegStr HKCU "SOFTWARE\Classes\$1\shell\open" "" "Run" WriteRegStr HKCU "SOFTWARE\Classes\$1\shell\open\command" "" '"$INSTDIR\$AssociationProgramName" "%1" %*' - WriteRegStr HKCU "SOFTWARE\Classes\$1\shell\edit" "" "Edit" - WriteRegStr HKCU "SOFTWARE\Classes\$1\shell\edit\command" "" 'notepad.exe "%1"' + + ${if} $AssociationEditor != "" + WriteRegStr HKCU "SOFTWARE\Classes\$1\shell\edit" "" "Edit" + WriteRegStr HKCU "SOFTWARE\Classes\$1\shell\edit\command" "" '"$AssociationEditor" "%1"' + ${endif} + WriteRegStr HKCU "SOFTWARE\Classes\$1\shellex\DropHandler" "" "{60254CA5-953B-11CF-8C96-00AA00B8708C}" Goto DoneWithRexxExe @@ -1465,13 +2232,162 @@ WriteRegStr HKCR "$1\DefaultIcon" "" "$INSTDIR\$AssociationProgramName,0" WriteRegStr HKCR "$1\shell\open" "" "Run" WriteRegStr HKCR "$1\shell\open\command" "" '"$INSTDIR\$AssociationProgramName" "%1" %*' - WriteRegStr HKCR "$1\shell\edit" "" "Edit" - WriteRegStr HKCR "$1\shell\edit\command" "" 'notepad.exe "%1"' + + ${if} $AssociationEditor != "" + WriteRegStr HKCR "$1\shell\edit" "" "Edit" + WriteRegStr HKCR "$1\shell\edit\command" "" '"$AssociationEditor" "%1"' + ${endif} + WriteRegStr HKCR "$1\shellex\DropHandler" "" "{60254CA5-953B-11CF-8C96-00AA00B8708C}" DoneWithRexxExe: FunctionEnd +/** SetDefaultFileAssociation() + * + * Use to set the variable values for all the file association controls to the + * default. + */ +Function SetDefaultFileAssociation + StrCpy $Use_File_Associations_CK_state '${BST_CHECKED}' + + StrCpy $Associate_rexx_CK_state '${BST_CHECKED}' + StrCpy $Rexx_ext_text ${DefRexxExt} + StrCpy $Rexx_ftype_text "RexxScript" + StrCpy $Rexx_editor_text "C:\Windows\System32\NotePad.exe" + + StrCpy $Associate_rexxhide_CK_state '${BST_CHECKED}' + StrCpy $RexxHide_ext_text ${DefRexxHideExt} + StrCpy $RexxHide_ftype_text "RexxHide" + StrCpy $RexxHide_editor_text "C:\Windows\System32\NotePad.exe" + + StrCpy $Associate_rexxpaws_CK_state '${BST_CHECKED}' + StrCpy $RexxPaws_ext_text ${DefRexxPawsExt} + StrCpy $RexxPaws_ftype_text "RexxPaws" + StrCpy $RexxPaws_editor_text "C:\Windows\System32\NotePad.exe" + +FunctionEnd + +/** SetBlankFileAssociation() + * + * Use to set the variable values for all the file association controls to the + * the empty string. + */ +Function SetBlankFileAssociation + StrCpy $Use_File_Associations_CK_state '${BST_UNCHECKED}' + + StrCpy $Associate_rexx_CK_state '${BST_UNCHECKED}' + StrCpy $Rexx_ext_text "" + StrCpy $Rexx_ftype_text "" + StrCpy $Rexx_editor_text "" + + StrCpy $Associate_rexxhide_CK_state '${BST_UNCHECKED}' + StrCpy $RexxHide_ext_text "" + StrCpy $RexxHide_ftype_text "" + StrCpy $RexxHide_editor_text "" + + StrCpy $Associate_rexxpaws_CK_state '${BST_UNCHECKED}' + StrCpy $RexxPaws_ext_text "" + StrCpy $RexxPaws_ftype_text "" + StrCpy $RexxPaws_editor_text "" +FunctionEnd + +/** SetFileAssociationVars() + * + * Used to set the variable values for the file association dialog controls to + * the proper value on start up of the installer. + * + * Note: we can not know at this time, if the user will elect to do an upgrade + * type of install. So the RegVal_* variables can not be changed. + * + * If there is no previous install and the reg values are blank, all the + * variables are set to the defaults. Likewise, if there is a previous version + * installed, but the uninstaller version is not able to do an upgrade type of + * install, we also set the variables to their defaults. + * + * Otherwise, the variables are set initially to what is in the registry. + */ +Function SetFileAssociationVars + + ${if} $PreviousVersionInstalled == 'false' + ${andif} $RegVal_rexxAssociation == '' + Call SetDefaultFileAssociation + ${elseif} $UpgradeTypeAvailable == 'false' + Call SetDefaultFileAssociation + ${else} + ${if} $RegVal_rexxAssociation == '' + ${andif} $RegVal_rexxHideAssociation == '' + ${andif} $RegVal_rexxPawsAssociation == '' + Call SetBlankFileAssociation + ${else} + ; We will put the file extension in $0 and the ftype in $1 + + StrCpy $Use_File_Associations_CK_state '${BST_CHECKED}' + + ${if} $RegVal_rexxAssociation != '' + ${StrTok} $0 $RegVal_rexxAssociation " " "0" "0" + ${StrTok} $1 $RegVal_rexxAssociation " " "1" "0" + + StrCpy $Associate_rexx_CK_state '${BST_CHECKED}' + StrCpy $Rexx_ext_text $0 + StrCpy $Rexx_ftype_text $1 + StrCpy $Rexx_editor_text "$RegVal_rexxEditor" + ${endif} + + ${if} $RegVal_rexxHideAssociation != '' + ${StrTok} $0 $RegVal_rexxHideAssociation " " "0" "0" + ${StrTok} $1 $RegVal_rexxHideAssociation " " "1" "0" + + StrCpy $Associate_rexxhide_CK_state '${BST_CHECKED}' + StrCpy $RexxHide_ext_text $0 + StrCpy $RexxHide_ftype_text $1 + StrCpy $RexxHide_editor_text '$RegVal_rexxEditor' + ${endif} + + ${if} $RegVal_rexxPawsAssociation != '' + ${StrTok} $0 $RegVal_rexxPawsAssociation " " "0" "0" + ${StrTok} $1 $RegVal_rexxPawsAssociation " " "1" "0" + + StrCpy $Associate_rexxpaws_CK_state '${BST_CHECKED}' + StrCpy $RexxPaws_ext_text $0 + StrCpy $RexxPaws_ftype_text $1 + StrCpy $RexxPaws_editor_text '$RegVal_rexxEditor' + ${endif} + ${endif} + ${endif} + +FunctionEnd + +/** CheckInstalledStatus() + * + * Helper function used to determine if there is a previous version of ooRexx + * installed, and if so what level is the uninstaller at. + */ +Function CheckInstalledStatus + + StrCpy $PreviousVersionInstalled 'false' + StrCpy $UpgradeTypeAvailable 'false' + + ${if} $RegVal_uninstallString != "" + StrCpy $PreviousVersionInstalled 'true' + + ${if} $RegVal_uninstallLocation == "" + ; No location in the registry, we'll use the installation directory. + StrCpy $RegVal_uninstallLocation $INSTDIR + ${endif} + + ${if} $RegVal_uninstallVersion != "" + ${VersionCompare} $RegVal_uninstallVersion "4.1.0.0" $0 + + ; Returned in $0: 0 == versions are equal, 1 == version is greater than 4.1.0.0, 2 == version is less than 4.1.0.0 + ${if} $0 < 2 + StrCpy $UpgradeTypeAvailable 'true' + ${endif} + ${endif} + ${endif} + +FunctionEnd + /** AddToPathExt() * * Adds the file extension(s) associated with the ooRexx executables to PATHEXT. @@ -1739,15 +2655,21 @@ */ Function un.onInit + StrCpy $DoUpgrade 'false' + StrCpy $DoUpgradeQuick 'false' + ${GetOptions} "$CMDLINE" "/U=" $R0 - ${if} $R0 == 'true' + ${if} $R0 == 'upgrade' StrCpy $DoUpgrade 'true' - ${else} - StrCpy $DoUpgrade 'false' + ${elseif} $R0 == 'upgradeQuick' + StrCpy $DoUpgrade 'true' + StrCpy $DoUpgradeQuick 'true' ${endif} StrCpy $DeleteWholeTree 'false' + /* StrCpy $DeleteWholeTree 'true' ; TEMP TEMP TEMP always del tree while testing MM */ + ; UnInstall as All Users if an admin Call un.IsUserAdmin Pop $IsAdminUser @@ -1962,6 +2884,20 @@ FunctionEnd +/** un.Confirm_Page_pre() Call back function. + * + * Invoked before the Confirm page, (the page that shows "uninstalling from,") + * is created. We use this to not show that page if we are doing a quick + * upgrade install. + * + */ +Function un.Confirm_Page_pre + ${if} $DoUpgrade == 'true' + ${andif} $DoUpgradeQuick == 'true' + Abort + ${endif} +FunctionEnd + /** un.onCancelButton() Call back function * * Invoked by the uninstaller when the user clicks the cancel button. We only This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mie...@us...> - 2010-10-18 04:21:54
|
Revision: 6300 http://oorexx.svn.sourceforge.net/oorexx/?rev=6300&view=rev Author: miesfeld Date: 2010-10-18 04:21:47 +0000 (Mon, 18 Oct 2010) Log Message: ----------- Start updating the Windows installer interface in response to feed back Modified Paths: -------------- main/trunk/platform/windows/install/oorexx.nsi Modified: main/trunk/platform/windows/install/oorexx.nsi =================================================================== --- main/trunk/platform/windows/install/oorexx.nsi 2010-10-17 22:32:41 UTC (rev 6299) +++ main/trunk/platform/windows/install/oorexx.nsi 2010-10-18 04:21:47 UTC (rev 6300) @@ -164,9 +164,7 @@ Var RegVal_rexxAssociation ; File association string for rexx.exe (.ext / ftype - i.e. .rex RexxScript) Var RegVal_rexxEditor ; ... and editor file name Var RegVal_rexxHideAssociation ; File association string for rexxhide.exe (.ext / ftype - i.e. .rexg RexxHide) -Var RegVal_rexxHideEditor ; ... and editor file name Var RegVal_rexxPawsAssociation ; File association string for rexxpaws.exe (.ext / ftype - i.e. .rexp RexxPaws) -Var RegVal_rexxPawsEditor ; ... and editor file name Var AssociationProgramName ; Executable being associated (i.e rexxpaws.exe, rexx.exe, etc..) Var AssociationText ; Descriptive text that goes in registry (i.e. ooRexx Rexx GUI Program) Var AssociationEditor ; File path name of editor that goes in registry (i.e. C:\Windows\system32\NotePad.exe) @@ -219,7 +217,6 @@ Var RexxHide_ftype_EDIT Var RexxHide_ftype_text Var RexxHide_editor_EDIT -Var RexxHide_editor_text Var RexxHide_editor_PB ; rexxpaws.exe file associations @@ -230,7 +227,6 @@ Var RexxPaws_ftype_EDIT Var RexxPaws_ftype_text Var RexxPaws_editor_EDIT -Var RexxPaws_editor_text Var RexxPaws_editor_PB ; Uninstall variables @@ -392,9 +388,7 @@ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${SHORTNAME}" "RexxAssociation" $RegVal_rexxAssociation WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${SHORTNAME}" "RexxEditor" $RegVal_rexxEditor WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${SHORTNAME}" "RexxHideAssociation" $RegVal_rexxHideAssociation - WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${SHORTNAME}" "RexxHideEditor" $RegVal_rexxEditor WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${SHORTNAME}" "RexxPawsAssociation" $RegVal_rexxPawsAssociation - WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${SHORTNAME}" "RexxPawsEditor" $RegVal_rexxPawsEditor ${WriteUninstaller} "$INSTDIR\${UNINSTALLER}" @@ -742,6 +736,12 @@ ${AddItem} "$SMPROGRAMS\${LONGNAME}\Documentation\ooRexx Windows Extensions Reference.lnk" CreateShortCut "$SMPROGRAMS\${LONGNAME}\Documentation\ooRexxTry Reference.lnk" "$INSTDIR\doc\ooRexxTry.pdf" "" "$INSTDIR\doc\ooRexxTry.pdf" 0 ${AddItem} "$SMPROGRAMS\${LONGNAME}\Documentation\ooRexxTry Reference.lnk" + + SetOutPath $INSTDIR + CreateShortCut "$SENDTO\ooRexx with pause (rexxpaws).lnk" "$INSTDIR\rexxpaws.exe" "" "" "" SW_SHOWNORMAL "" "ooRexx with pause (rexxpaws)" + ${AddItem} "$SENDTO\ooRexx with pause (rexxpaws).lnk" + CreateShortCut "$SENDTO\ooRexx with no console (rexxhide).lnk" "$INSTDIR\rexxhide.exe" "" "" "" SW_SHOWNORMAL "" "ooRexx with no console (rexxhide)" + ${AddItem} "$SENDTO\ooRexx with no console (rexxhide).lnk" SectionEnd ;------------------------------------------------------------------------------- @@ -791,9 +791,7 @@ ReadRegStr $RegVal_rexxAssociation HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${SHORTNAME}" "RexxAssociation" ReadRegStr $RegVal_rexxEditor HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${SHORTNAME}" "RexxEditor" ReadRegStr $RegVal_rexxHideAssociation HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${SHORTNAME}" "RexxHideAssociation" - ReadRegStr $RegVal_rexxHideEditor HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${SHORTNAME}" "RexxHideEditor" ReadRegStr $RegVal_rexxPawsAssociation HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${SHORTNAME}" "RexxPawsAssociation" - ReadRegStr $RegVal_rexxPawsEditor HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${SHORTNAME}" "RexxPawsEditor" ; Check for previous version and if the upgrade type of uninstall is available. Call CheckInstalledStatus @@ -1008,7 +1006,7 @@ * The installer calls this function when the user presses the Next button on * the uninstall type page. We don't save the check box state because we * immediately run the uninstall and the user won't see this page again. - * Rather, we set the DoUpgrade / DoUpgradeQuick variabels to the proper values. + * Rather, we set the DoUpgrade / DoUpgradeQuick variables to the proper values. */ Function Uninstall_Type_Leave ${NSD_GetState} $Do_Upgrade_Type_CK $Do_Upgrade_Type_CK_state @@ -1404,7 +1402,7 @@ * is unchecked we disable the check box. * * Note: If we are doing an upgrade, then NSD_OnClick is not set. So we don't - * need to worry about getting during an upgrade install. + * need to worry about getting a click during an upgrade install. */ Function EnableStartService Pop $RxAPI_Install_Service_CK @@ -1462,8 +1460,9 @@ file, which icon appears for a file by default, and how the file appears when viewed \ in Windows Explorer.$\n$\n\ Associating a file extension with an ooRexx executable allows Rexx programs to be executed by \ - double clicking them and to be run from the command line by just typing their file name.$\n$\n\ - You can specify if, and how, file associations are created.$\n$\n\ + double clicking them in Windows explorer, and to be run from the command line by just typing \ + their file name. In addition, you can specify an editor for the file type. This editor is \ + used when the Edit item of the context menu for the file is selected.$\n$\n\ Check the check box to have the installer create file associations. The following pages \ will allow you to specify which associations are created. Uncheck the check box if you \ do not want any associations to be created." @@ -1507,8 +1506,8 @@ Abort ${endif} - !insertmacro MUI_HEADER_TEXT "Associate a file extension with rexx.exe" \ - "Traditionally the ${DefRexxExt} file extension is associated with rexx.exe." + !insertmacro MUI_HEADER_TEXT "Associate a file extension with rexx.exe" "Pick the editor to be used when the Edit \ + item of the context menu is selected." nsDialogs::Create 1018 Pop $Dialog @@ -1519,49 +1518,54 @@ ${NSD_OnBack} Associate_rexx_leave - ${NSD_CreateLabel} 0u 0u 100% 48u \ - "Usually in ${LONGNAME} installations the Rexx interpreter, rexx.exe, is associated with the \ - .rex extension using the file type name of RexxScript and the NotePad editor. However, you \ - can specify these values yourself, or not create any file association at all.$\n$\n\ - Note: Unless you have a good understanding of Windows file associations, it is probably \ - best to leave the file type name RexxScript." + ${NSD_CreateLabel} 0u 0u 100% 16u \ + "Select the editor to be used with your ooRexx file type(s). This adds the Edit menu item to \ + context menu of the file type. The same editor is used for all file types." Pop $Label_One - ${NSD_CreateGroupBox} 0u 56u 100% 84u "File Associations for rexx.exe" + ; Editor line + ${NSD_CreateLabel} 0u 20u 60u 8u "Full path to editor:" Pop $0 ; Discarded - ${NSD_CreateCheckBox} 8u 72u 80% 8u "Create rexx.exe file association" + ${NSD_CreateText} 0u 30u 185u 12u $Rexx_editor_text + Pop $Rexx_editor_EDIT + + ${NSD_CreateButton} 190u 28u 45u 16u "Browse..." + Pop $Rexx_editor_PB + + System::Call shlwapi::SHAutoComplete(i$Rexx_editor_EDIT, i${SHACF_FILESYSTEM}) + + + ${NSD_CreateLabel} 0u 50u 100% 24u \ + "By default in ${LONGNAME} installations the Rexx interpreter, rexx.exe, is associated with the \ + .rex extension using the file type name of RexxScript. However, you can change these values if \ + you care to." + + Pop $Label_Two + + ${NSD_CreateGroupBox} 0u 80u 100% 40u "File Associations for rexx.exe" + Pop $0 ; Discarded + + ${NSD_CreateCheckBox} 8u 92u 80% 8u "Create rexx.exe file association" Pop $Associate_rexx_CK ${NSD_SetState} $Associate_rexx_CK $Associate_rexx_CK_state ; Extension line - ${NSD_CreateLabel} 16u 86u 50u 8u "Extension:" + ${NSD_CreateLabel} 16u 106u 36u 8u "Extension:" Pop $0 ; Discarded - ${NSD_CreateText} 78u 84u 46u 12u $Rexx_ext_text + ${NSD_CreateText} 54u 104u 46u 12u $Rexx_ext_text Pop $Rexx_ext_EDIT ; File type line - ${NSD_CreateLabel} 16u 104u 50u 8u "File type name:" + ${NSD_CreateLabel} 120u 106u 52u 8u "File type name:" Pop $0 ; Discarded - ${NSD_CreateText} 78u 102u 46u 12u $Rexx_ftype_text + ${NSD_CreateText} 175u 104u 46u 12u $Rexx_ftype_text Pop $Rexx_ftype_EDIT - ; Editor line - ${NSD_CreateLabel} 16u 122u 60u 8u "Full path to editor:" - Pop $0 ; Discarded - - ${NSD_CreateText} 78u 120u 165u 12u $Rexx_editor_text - Pop $Rexx_editor_EDIT - - ${NSD_CreateButton} 250u 118u 45u 16u "Browse..." - Pop $Rexx_editor_PB - - System::Call shlwapi::SHAutoComplete(i$Rexx_editor_EDIT, i${SHACF_FILESYSTEM}) - ${if} $Associate_rexx_CK_state == ${BST_UNCHECKED} ${orif} $DoUpgrade == 'true' EnableWindow $Rexx_ext_EDIT 0 @@ -1734,7 +1738,7 @@ ${NSD_CreateLabel} 16u 122u 60u 8u "Full path to editor:" Pop $0 ; Discarded - ${NSD_CreateText} 78u 120u 165u 12u $RexxHide_editor_text + ${NSD_CreateText} 78u 120u 165u 12u $Rexx_editor_text Pop $RexxHide_editor_EDIT ${NSD_CreateButton} 250u 118u 45u 16u "Browse..." @@ -1756,7 +1760,7 @@ ${EndIf} ${NSD_OnClick} $Associate_rexxhide_CK EnableRexxHideAssociation - ${NSD_OnClick} $RexxHide_editor_PB Get_rexxhide_editor_file + ${NSD_OnClick} $RexxHide_editor_PB Get_rexx_editor_file nsDialogs::Show @@ -1807,27 +1811,10 @@ ; Okay text fields are okay. If editor field is blank, it is just not used. ${NSD_GetText} $RexxHide_ext_EDIT $RexxHide_ext_text ${NSD_GetText} $RexxHide_ftype_EDIT $RexxHide_ftype_text - ${NSD_GetText} $RexxHide_editor_EDIT $RexxHide_editor_text + ${NSD_GetText} $RexxHide_editor_EDIT $Rexx_editor_text FunctionEnd -/** Get_rexxhide_editor_file() - * - * Puts up a file open dialog and allows the user to select a file. If the - * user does not cancel, the edit control is updated with the file selected. - */ -Function Get_rexxhide_editor_file - Pop $RexxHide_editor_PB - ${NSD_GetText} $RexxHide_editor_EDIT $0 - - nsDialogs::SelectFileDialog open $0 "*.exe" - pop $0 - ${if} $0 != "" - ${NSD_SetText} $RexxHide_editor_EDIT $0 - ${endif} - -FunctionEnd - /** EnableRexxHideAssociation() * * Called when the user clicks on the Create rexxhide.exe file association check @@ -1913,7 +1900,7 @@ ${NSD_CreateLabel} 16u 122u 60u 8u "Full path to editor:" Pop $0 ; Discarded - ${NSD_CreateText} 78u 120u 165u 12u $RexxPaws_editor_text + ${NSD_CreateText} 78u 120u 165u 12u $Rexx_editor_text Pop $RexxPaws_editor_EDIT ${NSD_CreateButton} 250u 118u 45u 16u "Browse..." @@ -1935,7 +1922,7 @@ ${EndIf} ${NSD_OnClick} $Associate_rexxpaws_CK EnableRexxPawsAssociation - ${NSD_OnClick} $RexxPaws_editor_PB Get_rexxpaws_editor_file + ${NSD_OnClick} $RexxPaws_editor_PB Get_rexx_editor_file nsDialogs::Show @@ -1985,27 +1972,10 @@ ; Okay text fields are okay. If editor field is blank, it is just not used. ${NSD_GetText} $RexxPaws_ext_EDIT $RexxPaws_ext_text ${NSD_GetText} $RexxPaws_ftype_EDIT $RexxPaws_ftype_text - ${NSD_GetText} $RexxPaws_editor_EDIT $RexxPaws_editor_text + ${NSD_GetText} $RexxPaws_editor_EDIT $Rexx_editor_text FunctionEnd -/** Get_rexxpaws_editor_file() - * - * Puts up a file open dialog and allows the user to select a file. If the - * user does not cancel, the edit control is updated with the file selected. - */ -Function Get_rexxpaws_editor_file - Pop $RexxPaws_editor_PB - ${NSD_GetText} $RexxPaws_editor_EDIT $0 - - nsDialogs::SelectFileDialog open $0 "*.exe" - pop $0 - ${if} $0 != "" - ${NSD_SetText} $RexxPaws_editor_EDIT $0 - ${endif} - -FunctionEnd - /** EnableRexxPawsAssociation() * * Called when the user clicks on the Create rexxpaws.exe file association check @@ -2115,9 +2085,7 @@ StrCpy $RegVal_rexxAssociation "" StrCpy $RegVal_rexxEditor "" StrCpy $RegVal_rexxHideAssociation "" - StrCpy $RegVal_rexxHideEditor "" StrCpy $RegVal_rexxPawsAssociation "" - StrCpy $RegVal_rexxPawsEditor "" ${if} $Use_File_Associations_CK_state == ${BST_UNCHECKED} DetailPrint "Do not use Windows file associations specified." @@ -2135,7 +2103,7 @@ ${if} $Associate_rexxhide_CK_state == ${BST_CHECKED} StrCpy $AssociationProgramName 'rexxhide.exe' StrCpy $RegVal_rexxHideAssociation '$RexxHide_ext_text $RexxHide_ftype_text' - StrCpy $RegVal_rexxHideEditor '$RexxHide_editor_text' + StrCpy $RegVal_rexxEditor '$Rexx_editor_text' Call AssociateExtensionWithExe ${endif} @@ -2143,7 +2111,7 @@ ${if} $Associate_rexxpaws_CK_state = ${BST_CHECKED} StrCpy $AssociationProgramName 'rexxpaws.exe' StrCpy $RegVal_rexxPawsAssociation '$RexxPaws_ext_text $RexxPaws_ftype_text' - StrCpy $RegVal_rexxPawsEditor '$RexxPaws_editor_text' + StrCpy $RegVal_rexxEditor '$Rexx_editor_text' Call AssociateExtensionWithExe ${endif} @@ -2178,12 +2146,12 @@ ${StrTok} $0 $RegVal_rexxHideAssociation " " "0" "0" ${StrTok} $1 $RegVal_rexxHideAssociation " " "1" "0" StrCpy $AssociationText "ooRexx Rexx GUI Progam" - StrCpy $AssociationEditor '$RegVal_rexxHideEditor' + StrCpy $AssociationEditor '$RegVal_rexxEditor' ${elseif} $AssociationProgramName == 'rexxpaws.exe' ${StrTok} $0 $RegVal_rexxPawsAssociation " " "0" "0" ${StrTok} $1 $RegVal_rexxPawsAssociation " " "1" "0" StrCpy $AssociationText "ooRexx Rexx pausing Progam" - StrCpy $AssociationEditor "$RegVal_rexxPawsEditor" + StrCpy $AssociationEditor "$RegVal_rexxEditor" ${else} DetailPrint "Unrecoverable ERROR. The ftype association executable: $AssociationProgramName is not recognized." Goto DoneWithRexxExe @@ -2259,12 +2227,10 @@ StrCpy $Associate_rexxhide_CK_state '${BST_CHECKED}' StrCpy $RexxHide_ext_text ${DefRexxHideExt} StrCpy $RexxHide_ftype_text "RexxHide" - StrCpy $RexxHide_editor_text "C:\Windows\System32\NotePad.exe" StrCpy $Associate_rexxpaws_CK_state '${BST_CHECKED}' StrCpy $RexxPaws_ext_text ${DefRexxPawsExt} StrCpy $RexxPaws_ftype_text "RexxPaws" - StrCpy $RexxPaws_editor_text "C:\Windows\System32\NotePad.exe" FunctionEnd @@ -2284,12 +2250,10 @@ StrCpy $Associate_rexxhide_CK_state '${BST_UNCHECKED}' StrCpy $RexxHide_ext_text "" StrCpy $RexxHide_ftype_text "" - StrCpy $RexxHide_editor_text "" StrCpy $Associate_rexxpaws_CK_state '${BST_UNCHECKED}' StrCpy $RexxPaws_ext_text "" StrCpy $RexxPaws_ftype_text "" - StrCpy $RexxPaws_editor_text "" FunctionEnd /** SetFileAssociationVars() @@ -2341,7 +2305,6 @@ StrCpy $Associate_rexxhide_CK_state '${BST_CHECKED}' StrCpy $RexxHide_ext_text $0 StrCpy $RexxHide_ftype_text $1 - StrCpy $RexxHide_editor_text '$RegVal_rexxEditor' ${endif} ${if} $RegVal_rexxPawsAssociation != '' @@ -2351,7 +2314,6 @@ StrCpy $Associate_rexxpaws_CK_state '${BST_CHECKED}' StrCpy $RexxPaws_ext_text $0 StrCpy $RexxPaws_ftype_text $1 - StrCpy $RexxPaws_editor_text '$RegVal_rexxEditor' ${endif} ${endif} ${endif} @@ -2863,6 +2825,11 @@ Pop $Delete_ooRexx_Tree_CK ${endif} + ; Set focus to the page dialog rather than the installer dialog, set focus to + ; the check box, and then show the page dialog + SendMessage $Dialog ${WM_SETFOCUS} $HWNDPARENT 0 + SendMessage $Dialog ${WM_NEXTDLGCTL} $Delete_ooRexx_Tree_CK 1 + nsDialogs::Show FunctionEnd @@ -2924,6 +2891,13 @@ RMDir /r "$INSTDIR" DetailPrint "Removing all Start Menu short cuts by removing the $SMPROGRAMS\${LONGNAME} folder" RMDir /r "$SMPROGRAMS\${LONGNAME}" + + /* Remove the send to entries unless we are doing an updgrade type. */ + ${if} $DoUpgrade == 'true' + Return + ${endif} + Delete "$SENDTO\ooRexx with pause (rexxpaws).lnk" + Delete "$SENDTO\ooRexx with no console (rexxhide).lnk" ${else} DetailPrint "Uninstall files using the install log file" Push $R0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mie...@us...> - 2010-10-18 23:50:30
|
Revision: 6301 http://oorexx.svn.sourceforge.net/oorexx/?rev=6301&view=rev Author: miesfeld Date: 2010-10-18 23:50:23 +0000 (Mon, 18 Oct 2010) Log Message: ----------- Finish up the update of the Windows installer Modified Paths: -------------- main/trunk/platform/windows/install/oorexx.nsi Modified: main/trunk/platform/windows/install/oorexx.nsi =================================================================== --- main/trunk/platform/windows/install/oorexx.nsi 2010-10-18 04:21:47 UTC (rev 6300) +++ main/trunk/platform/windows/install/oorexx.nsi 2010-10-18 23:50:23 UTC (rev 6301) @@ -19,10 +19,15 @@ !define UNINSTALLER "uninstall.exe" !define KEYFILE1 "rexx.exe" !define KEYFILE2 "rxapi.dll" -!define DefRexxExt ".rex" ; Defualt file extensions -!define DefRexxHideExt ".rexg" -!define DefRexxPawsExt ".rexp" +; Default file extensions and ftypes +!define DefRexxExt ".rex" +!define DefRexxFType "RexxScript" +!define DefRexxHideExt ".rexg" +!define DefRexxHideFType "RexxHide" +!define DefRexxPawsExt ".rexp" +!define DefRexxPawsFType "RexxPaws" + Name "${LONGNAME} ${VERSION}" !include "MUI2.nsh" @@ -120,6 +125,7 @@ Page custom Uninstall_Type_page Uninstall_Type_Leave Page custom Ok_Stop_RxAPI_page Ok_Stop_RxAPI_leave + !define MUI_PAGE_CUSTOMFUNCTION_PRE Components_Page_pre !define MUI_PAGE_CUSTOMFUNCTION_SHOW Components_Page_show !insertmacro MUI_PAGE_COMPONENTS @@ -129,9 +135,10 @@ Page custom Rxapi_Options_page Rxapi_Options_leave Page custom File_Associations_page File_Associations_leave + Page custom SendTo_Items_page SendTo_Items_leave Page custom Associate_rexx_page Associate_rexx_leave - Page custom Associate_rexxhide_page Associate_rexxhide_leave - Page custom Associate_rexxpaws_page Associate_rexxpaws_leave + Page custom Associate_otherExes_page Associate_otherExes_leave + Page custom Confirm_page !insertmacro MUI_PAGE_INSTFILES !insertmacro MUI_PAGE_FINISH @@ -165,6 +172,10 @@ Var RegVal_rexxEditor ; ... and editor file name Var RegVal_rexxHideAssociation ; File association string for rexxhide.exe (.ext / ftype - i.e. .rexg RexxHide) Var RegVal_rexxPawsAssociation ; File association string for rexxpaws.exe (.ext / ftype - i.e. .rexp RexxPaws) +Var RegVal_sendTo_rexx ; Add / don't add Send To Rexx item +Var RegVal_sendTo_rexxHide ; Add / don't add Send To rexxpaws item +Var RegVal_sendTo_rexxPaws ; Add / don't add Send To rexxhide item + Var AssociationProgramName ; Executable being associated (i.e rexxpaws.exe, rexx.exe, etc..) Var AssociationText ; Descriptive text that goes in registry (i.e. ooRexx Rexx GUI Program) Var AssociationEditor ; File path name of editor that goes in registry (i.e. C:\Windows\system32\NotePad.exe) @@ -198,16 +209,23 @@ Var Use_File_Associations_CK Var Use_File_Associations_CK_state -; rexx.exe file associations +Var SendTo_rexx_CK +Var SendTo_rexx_CK_state +Var SendTo_rexxHide_CK +Var SendTo_rexxHide_CK_state +Var SendTo_rexxPaws_CK +Var SendTo_rexxPaws_CK_state + +; rexx.exe file associations page controls +Var Rexx_editor_EDIT +Var Rexx_editor_text +Var Rexx_editor_PB Var Associate_rexx_CK Var Associate_rexx_CK_state Var Rexx_ext_EDIT Var Rexx_ext_text Var Rexx_ftype_EDIT Var Rexx_ftype_text -Var Rexx_editor_EDIT -Var Rexx_editor_text -Var Rexx_editor_PB ; rexxhide.exe file associations Var Associate_rexxhide_CK @@ -216,8 +234,6 @@ Var RexxHide_ext_text Var RexxHide_ftype_EDIT Var RexxHide_ftype_text -Var RexxHide_editor_EDIT -Var RexxHide_editor_PB ; rexxpaws.exe file associations Var Associate_rexxpaws_CK @@ -226,8 +242,6 @@ Var RexxPaws_ext_text Var RexxPaws_ftype_EDIT Var RexxPaws_ftype_text -Var RexxPaws_editor_EDIT -Var RexxPaws_editor_PB ; Uninstall variables Var InStopRxapiPage @@ -345,8 +359,11 @@ ; If we are doing an upgrade, these settings are all left however they were. ${if} $DoUpgrade == 'false' - ; Do the file associations first, like associate .rex with ooRexx - ; (REXXScript). DoFileAssociations needs to run before DoEnvVariagles. + ; Maybe create Send To items. + Call DoSendToItems + + ; Do the file associations, like associate .rex with ooRexx (REXXScript). + ; DoFileAssociations needs to run before DoEnvVariagles. Call DoFileAssociations ; Set the environment variables, PATH, REXX_HOME, etc.. @@ -390,6 +407,10 @@ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${SHORTNAME}" "RexxHideAssociation" $RegVal_rexxHideAssociation WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${SHORTNAME}" "RexxPawsAssociation" $RegVal_rexxPawsAssociation + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${SHORTNAME}" "SendToRexx" $RegVal_sendTo_rexx + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${SHORTNAME}" "SendToRexxHide" $RegVal_sendTo_rexxHide + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${SHORTNAME}" "SendToRexxPaws" $RegVal_sendTo_rexxPaws + ${WriteUninstaller} "$INSTDIR\${UNINSTALLER}" SectionEnd @@ -709,6 +730,7 @@ Section "${LONGNAME} Documentation" SecDoc DetailPrint "********** Documentation **********" + ; Set output path to the installation directory. ${SetOutPath} $INSTDIR\doc ${File} "${SRCDIR}\doc\" "rexxpg.pdf" @@ -719,6 +741,7 @@ ${File} "${SRCDIR}\doc\" "oodialog.pdf" ${File} "${SRCDIR}\doc\" "winextensions.pdf" ${File} "${SRCDIR}\samples\windows\oodialog\ooRexxTry\doc\" "ooRexxTry.pdf" + ; Create start menu shortcuts CreateShortCut "$SMPROGRAMS\${LONGNAME}\Documentation\ooRexx Reference.lnk" "$INSTDIR\doc\rexxref.pdf" "" "$INSTDIR\doc\rexxref.pdf" 0 ${AddItem} "$SMPROGRAMS\${LONGNAME}\Documentation\ooRexx Reference.lnk" @@ -737,11 +760,6 @@ CreateShortCut "$SMPROGRAMS\${LONGNAME}\Documentation\ooRexxTry Reference.lnk" "$INSTDIR\doc\ooRexxTry.pdf" "" "$INSTDIR\doc\ooRexxTry.pdf" 0 ${AddItem} "$SMPROGRAMS\${LONGNAME}\Documentation\ooRexxTry Reference.lnk" - SetOutPath $INSTDIR - CreateShortCut "$SENDTO\ooRexx with pause (rexxpaws).lnk" "$INSTDIR\rexxpaws.exe" "" "" "" SW_SHOWNORMAL "" "ooRexx with pause (rexxpaws)" - ${AddItem} "$SENDTO\ooRexx with pause (rexxpaws).lnk" - CreateShortCut "$SENDTO\ooRexx with no console (rexxhide).lnk" "$INSTDIR\rexxhide.exe" "" "" "" SW_SHOWNORMAL "" "ooRexx with no console (rexxhide)" - ${AddItem} "$SENDTO\ooRexx with no console (rexxhide).lnk" SectionEnd ;------------------------------------------------------------------------------- @@ -788,14 +806,20 @@ ReadRegStr $RegVal_uninstallString HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${SHORTNAME}" "UninstallString" ReadRegStr $RegVal_uninstallLocation HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${SHORTNAME}" "UnInstallLocation" ReadRegStr $RegVal_uninstallVersion HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${SHORTNAME}" "UninstallVersion" + ReadRegStr $RegVal_rexxEditor HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${SHORTNAME}" "RexxEditor" ReadRegStr $RegVal_rexxAssociation HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${SHORTNAME}" "RexxAssociation" - ReadRegStr $RegVal_rexxEditor HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${SHORTNAME}" "RexxEditor" ReadRegStr $RegVal_rexxHideAssociation HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${SHORTNAME}" "RexxHideAssociation" ReadRegStr $RegVal_rexxPawsAssociation HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${SHORTNAME}" "RexxPawsAssociation" + ReadRegStr $RegVal_sendTo_rexx HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${SHORTNAME}" "SendToRexx" + ReadRegStr $RegVal_sendTo_rexxHide HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${SHORTNAME}" "SendToRexxHide" + ReadRegStr $RegVal_sendTo_rexxPaws HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${SHORTNAME}" "SendToRexxPaws" ; Check for previous version and if the upgrade type of uninstall is available. Call CheckInstalledStatus + ; Set the send to dialog control variables. + Call SetSendToVars + ; Set all the dialog control variables for doing file associations to their ; correct starting values. Call SetFileAssociationVars @@ -833,7 +857,7 @@ ${If} $Dialog == error Abort - ${EndIf} + ${endif} ${NSD_CreateLabel} 0 0 100% 40u \ "A version of ${LONGNAME} is currently installed. If the previous version is \ @@ -884,7 +908,7 @@ ShowWindow $Label_Two ${SW_SHOW} ShowWindow $Force_Install_CK ${SW_SHOW} ${NSD_Uncheck} $Force_Install_CK - ${EndIf} + ${endif} FunctionEnd /** Uninstall_Old_ooRexx_Leave() Callback function. @@ -947,7 +971,7 @@ ${If} $Dialog == error Abort - ${EndIf} + ${endif} ${NSD_CreateLabel} 0u 0u 100% 64u \ @@ -1185,14 +1209,14 @@ Abort ${endif} - !insertmacro MUI_HEADER_TEXT "The ${LONGNAME} memory manager (rxapi) is currently running" \ + !insertmacro MUI_HEADER_TEXT "The ${LONGNAME} memory manager (rxapi) is currently running." \ "A new version of rxapi can not be installed while rxapi is running." nsDialogs::Create /NOUNLOAD 1018 Pop $Dialog ${If} $Dialog == error Abort - ${EndIf} + ${endif} ${NSD_CreateLabel} 0 0 100% 112u \ "A previous version of the ${LONGNAME} memory manager (rxapi) is currently running. \ @@ -1254,6 +1278,21 @@ NotRunning: FunctionEnd +/** Components_Page_pre() Call back function + * + * Invoked by the installer before the components page is created. + * + * If this is a QUICK upgrade install, we skip the page. + */ +Function Components_Page_pre + + ${if} $DoUpgrade == 'true' + ${andif} $DoUpgradeQuick == 'true' + Abort + ${endif} + +FunctionEnd + /** Components_Page_show() Call back function * * Invoked by the installer right before the components page is shown. @@ -1270,6 +1309,14 @@ GetDlgItem $0 $HWNDPARENT 3 EnableWindow $0 0 + ; Disable the components list view control + EnableWindow $mui.ComponentsPage.Components 0 + + ; Change the descriptive text + SendMessage $mui.ComponentsPage.Text ${WM_SETTEXT} 0 \ + "STR:These components of ${LONGNAME} ${VERSION} wil be installed. The component list can not be \ + changed for an upgrade type of install. Click Next to continue." + Call PageDisableQuit ${endif} @@ -1344,8 +1391,9 @@ ${endif} ${if} $DoUpgrade == 'true' - !insertmacro MUI_HEADER_TEXT "ooRexx rxapi is installed as a Windows Service." "Choose whether \ - to start the rxapi Service during installation." + !insertmacro MUI_HEADER_TEXT "ooRexx rxapi is installed as a Windows Service." \ + "Installation of rxapi as a service can not be changed during an upgrade, but \ + you can choose whether to start the rxapi Service during installation." ${else} !insertmacro MUI_HEADER_TEXT "The ooRexx rxapi process." "Install rxapi as a Windows Service." ${endif} @@ -1355,7 +1403,7 @@ ${If} $Dialog == error Abort - ${EndIf} + ${endif} ${NSD_OnBack} Rxapi_Options_leave @@ -1414,7 +1462,7 @@ ${Else} EnableWindow $RxAPI_Start_CK 0 ${NSD_Uncheck} $RxAPI_Start_CK - ${EndIf} + ${endif} FunctionEnd /** Rxapi_Options_leave() Call back function. @@ -1441,7 +1489,7 @@ Abort ${endif} - !insertmacro MUI_HEADER_TEXT "Associate file extensions with the ooRexx executables" \ + !insertmacro MUI_HEADER_TEXT "Associate file extensions with the ooRexx executables." \ "Any, or all, of the ooRexx executables (rexx.exe, rexxhide.exe, or rexxpaws.exe) \ can be associated with a file extension." @@ -1450,7 +1498,7 @@ ${If} $Dialog == error Abort - ${EndIf} + ${endif} ${NSD_OnBack} File_Associations_leave @@ -1488,6 +1536,87 @@ FunctionEnd +/** SendTo_Items_page() Custom page function. + * + * Allows the user to create 'Send To' items for the Rexx executables. + * + * The page is skipped if we are doing a quick upgrade. + */ +Function SendTo_Items_page + + ${if} $DoUpgrade == 'true' + ${andif} $DoUpgradeQuick == 'true' + Abort + ${endif} + + ${if} $DoUpgrade == 'true' + !insertmacro MUI_HEADER_TEXT "The Send To items that will be created." \ + "Which Send To items will be created can not be changed during an upgrade \ + type of install." + ${else} + !insertmacro MUI_HEADER_TEXT "Create 'Send To' items for the Rexx executables." \ + "'Send To' items can be used instead of file associations, or in addition \ + to file associations." + ${endif} + + nsDialogs::Create 1018 + Pop $Dialog + + ${If} $Dialog == error + Abort + ${endif} + + ${NSD_OnBack} SendTo_Items_leave + + ${NSD_CreateLabel} 0u 0u 100% 72u \ + "The 'Send To' context menu item for objects displayed in the Windows Explore contains a list of \ + programs that the object can be 'sent to.' Typically, the items in the list are executables that \ + can process the file or directory object sent to them. 'Sending' your Rexx program to one of the \ + Rexx executables will execute your program.$\n$\n\ + Rather than create a file association for rexxhide.exe and rexxpaws.exe you may wish to create a \ + 'Send To' item for those executables. Or create both a file association and 'Send To' items for \ + those executabls. Usually a file association is created for rexx.exe and not a 'Send To' item." + + Pop $Label_One + + ${NSD_CreateCheckBox} 0u 80u 100% 8u "Create 'Send To' Rexx item (Typically this is not done.)" + Pop $SendTo_rexx_CK + + ${NSD_CreateCheckBox} 0u 100u 100% 8u "Create 'Send To' Rexx Hide (rexxhide.exe) item" + Pop $SendTo_rexxHide_CK + + ${NSD_CreateCheckBox} 0u 120u 100% 8u "Create 'Send To' Rexx Pause (rexxpaws.exe) item" + Pop $SendTo_rexxPaws_CK + + ${NSD_SetState} $SendTo_rexx_CK $SendTo_rexx_CK_state + ${NSD_SetState} $SendTo_rexxhide_CK $SendTo_rexxHide_CK_state + ${NSD_SetState} $SendTo_rexxpaws_CK $SendTo_rexxPaws_CK_state + + ${if} $DoUpgrade == 'true' + EnableWindow $Label_One 0 + EnableWindow $SendTo_rexx_CK 0 + EnableWindow $SendTo_rexxHide_CK 0 + EnableWindow $SendTo_rexxPaws_CK 0 + Call PageDisableQuit + ${endif} + + nsDialogs::Show + +FunctionEnd + +/** SendTo_Items_leave() Call back function. + * + * This function is called when the Send To Items page is left. The state of + * the dialog controls is saved. + */ +Function SendTo_Items_leave + + ${NSD_GetState} $SendTo_rexx_CK $SendTo_rexx_CK_state + ${NSD_GetState} $SendTo_rexxHide_CK $SendTo_rexxHide_CK_state + ${NSD_GetState} $SendTo_rexxPaws_CK $SendTo_rexxPaws_CK_state + +FunctionEnd + /** Associate_rexx_page() Custom page function. * * Presents the option to the user of creating a file association for rexx.exe @@ -1506,21 +1635,26 @@ Abort ${endif} - !insertmacro MUI_HEADER_TEXT "Associate a file extension with rexx.exe" "Pick the editor to be used when the Edit \ - item of the context menu is selected." + ${if} $DoUpgrade == 'true' + !insertmacro MUI_HEADER_TEXT "The file extension for rexx.exe and Rexx program editor choices." \ + "These choices can not be changed during an upgrade type of install." + ${else} + !insertmacro MUI_HEADER_TEXT "Associate a file extension with rexx.exe." "Pick the editor to be used when the Edit \ + item of the context menu is selected." + ${endif} nsDialogs::Create 1018 Pop $Dialog ${If} $Dialog == error Abort - ${EndIf} + ${endif} ${NSD_OnBack} Associate_rexx_leave ${NSD_CreateLabel} 0u 0u 100% 16u \ "Select the editor to be used with your ooRexx file type(s). This adds the Edit menu item to \ - context menu of the file type. The same editor is used for all file types." + the context menu of the file type. The same editor is used for all file types." Pop $Label_One @@ -1537,47 +1671,52 @@ System::Call shlwapi::SHAutoComplete(i$Rexx_editor_EDIT, i${SHACF_FILESYSTEM}) - ${NSD_CreateLabel} 0u 50u 100% 24u \ + ${NSD_CreateLabel} 0u 60u 100% 24u \ "By default in ${LONGNAME} installations the Rexx interpreter, rexx.exe, is associated with the \ - .rex extension using the file type name of RexxScript. However, you can change these values if \ + ${DefRexxExt} extension using the file type name of ${DefRexxFType}. However, you can change these values if \ you care to." Pop $Label_Two - ${NSD_CreateGroupBox} 0u 80u 100% 40u "File Associations for rexx.exe" + ${NSD_CreateGroupBox} 0u 90u 100% 44u "File Association for rexx.exe" Pop $0 ; Discarded - ${NSD_CreateCheckBox} 8u 92u 80% 8u "Create rexx.exe file association" + ${NSD_CreateCheckBox} 8u 104u 80% 8u "Create rexx.exe file association" Pop $Associate_rexx_CK ${NSD_SetState} $Associate_rexx_CK $Associate_rexx_CK_state ; Extension line - ${NSD_CreateLabel} 16u 106u 36u 8u "Extension:" + ${NSD_CreateLabel} 16u 116u 36u 8u "Extension:" Pop $0 ; Discarded - ${NSD_CreateText} 54u 104u 46u 12u $Rexx_ext_text + ${NSD_CreateText} 52u 114u 46u 12u $Rexx_ext_text Pop $Rexx_ext_EDIT ; File type line - ${NSD_CreateLabel} 120u 106u 52u 8u "File type name:" + ${NSD_CreateLabel} 120u 116u 52u 8u "File type name:" Pop $0 ; Discarded - ${NSD_CreateText} 175u 104u 46u 12u $Rexx_ftype_text + ${NSD_CreateText} 173u 114u 46u 12u $Rexx_ftype_text Pop $Rexx_ftype_EDIT + ${NSD_SetState} $Associate_rexx_CK $Associate_rexx_CK_state + ${NSD_SetState} $SendTo_rexx_CK $SendTo_rexx_CK_state + ${if} $Associate_rexx_CK_state == ${BST_UNCHECKED} ${orif} $DoUpgrade == 'true' EnableWindow $Rexx_ext_EDIT 0 EnableWindow $Rexx_ftype_EDIT 0 - EnableWindow $Rexx_editor_EDIT 0 - EnableWindow $Rexx_editor_PB 0 - ${EndIf} - ${if} $DoUpgrade == 'true' - EnableWindow $Associate_rexx_CK 0 - Call PageDisableQuit - ${EndIf} + ${if} $DoUpgrade == 'true' + EnableWindow $Rexx_editor_EDIT 0 + EnableWindow $Rexx_editor_PB 0 + EnableWindow $Associate_rexx_CK 0 + EnableWindow $Label_One 0 + EnableWindow $Label_Two 0 + Call PageDisableQuit + ${endif} + ${endif} ${NSD_OnClick} $Associate_rexx_CK EnableRexxAssociation ${NSD_OnClick} $Rexx_editor_PB Get_rexx_editor_file @@ -1664,24 +1803,20 @@ ${If} $0 == 1 EnableWindow $Rexx_ext_EDIT 1 EnableWindow $Rexx_ftype_EDIT 1 - EnableWindow $Rexx_editor_EDIT 1 - EnableWindow $Rexx_editor_PB 1 ${Else} EnableWindow $Rexx_ext_EDIT 0 EnableWindow $Rexx_ftype_EDIT 0 - EnableWindow $Rexx_editor_EDIT 0 - EnableWindow $Rexx_editor_PB 0 - ${EndIf} + ${endif} FunctionEnd -/** Associate_rexxhide_page() Custom page function. +/** Associate_otherExes_page() Custom page function. * * This is a custom page * * * */ -Function Associate_rexxhide_page +Function Associate_otherExes_page ${if} $Use_File_Associations_CK_state == ${BST_UNCHECKED} Abort @@ -1692,89 +1827,124 @@ Abort ${endif} - !insertmacro MUI_HEADER_TEXT "Associate a file extension with rexxhide.exe" \ - "The default file extension for rexxhide is $\"${DefRexxPawsExt}$\" with a file type of $\"RexxHide$\"." + ${if} $DoUpgrade == 'true' + !insertmacro MUI_HEADER_TEXT "The file extension chocies for rexxhide.exe. and rexxpaws.exe" \ + "These choices can not be changed during an upgrade type of install." + ${else} + !insertmacro MUI_HEADER_TEXT "Associate a file extension with rexxhide.exe and / or rexxpaws.exe" \ + "rexxhide default file extension: $\"${DefRexxHideExt}$\" file type: $\"${DefRexxHideFType}$\"$\n\ + rexpaws default file extension: $\"${DefRexxPawsExt}$\" file type: $\"${DefRexxPawsFType}$\"." + ${endif} nsDialogs::Create 1018 Pop $Dialog ${If} $Dialog == error Abort - ${EndIf} + ${endif} - ${NSD_OnBack} Associate_rexxhide_leave + ${NSD_OnBack} Associate_otherExes_leave - ${NSD_CreateLabel} 0u 0u 100% 48u \ - "The rexxhide executable runs Rexx programs without creating a console window. It is typically used \ - for GUI (graphical user interface) programs like ooDialog programs. This allows the program to run \ - without a secondary console window opening up.$\n$\n\ - Check, or uncheck, the check box to create, or not create, a file association for rexxhide." + /* Controls for Rexx Hide */ + ${NSD_CreateLabel} 0u 0u 100% 8u \ + "rexxhide runs Rexx programs without creating a console window." Pop $Label_One - ${NSD_CreateGroupBox} 0u 56u 100% 84u "File Associations for rexxhide.exe" + ${NSD_CreateGroupBox} 0u 12u 100% 44u "File Association for rexxhide.exe" Pop $0 ; Discarded - ${NSD_CreateCheckBox} 8u 72u 80% 8u "Create rexxhide.exe file association" + ${NSD_CreateCheckBox} 8u 24u 80% 8u "Create rexxhide.exe file association" Pop $Associate_rexxhide_CK ${NSD_SetState} $Associate_rexxhide_CK $Associate_rexxhide_CK_state ; Extension line - ${NSD_CreateLabel} 16u 86u 50u 8u "Extension:" + ${NSD_CreateLabel} 16u 38u 36u 8u "Extension:" Pop $0 ; Discarded - ${NSD_CreateText} 78u 84u 46u 12u $RexxHide_ext_text + ${NSD_CreateText} 52u 36u 46u 12u $RexxHide_ext_text Pop $RexxHide_ext_EDIT ; File type line - ${NSD_CreateLabel} 16u 104u 50u 8u "File type name:" + ${NSD_CreateLabel} 120u 38u 52u 8u "File type name:" Pop $0 ; Discarded - ${NSD_CreateText} 78u 102u 46u 12u $RexxHide_ftype_text + ${NSD_CreateText} 173u 36u 46u 12u $RexxHide_ftype_text Pop $RexxHide_ftype_EDIT - ; Editor line - ${NSD_CreateLabel} 16u 122u 60u 8u "Full path to editor:" + + /* Controls for Rexx Paws */ + ${NSD_CreateLabel} 0u 70u 100% 16u \ + "rexxpaws runs a Rexx programs and 'pauses' until the user hits the Enter key, allowing any output to \ + be read before the console window closes." + + Pop $Label_Two + + ${NSD_CreateGroupBox} 0u 92u 100% 44u "File Association for rexxpaws.exe" Pop $0 ; Discarded - ${NSD_CreateText} 78u 120u 165u 12u $Rexx_editor_text - Pop $RexxHide_editor_EDIT + ${NSD_CreateCheckBox} 8u 104u 80% 8u "Create rexxpaws.exe file association" + Pop $Associate_rexxpaws_CK - ${NSD_CreateButton} 250u 118u 45u 16u "Browse..." - Pop $RexxHide_editor_PB + ${NSD_SetState} $Associate_rexxpaws_CK $Associate_rexxpaws_CK_state - System::Call shlwapi::SHAutoComplete(i$RexxHide_editor_EDIT, i${SHACF_FILESYSTEM}) + ; Extension line + ${NSD_CreateLabel} 16u 118u 36u 8u "Extension:" + Pop $0 ; Discarded - ${if} $Associate_rexxhide_CK_state == ${BST_UNCHECKED} - ${orif} $DoUpgrade == 'true' + ${NSD_CreateText} 52u 116u 46u 12u $RexxPaws_ext_text + Pop $RexxPaws_ext_EDIT + + ; File type line + ${NSD_CreateLabel} 120u 118u 52u 8u "File type name:" + Pop $0 ; Discarded + + ${NSD_CreateText} 173u 116u 46u 12u $RexxPaws_ftype_text + Pop $RexxPaws_ftype_EDIT + + ${if} $DoUpgrade == 'true' + EnableWindow $Associate_rexxhide_CK 0 EnableWindow $RexxHide_ext_EDIT 0 EnableWindow $RexxHide_ftype_EDIT 0 - EnableWindow $RexxHide_editor_EDIT 0 - EnableWindow $RexxHide_editor_PB 0 - ${EndIf} - ${if} $DoUpgrade == 'true' - EnableWindow $Associate_rexxhide_CK 0 + EnableWindow $Associate_rexxpaws_CK 0 + EnableWindow $RexxPaws_ext_EDIT 0 + EnableWindow $RexxPaws_ftype_EDIT 0 + + EnableWindow $Label_One 0 + EnableWindow $Label_Two 0 + Call PageDisableQuit - ${EndIf} + ${else} + ${if} $Associate_rexxhide_CK_state == ${BST_UNCHECKED} + EnableWindow $RexxHide_ext_EDIT 0 + EnableWindow $RexxHide_ftype_EDIT 0 + ${endif} + ${if} $Associate_rexxpaws_CK_state == ${BST_UNCHECKED} + EnableWindow $RexxPaws_ext_EDIT 0 + EnableWindow $RexxPaws_ftype_EDIT 0 + ${endif} + ${endif} + ${NSD_OnClick} $Associate_rexxhide_CK EnableRexxHideAssociation - ${NSD_OnClick} $RexxHide_editor_PB Get_rexx_editor_file + ${NSD_OnClick} $Associate_rexxpaws_CK EnableRexxPawsAssociation nsDialogs::Show FunctionEnd -/** Associate_rexxhide_leave() Call back function. +/** Associate_otherExes_leave() Call back function. * * This function is called when the RexxHide association page is left. We check * that the text fields are 'sane' and return the user to the page if they * are not. If the text field values are good, the state of the dialog contorls * is saved. */ -Function Associate_rexxhide_leave +Function Associate_otherExes_leave + /* Check the Rexx Hide controls */ ${NSD_GetState} $Associate_rexxhide_CK $Associate_rexxhide_CK_state ${if} $Associate_rexxhide_CK_state == ${BST_CHECKED} @@ -1808,134 +1978,7 @@ ${endif} ${endif} - ; Okay text fields are okay. If editor field is blank, it is just not used. - ${NSD_GetText} $RexxHide_ext_EDIT $RexxHide_ext_text - ${NSD_GetText} $RexxHide_ftype_EDIT $RexxHide_ftype_text - ${NSD_GetText} $RexxHide_editor_EDIT $Rexx_editor_text - -FunctionEnd - -/** EnableRexxHideAssociation() - * - * Called when the user clicks on the Create rexxhide.exe file association check - * box. Disables, or enables, the controls depending on if the check box is - * checked or not. - */ -Function EnableRexxHideAssociation - Pop $Associate_rexxhide_CK - ${NSD_GetState} $Associate_rexxhide_CK $0 - - ${If} $0 == 1 - EnableWindow $RexxHide_ext_EDIT 1 - EnableWindow $RexxHide_ftype_EDIT 1 - EnableWindow $RexxHide_editor_EDIT 1 - EnableWindow $RexxHide_editor_PB 1 - ${Else} - EnableWindow $RexxHide_ext_EDIT 0 - EnableWindow $RexxHide_ftype_EDIT 0 - EnableWindow $RexxHide_editor_EDIT 0 - EnableWindow $RexxHide_editor_PB 0 - ${EndIf} -FunctionEnd - -/** Associate_rexxpaws_page() Custom page function. - * - * Shows the options for associating rexxpaws with a file extension. - */ -Function Associate_rexxpaws_page - - ${if} $Use_File_Associations_CK_state == ${BST_UNCHECKED} - Abort - ${endif} - - ${if} $DoUpgrade == 'true' - ${andif} $DoUpgradeQuick == 'true' - Abort - ${endif} - - !insertmacro MUI_HEADER_TEXT \ - "Associate a file extension with rexxpaws.exe" \ - "The default file extension for rexxpaws is $\"${DefRexxPawsExt}$\" with a file type of $\"RexxPaws$\"." - - nsDialogs::Create 1018 - Pop $Dialog - - ${If} $Dialog == error - Abort - ${EndIf} - - ${NSD_OnBack} Associate_rexxpaws_leave - - ${NSD_CreateLabel} 0u 0u 100% 48u \ - "The rexxpaws executable runs Rexx programs by opening up a console window and executing the program. \ - When the program finishes, rexxpaws 'pauses' until the user hits any key. This allows the user to \ - read any output of the to be read before the console window closes.$\n$\n\ - Check, or uncheck, the check box to create, or not create, a file association for rexxpaws." - - Pop $Label_One - - ${NSD_CreateGroupBox} 0u 56u 100% 84u "File Associations for rexxpaws.exe" - Pop $0 ; Discarded - - ${NSD_CreateCheckBox} 8u 72u 80% 8u "Create rexxpaws.exe file association" - Pop $Associate_rexxpaws_CK - - ${NSD_SetState} $Associate_rexxpaws_CK $Associate_rexxpaws_CK_state - - ; Extension line - ${NSD_CreateLabel} 16u 86u 50u 8u "Extension:" - Pop $0 ; Discarded - - ${NSD_CreateText} 78u 84u 46u 12u $RexxPaws_ext_text - Pop $RexxPaws_ext_EDIT - - ; File type line - ${NSD_CreateLabel} 16u 104u 50u 8u "File type name:" - Pop $0 ; Discarded - - ${NSD_CreateText} 78u 102u 46u 12u $RexxPaws_ftype_text - Pop $RexxPaws_ftype_EDIT - - ; Editor line - ${NSD_CreateLabel} 16u 122u 60u 8u "Full path to editor:" - Pop $0 ; Discarded - - ${NSD_CreateText} 78u 120u 165u 12u $Rexx_editor_text - Pop $RexxPaws_editor_EDIT - - ${NSD_CreateButton} 250u 118u 45u 16u "Browse..." - Pop $RexxPaws_editor_PB - - System::Call shlwapi::SHAutoComplete(i$RexxPaws_editor_EDIT, i${SHACF_FILESYSTEM}) - - ${if} $Associate_rexxpaws_CK_state == ${BST_UNCHECKED} - ${orif} $DoUpgrade == 'true' - EnableWindow $RexxPaws_ext_EDIT 0 - EnableWindow $RexxPaws_ftype_EDIT 0 - EnableWindow $RexxPaws_editor_EDIT 0 - EnableWindow $RexxPaws_editor_PB 0 - ${EndIf} - - ${if} $DoUpgrade == 'true' - EnableWindow $Associate_rexxpaws_CK 0 - Call PageDisableQuit - ${EndIf} - - ${NSD_OnClick} $Associate_rexxpaws_CK EnableRexxPawsAssociation - ${NSD_OnClick} $RexxPaws_editor_PB Get_rexx_editor_file - - nsDialogs::Show - -FunctionEnd - -/** Associate_rexxpaws_leave() Call back function - * - * Invoked when the user clicks the Back or Next buttons on the file association - * for rexxpaws page. Checks for correct values in the text fields and saves - * the state of the controls. - */ -Function Associate_rexxpaws_leave - + /* Check the Rexx Paws controls */ ${NSD_GetState} $Associate_rexxpaws_CK $Associate_rexxpaws_CK_state ${if} $Associate_rexxpaws_CK_state == ${BST_CHECKED} @@ -1969,13 +2012,33 @@ ${endif} ${endif} - ; Okay text fields are okay. If editor field is blank, it is just not used. + ; Okay text fields are okay. + ${NSD_GetText} $RexxHide_ext_EDIT $RexxHide_ext_text + ${NSD_GetText} $RexxHide_ftype_EDIT $RexxHide_ftype_text ${NSD_GetText} $RexxPaws_ext_EDIT $RexxPaws_ext_text ${NSD_GetText} $RexxPaws_ftype_EDIT $RexxPaws_ftype_text - ${NSD_GetText} $RexxPaws_editor_EDIT $Rexx_editor_text FunctionEnd +/** EnableRexxHideAssociation() + * + * Called when the user clicks on the Create rexxhide.exe file association check + * box. Disables, or enables, the controls depending on if the check box is + * checked or not. + */ +Function EnableRexxHideAssociation + Pop $Associate_rexxhide_CK + ${NSD_GetState} $Associate_rexxhide_CK $0 + + ${If} $0 == 1 + EnableWindow $RexxHide_ext_EDIT 1 + EnableWindow $RexxHide_ftype_EDIT 1 + ${Else} + EnableWindow $RexxHide_ext_EDIT 0 + EnableWindow $RexxHide_ftype_EDIT 0 + ${endif} +FunctionEnd + /** EnableRexxPawsAssociation() * * Called when the user clicks on the Create rexxpaws.exe file association check @@ -1989,16 +2052,65 @@ ${If} $0 == 1 EnableWindow $RexxPaws_ext_EDIT 1 EnableWindow $RexxPaws_ftype_EDIT 1 - EnableWindow $RexxPaws_editor_EDIT 1 - EnableWindow $RexxPaws_editor_PB 1 ${Else} EnableWindow $RexxPaws_ext_EDIT 0 EnableWindow $RexxPaws_ftype_EDIT 0 - EnableWindow $RexxPaws_editor_EDIT 0 - EnableWindow $RexxPaws_editor_PB 0 - ${EndIf} + ${endif} FunctionEnd +/** Confirm_page() Custom page function. + * + * Gives the user one last chance to go back and change any settings. + * + * The page is skipped if we are doing an upgrade type of install. + */ +Function Confirm_page + + ${if} $DoUpgrade == 'true' + ${andif} $DoUpgradeQuick == 'true' + Abort + ${endif} + + ${if} $DoUpgrade == 'true' + !insertmacro MUI_HEADER_TEXT "${LONGNAME} is ready for installation." \ + "Installation options remain the same for an upgrade type of installation \ + of ${LONGNAME}." + ${else} + !insertmacro MUI_HEADER_TEXT "${LONGNAME} is ready for installation." \ + "All options for ${LONGNAME} have been collected." + ${endif} + + nsDialogs::Create 1018 + Pop $Dialog + + ${If} $Dialog == error + Abort + ${endif} + + ${if} $DoUpgrade == 'true' + ${NSD_CreateLabel} 0u 0u 100% 72u \ + "Click the Install button to begin installation. Click the Back button if you \ + wish to review the installation options. An upgrade type of installation can \ + not be canceled at this point." + ${else} + ${NSD_CreateLabel} 0u 0u 100% 72u \ + "All the parameters needed to install ${LONGNAME} on your system have been \ + gathered to gether.$\n$\n\ + Click the Install button to begin installation. Click the Back button to \ + review or change any settings. Click the Cancel button to abort the installation \ + altogether." + ${endif} + + Pop $Label_One + + ${if} $DoUpgrade == 'true' + Call PageDisableQuit + ${endif} + + nsDialogs::Show + +FunctionEnd + /** PageDisableQuit() * * Prevents the user from closing (quitting) the installer from the current @@ -2044,26 +2156,40 @@ FunctionEnd -/** DoEnvVariables() +/** DoSendToItems() * - * Sets up the variable environemnt variables. + * Create 'Send To' items depending on what the user specified. This is only + * called when we are not doing an upgrade type of install. + * + * Note that we do not add the shortcut files to the uninstall log. Deleting + * the files is done separately from the uninstall log usage because there is + * no (easy) way to tell which file is being deleted when using the uninstall + * log. */ -Function DoEnvVariables +Function DoSendToItems - Push "REXX_HOME" - Push $INSTDIR - Push $IsAdminUser ; "true" or "false" - Call WriteEnvStr + ; Save the user specified settings into the registry variables so the are + ; written to the registry correctly. + StrCpy $RegVal_sendTo_rexx $SendTo_rexx_CK_state + StrCpy $RegVal_sendTo_rexxHide $SendTo_rexxHide_CK_state + StrCpy $RegVal_sendTo_rexxPaws $SendTo_rexxPaws_CK_state - ; Add the install directory to the PATH env variable, either system wide or - ; user-specific - Push $INSTDIR - Push $IsAdminUser ; "true" or "false" - Push "PATH" - Call AddToPath + SetOutPath $INSTDIR + ${if} $SendTo_rexx_CK_state == ${BST_CHECKED} + CreateShortCut "$SENDTO\ooRexx.lnk" "$INSTDIR\rexx.exe" "" "" "" SW_SHOWNORMAL "" "ooRexx" + DetailPrint "Created Send To rexx.exe item" + ${endif} - ; Do the PATHEXT extensions - Call AddToPathExt + ${if} $SendTo_rexxHide_CK_state == ${BST_CHECKED} + CreateShortCut "$SENDTO\ooRexx with no console (rexxhide).lnk" "$INSTDIR\rexxhide.exe" "" "" "" SW_SHOWNORMAL "" "ooRexx with no console (rexxhide)" + DetailPrint "Created Send To rexxhide.exe item" + ${endif} + + ${if} $SendTo_rexxPaws_CK_state == ${BST_CHECKED} + CreateShortCut "$SENDTO\ooRexx with pause (rexxpaws).lnk" "$INSTDIR\rexxpaws.exe" "" "" "" SW_SHOWNORMAL "" "ooRexx with pause (rexxpaws)" + DetailPrint "Created Send To rexxpaws.exe item" + ${endif} + FunctionEnd /** DoFileAssociations() @@ -2119,6 +2245,28 @@ System::Call 'Shell32::SHChangeNotify(i ${SHCNE_ASSOCCHANGED}, i ${SHCNF_IDLIST}, i 0, i 0)' FunctionEnd +/** DoEnvVariables() + * + * Sets up the variable environemnt variables. + */ +Function DoEnvVariables + + Push "REXX_HOME" + Push $INSTDIR + Push $IsAdminUser ; "true" or "false" + Call WriteEnvStr + + ; Add the install directory to the PATH env variable, either system wide or + ; user-specific + Push $INSTDIR + Push $IsAdminUser ; "true" or "false" + Push "PATH" + Call AddToPath + + ; Do the PATHEXT extensions + Call AddToPathExt +FunctionEnd + /** AssociateExtensionWithExe() * * Associates a file extension and file type with one of the ooRexx executables, @@ -2221,16 +2369,16 @@ StrCpy $Associate_rexx_CK_state '${BST_CHECKED}' StrCpy $Rexx_ext_text ${DefRexxExt} - StrCpy $Rexx_ftype_text "RexxScript" + StrCpy $Rexx_ftype_text ${DefRexxFType} StrCpy $Rexx_editor_text "C:\Windows\System32\NotePad.exe" StrCpy $Associate_rexxhide_CK_state '${BST_CHECKED}' StrCpy $RexxHide_ext_text ${DefRexxHideExt} - StrCpy $RexxHide_ftype_text "RexxHide" + StrCpy $RexxHide_ftype_text ${DefRexxHideFType} StrCpy $Associate_rexxpaws_CK_state '${BST_CHECKED}' StrCpy $RexxPaws_ext_text ${DefRexxPawsExt} - StrCpy $RexxPaws_ftype_text "RexxPaws" + StrCpy $RexxPaws_ftype_text ${DefRexxPawsFType} FunctionEnd @@ -2320,6 +2468,28 @@ FunctionEnd +/** SetSendToVars() + * + * Sets the values of the SendTo check box states on start up. Either to the + * defaults if there is no previous installation or a pre-4.1.0 installation. + * Otherwise, the variables are set to what we read out of the registry. + */ +Function SetSendToVars + + ${if} $PreviousVersionInstalled == 'false' + ${orif} $UpgradeTypeAvailable == 'false' + ${orif} $RegVal_sendTo_rexx == '' + StrCpy $SendTo_rexx_CK_state ${BST_UNCHECKED} + StrCpy $SendTo_rexxHide_CK_state ${BST_CHECKED} + StrCpy $SendTo_rexxPaws_CK_state ${BST_CHECKED} + ${else} + StrCpy $SendTo_rexx_CK_state $RegVal_sendTo_rexx + StrCpy $SendTo_rexxHide_CK_state $RegVal_sendTo_rexxHide + StrCpy $SendTo_rexxPaws_CK_state $RegVal_sendTo_rexxPaws + ${endif} + +FunctionEnd + /** CheckInstalledStatus() * * Helper function used to determine if there is a previous version of ooRexx @@ -2630,7 +2800,7 @@ StrCpy $DeleteWholeTree 'false' - /* StrCpy $DeleteWholeTree 'true' ; TEMP TEMP TEMP always del tree while testing MM */ + StrCpy $DeleteWholeTree 'true' ; TEMP TEMP TEMP always del tree while testing MM */ ; UnInstall as All Users if an admin Call un.IsUserAdmin @@ -2664,13 +2834,13 @@ StrCpy $InStopRxapiPage 'true' - !insertmacro MUI_HEADER_TEXT "The ooRexx rxapi process" "The ${LONGNAME} memory manager (rxapi) is currently running" + !insertmacro MUI_HEADER_TEXT "The ooRexx rxapi process." "The ${LONGNAME} memory manager (rxapi) is currently running" nsDialogs::Create /NOUNLOAD 1018 Pop $Dialog ${If} $Dialog == error Abort - ${EndIf} + ${endif} ${NSD_CreateLabel} 0 0 100% 104u \ "${SHORTNAME} can not be completely uninstalled while rxapi is running.$\n$\n\ @@ -2763,7 +2933,7 @@ ${if} $LogFileExists == 'false' !insertmacro MUI_HEADER_TEXT \ - "${UninstLog} NOT found" \ + "${UninstLog} NOT found." \ "The option of only removing files installed by the prior ooRexx installer is not available." StrCpy $0 \ @@ -2776,7 +2946,7 @@ program." ${else} !insertmacro MUI_HEADER_TEXT \ - "Choose the method for removing installed files" \ + "Choose the method for removing installed files." \ "Delete only installed files or delete entire directory tree?" StrCpy $0 \ @@ -2804,7 +2974,7 @@ ${If} $Dialog == error Abort - ${EndIf} + ${endif} ${if} $LogFileExists == 'false' ${NSD_CreateLabel} 0 0 100% 80u $0 @@ -2892,12 +3062,6 @@ DetailPrint "Removing all Start Menu short cuts by removing the $SMPROGRAMS\${LONGNAME} folder" RMDir /r "$SMPROGRAMS\${LONGNAME}" - /* Remove the send to entries unless we are doing an updgrade type. */ - ${if} $DoUpgrade == 'true' - Return - ${endif} - Delete "$SENDTO\ooRexx with pause (rexxpaws).lnk" - Delete "$SENDTO\ooRexx with no console (rexxhide).lnk" ${else} DetailPrint "Uninstall files using the install log file" Push $R0 @@ -2933,6 +3097,7 @@ Goto LoopRead LoopDone: FileClose $UninstLog + Delete "$INSTDIR\${UninstLog}" RMDir "$INSTDIR" Pop $R2 @@ -2940,6 +3105,21 @@ Pop $R0 ${endif} + /* + * Remove the send to entries unless we are doing an updgrade type. These + * entries are not put into the uninstall log. We simply deleted them if we + * are not doing an upgrade and leave them alone if we are doing an upgrade. + * + * If they do not exist, deleting them does not harm, i.e., there is no + * warning or error rasised. + */ + ${if} $DoUpgrade == 'false' + Delete "$SENDTO\ooRexx.lnk" + Delete "$SENDTO\ooRexx with pause (rexxpaws).lnk" + Delete "$SENDTO\ooRexx with no console (rexxhide).lnk" + DetailPrint "Removed 'Send To' items (if any.)" + ${endif} + FunctionEnd /** un.InstallRxapiService() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mie...@us...> - 2010-10-19 15:45:21
|
Revision: 6306 http://oorexx.svn.sourceforge.net/oorexx/?rev=6306&view=rev Author: miesfeld Date: 2010-10-19 15:45:15 +0000 (Tue, 19 Oct 2010) Log Message: ----------- When creating ftypes during the Windows install, make the default to not create file types for rexxhide and rexxpaws. Modified Paths: -------------- main/trunk/platform/windows/install/oorexx.nsi Modified: main/trunk/platform/windows/install/oorexx.nsi =================================================================== --- main/trunk/platform/windows/install/oorexx.nsi 2010-10-19 14:18:04 UTC (rev 6305) +++ main/trunk/platform/windows/install/oorexx.nsi 2010-10-19 15:45:15 UTC (rev 6306) @@ -2376,13 +2376,13 @@ StrCpy $Associate_rexx_CK_state '${BST_CHECKED}' StrCpy $Rexx_ext_text ${DefRexxExt} StrCpy $Rexx_ftype_text ${DefRexxFType} - StrCpy $Rexx_editor_text "C:\Windows\System32\NotePad.exe" + StrCpy $Rexx_editor_text "$WINDIR\System32\NotePad.exe" - StrCpy $Associate_rexxhide_CK_state '${BST_CHECKED}' + StrCpy $Associate_rexxhide_CK_state '${BST_UNCHECKED}' StrCpy $RexxHide_ext_text ${DefRexxHideExt} StrCpy $RexxHide_ftype_text ${DefRexxHideFType} - StrCpy $Associate_rexxpaws_CK_state '${BST_CHECKED}' + StrCpy $Associate_rexxpaws_CK_state '${BST_UNCHECKED}' StrCpy $RexxPaws_ext_text ${DefRexxPawsExt} StrCpy $RexxPaws_ftype_text ${DefRexxPawsFType} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mie...@us...> - 2010-10-30 20:52:00
|
Revision: 6329 http://oorexx.svn.sourceforge.net/oorexx/?rev=6329&view=rev Author: miesfeld Date: 2010-10-30 20:51:54 +0000 (Sat, 30 Oct 2010) Log Message: ----------- Fix typo in the Windows installer Modified Paths: -------------- main/trunk/platform/windows/install/oorexx.nsi Modified: main/trunk/platform/windows/install/oorexx.nsi =================================================================== --- main/trunk/platform/windows/install/oorexx.nsi 2010-10-30 20:36:44 UTC (rev 6328) +++ main/trunk/platform/windows/install/oorexx.nsi 2010-10-30 20:51:54 UTC (rev 6329) @@ -2101,7 +2101,7 @@ ${else} ${NSD_CreateLabel} 0u 0u 100% 72u \ "All the parameters needed to install ${LONGNAME} on your system have been \ - gathered to gether.$\n$\n\ + gathered together.$\n$\n\ Click the Install button to begin installation. Click the Back button to \ review or change any settings. Click the Cancel button to abort the installation \ altogether." This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mie...@us...> - 2010-11-07 18:28:27
|
Revision: 6364 http://oorexx.svn.sourceforge.net/oorexx/?rev=6364&view=rev Author: miesfeld Date: 2010-11-07 18:28:21 +0000 (Sun, 07 Nov 2010) Log Message: ----------- Fix logic error in Windows installer Modified Paths: -------------- main/trunk/platform/windows/install/oorexx.nsi Modified: main/trunk/platform/windows/install/oorexx.nsi =================================================================== --- main/trunk/platform/windows/install/oorexx.nsi 2010-11-07 02:57:31 UTC (rev 6363) +++ main/trunk/platform/windows/install/oorexx.nsi 2010-11-07 18:28:21 UTC (rev 6364) @@ -2256,7 +2256,7 @@ Call AssociateExtensionWithExe ${endif} - ${if} $Associate_rexxpaws_CK_state = ${BST_CHECKED} + ${if} $Associate_rexxpaws_CK_state == ${BST_CHECKED} StrCpy $AssociationProgramName 'rexxpaws.exe' StrCpy $RegVal_rexxPawsAssociation '$RexxPaws_ext_text $RexxPaws_ftype_text' StrCpy $RegVal_rexxEditor '$Rexx_editor_text' @@ -2457,6 +2457,7 @@ ; We will put the file extension in $0 and the ftype in $1 StrCpy $Use_File_Associations_CK_state '${BST_CHECKED}' + StrCpy $Rexx_editor_text "$RegVal_rexxEditor" ${if} $RegVal_rexxAssociation != '' ${StrTok} $0 $RegVal_rexxAssociation " " "0" "0" @@ -2465,7 +2466,8 @@ StrCpy $Associate_rexx_CK_state '${BST_CHECKED}' StrCpy $Rexx_ext_text $0 StrCpy $Rexx_ftype_text $1 - StrCpy $Rexx_editor_text "$RegVal_rexxEditor" + ${else} + StrCpy $Associate_rexx_CK_state '${BST_UNCHECKED}' ${endif} ${if} $RegVal_rexxHideAssociation != '' @@ -2475,6 +2477,8 @@ StrCpy $Associate_rexxhide_CK_state '${BST_CHECKED}' StrCpy $RexxHide_ext_text $0 StrCpy $RexxHide_ftype_text $1 + ${else} + StrCpy $Associate_rexxhide_CK_state '${BST_UNCHECKED}' ${endif} ${if} $RegVal_rexxPawsAssociation != '' @@ -2484,6 +2488,8 @@ StrCpy $Associate_rexxpaws_CK_state '${BST_CHECKED}' StrCpy $RexxPaws_ext_text $0 StrCpy $RexxPaws_ftype_text $1 + ${else} + StrCpy $Associate_rexxpaws_CK_state '${BST_UNCHECKED}' ${endif} ${endif} ${endif} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mie...@us...> - 2011-07-24 04:26:31
|
Revision: 7073 http://oorexx.svn.sourceforge.net/oorexx/?rev=7073&view=rev Author: miesfeld Date: 2011-07-24 04:26:25 +0000 (Sun, 24 Jul 2011) Log Message: ----------- ooDialog - fix installation error with the sysInfo example Modified Paths: -------------- main/trunk/platform/windows/install/oorexx.nsi Modified: main/trunk/platform/windows/install/oorexx.nsi =================================================================== --- main/trunk/platform/windows/install/oorexx.nsi 2011-07-24 04:25:07 UTC (rev 7072) +++ main/trunk/platform/windows/install/oorexx.nsi 2011-07-24 04:26:25 UTC (rev 7073) @@ -587,9 +587,9 @@ ; Set output path to the installation directory. ${SetOutPath} $INSTDIR\samples\oodialog\sysinfo ; Distribution files... - ${File} "${SRCDIR}\samples\windows\oodialog\sysinfo\" "*.rex" - ${File} "${SRCDIR}\samples\windows\oodialog\sysinfo\" "*.rc" - ${File} "${SRCDIR}\samples\windows\oodialog\sysinfo\" "*.h" + ${File} "${SRCDIR}\samples\windows\oodialog\sysinfo\" "sysInfo.rex" + ${File} "${SRCDIR}\samples\windows\oodialog\sysinfo\" "sysInfo.rc" + ${File} "${SRCDIR}\samples\windows\oodialog\sysinfo\" "sysInfo.h" ; Set output path to the installation directory. ${SetOutPath} $INSTDIR\samples\oodialog\source ; Distribution files... This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mie...@us...> - 2012-05-26 21:07:55
|
Revision: 7799 http://oorexx.svn.sourceforge.net/oorexx/?rev=7799&view=rev Author: miesfeld Date: 2012-05-26 21:07:49 +0000 (Sat, 26 May 2012) Log Message: ----------- Fix spelling error brought up in bug 3529234 Modified Paths: -------------- main/trunk/platform/windows/install/oorexx.nsi Modified: main/trunk/platform/windows/install/oorexx.nsi =================================================================== --- main/trunk/platform/windows/install/oorexx.nsi 2012-05-20 22:30:37 UTC (rev 7798) +++ main/trunk/platform/windows/install/oorexx.nsi 2012-05-26 21:07:49 UTC (rev 7799) @@ -2590,17 +2590,17 @@ ${if} $AssociationProgramName == 'rexx.exe' ${StrTok} $0 $RegVal_rexxAssociation " " "0" "0" ${StrTok} $1 $RegVal_rexxAssociation " " "1" "0" - StrCpy $AssociationText "ooRexx Rexx Progam" + StrCpy $AssociationText "ooRexx Rexx Program" StrCpy $AssociationEditor '$RegVal_rexxEditor' ${elseif} $AssociationProgramName == 'rexxhide.exe' ${StrTok} $0 $RegVal_rexxHideAssociation " " "0" "0" ${StrTok} $1 $RegVal_rexxHideAssociation " " "1" "0" - StrCpy $AssociationText "ooRexx Rexx GUI Progam" + StrCpy $AssociationText "ooRexx Rexx GUI Program" StrCpy $AssociationEditor '$RegVal_rexxEditor' ${elseif} $AssociationProgramName == 'rexxpaws.exe' ${StrTok} $0 $RegVal_rexxPawsAssociation " " "0" "0" ${StrTok} $1 $RegVal_rexxPawsAssociation " " "1" "0" - StrCpy $AssociationText "ooRexx Rexx pausing Progam" + StrCpy $AssociationText "ooRexx Rexx pausing Program" StrCpy $AssociationEditor "$RegVal_rexxEditor" ${else} DetailPrint "Unrecoverable ERROR. The ftype association executable: $AssociationProgramName is not recognized." This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mie...@us...> - 2012-05-26 23:39:22
|
Revision: 7801 http://oorexx.svn.sourceforge.net/oorexx/?rev=7801&view=rev Author: miesfeld Date: 2012-05-26 23:39:15 +0000 (Sat, 26 May 2012) Log Message: ----------- 3529234 Win32 installer for 4.1.1 broken Add descriptive text in lables for file type saying "no spaces" Add functions in installer to check for spaces, and return user to page if there are spaces. Capitalize the extensions when adding them to PATHEXT to match what other programs do. Modified Paths: -------------- main/trunk/platform/windows/install/oorexx.nsi Modified: main/trunk/platform/windows/install/oorexx.nsi =================================================================== --- main/trunk/platform/windows/install/oorexx.nsi 2012-05-26 21:11:27 UTC (rev 7800) +++ main/trunk/platform/windows/install/oorexx.nsi 2012-05-26 23:39:15 UTC (rev 7801) @@ -43,6 +43,7 @@ ; Docs for the string functions say they need to be declared before use: ${StrTok} +${StrCase} ${UnStrTok} !define MUI_ICON "${SRCDIR}\platform\windows\rexx.ico" @@ -1877,7 +1878,7 @@ Rexx executables will execute your program.$\n$\n\ Rather than create a file association for rexxhide.exe and rexxpaws.exe you may wish to create a \ 'Send To' item for those executables. Or create both a file association and 'Send To' items for \ - those executabls. Usually a file association is created for rexx.exe and not a 'Send To' item." + those executables. Usually a file association is created for rexx.exe and not a 'Send To' item." Pop $Label_One @@ -1989,17 +1990,17 @@ ${NSD_SetState} $Associate_rexx_CK $Associate_rexx_CK_state ; Extension line - ${NSD_CreateLabel} 16u 116u 36u 8u "Extension:" + ${NSD_CreateLabel} 16u 116u 75u 8u "Extension (no spaces):" Pop $0 ; Discarded - ${NSD_CreateText} 52u 114u 46u 12u $Rexx_ext_text + ${NSD_CreateText} 91u 114u 36u 12u $Rexx_ext_text Pop $Rexx_ext_EDIT ; File type line - ${NSD_CreateLabel} 120u 116u 52u 8u "File type name:" + ${NSD_CreateLabel} 137u 116u 90u 8u "File type name (no spaces):" Pop $0 ; Discarded - ${NSD_CreateText} 173u 114u 46u 12u $Rexx_ftype_text + ${NSD_CreateText} 228u 114u 46u 12u $Rexx_ftype_text Pop $Rexx_ftype_EDIT ${NSD_SetState} $Associate_rexx_CK $Associate_rexx_CK_state @@ -2066,8 +2067,32 @@ SendMessage $Dialog ${WM_NEXTDLGCTL} $Rexx_ext_EDIT 1 Abort ${endif} + + ; Check that the user did not include any spaces in either field. If so abort + push $0 + call CheckForSpaces + pop $2 + push $1 + call CheckForSpaces + pop $3 + + ${if} $2 > 0 + ${orif} $3 > 0 + MessageBox MB_OK|MB_ICONEXCLAMATION \ + "Neither the file extension field nor the file$\n\ + type name field can contain a space." + + ${if} $2 > 0 + SendMessage $Dialog ${WM_NEXTDLGCTL} $Rexx_ext_EDIT 1 + ${else} + SendMessage $Dialog ${WM_NEXTDLGCTL} $Rexx_ftype_EDIT 1 + ${endif} + Abort + ${endif} + ${endif} + ; Okay text fields are okay. If editor field is blank, it is just not used. ${NSD_GetText} $Rexx_ext_EDIT $Rexx_ext_text ${NSD_GetText} $Rexx_ftype_EDIT $Rexx_ftype_text @@ -2162,17 +2187,17 @@ ${NSD_SetState} $Associate_rexxhide_CK $Associate_rexxhide_CK_state ; Extension line - ${NSD_CreateLabel} 16u 38u 36u 8u "Extension:" + ${NSD_CreateLabel} 16u 38u 75u 8u "Extension (no spaces):" Pop $0 ; Discarded - ${NSD_CreateText} 52u 36u 46u 12u $RexxHide_ext_text + ${NSD_CreateText} 91u 36u 36u 12u $RexxHide_ext_text Pop $RexxHide_ext_EDIT ; File type line - ${NSD_CreateLabel} 120u 38u 52u 8u "File type name:" + ${NSD_CreateLabel} 137u 38u 90u 8u "File type name (no spaces):" Pop $0 ; Discarded - ${NSD_CreateText} 173u 36u 46u 12u $RexxHide_ftype_text + ${NSD_CreateText} 228u 36u 46u 12u $RexxHide_ftype_text Pop $RexxHide_ftype_EDIT @@ -2192,17 +2217,17 @@ ${NSD_SetState} $Associate_rexxpaws_CK $Associate_rexxpaws_CK_state ; Extension line - ${NSD_CreateLabel} 16u 118u 36u 8u "Extension:" + ${NSD_CreateLabel} 16u 118u 75u 8u "Extension (no spaces):" Pop $0 ; Discarded - ${NSD_CreateText} 52u 116u 46u 12u $RexxPaws_ext_text + ${NSD_CreateText} 91u 116u 36u 12u $RexxPaws_ext_text Pop $RexxPaws_ext_EDIT ; File type line - ${NSD_CreateLabel} 120u 118u 52u 8u "File type name:" + ${NSD_CreateLabel} 137u 118u 90u 8u "File type name (no spaces):" Pop $0 ; Discarded - ${NSD_CreateText} 173u 116u 46u 12u $RexxPaws_ftype_text + ${NSD_CreateText} 228u 116u 46u 12u $RexxPaws_ftype_text Pop $RexxPaws_ftype_EDIT ${if} $DoUpgrade == 'true' @@ -2278,6 +2303,30 @@ SendMessage $Dialog ${WM_NEXTDLGCTL} $RexxHide_ext_EDIT 1 Abort ${endif} + + ; Check that the user did not include any spaces in either field. If so abort + push $0 + call CheckForSpaces + pop $2 + push $1 + call CheckForSpaces + pop $3 + + ${if} $2 > 0 + ${orif} $3 > 0 + MessageBox MB_OK|MB_ICONEXCLAMATION \ + "Neither the file extension field nor the file$\n\ + type name field can contain a space." + + ${if} $2 > 0 + SendMessage $Dialog ${WM_NEXTDLGCTL} $RexxHide_ext_EDIT 1 + ${else} + SendMessage $Dialog ${WM_NEXTDLGCTL} $RexxHide_ftype_EDIT 1 + ${endif} + Abort + ${endif} + + ${endif} /* Check the Rexx Paws controls */ @@ -2312,6 +2361,29 @@ SendMessage $Dialog ${WM_NEXTDLGCTL} $RexxPaws_ext_EDIT 1 Abort ${endif} + + ; Check that the user did not include any spaces in either field. If so abort + push $0 + call CheckForSpaces + pop $2 + push $1 + call CheckForSpaces + pop $3 + + ${if} $2 > 0 + ${orif} $3 > 0 + MessageBox MB_OK|MB_ICONEXCLAMATION \ + "Neither the file extension field nor the file$\n\ + type name field can contain a space." + + ${if} $2 > 0 + SendMessage $Dialog ${WM_NEXTDLGCTL} $RexxPaws_ext_EDIT 1 + ${else} + SendMessage $Dialog ${WM_NEXTDLGCTL} $RexxPaws_ftype_EDIT 1 + ${endif} + Abort + ${endif} + ${endif} ; Okay text fields are okay. @@ -2828,12 +2900,56 @@ FunctionEnd + +/** CheckForSpaces() + * + * This function checks for spaces in a string. It is taken from the NSIS + * examples provided on the NSIS site. + * + * It should be used this way: + * + * push <str> + * call CheckForSpaces + * pop $R0 + * + * $R0 will contain the number of spaces. When using the LogicLib, a check like + * this can be done + * + * ${if} $R0 > 0 + * <do something> + * ${endif} + * + */ +Function CheckForSpaces + Exch $R0 + Push $R1 + Push $R2 + Push $R3 + + StrCpy $R1 -1 + StrCpy $R3 $R0 + StrCpy $R0 0 + loop: + StrCpy $R2 $R3 1 $R1 + IntOp $R1 $R1 - 1 + StrCmp $R2 "" done + StrCmp $R2 " " 0 loop + IntOp $R0 $R0 + 1 + Goto loop + done: + + Pop $R3 + Pop $R2 + Pop $R1 + Exch $R0 +FunctionEnd + /** AddToPathExt() * * Adds the file extension(s) associated with the ooRexx executables to PATHEXT. * - * Right now the user can not specifies these, but a future enhancement will add - * that feature. + * We upper case the extension so that it matches what is commonly seen on + * Windows. * * @notes - This could be done for a single-user install, but remember that * the user specific PATHEXT *replaces* the system wide PATHEXT, so @@ -2847,22 +2963,25 @@ ${endif} ${StrTok} $0 $RegVal_rexxAssociation " " "0" "0" - DetailPrint "Adding the $0 extension to PATHEXT" - Push $0 + ${StrCase} $1 $0 "U" + DetailPrint "Adding the $1 extension to PATHEXT" + Push $1 Push $IsAdminUser ; should only be "true" at this point Push "PATHEXT" Call AddToPath ${StrTok} $0 $RegVal_rexxHideAssociation " " "0" "0" - DetailPrint "Adding the $0 extension to PATHEXT" - Push $0 + ${StrCase} $1 $0 "U" + DetailPrint "Adding the $1 extension to PATHEXT" + Push $1 Push $IsAdminUser ; should only be "true" at this point Push "PATHEXT" Call AddToPath ${StrTok} $0 $RegVal_rexxPawsAssociation " " "0" "0" - DetailPrint "Adding the $0 extension to PATHEXT" - Push $0 + ${StrCase} $1 $0 "U" + DetailPrint "Adding the $1 extension to PATHEXT" + Push $1 Push $IsAdminUser ; should only be "true" at this point Push "PATHEXT" Call AddToPath This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mie...@us...> - 2012-05-27 00:43:30
|
Revision: 7803 http://oorexx.svn.sourceforge.net/oorexx/?rev=7803&view=rev Author: miesfeld Date: 2012-05-27 00:43:24 +0000 (Sun, 27 May 2012) Log Message: ----------- 3529261 Win32 V4-1-1 uninstaller issues Give more space to the label to acount for very long path names. But, if the user installs ooRexx into a very very deep directory the label, the warning text will be clipped. There is nothing to do about that, the installer only has so much space on a page. Normally people do not install into a directory nearly as deep as the user that opened the bug. Modified Paths: -------------- main/trunk/platform/windows/install/oorexx.nsi Modified: main/trunk/platform/windows/install/oorexx.nsi =================================================================== --- main/trunk/platform/windows/install/oorexx.nsi 2012-05-26 23:43:50 UTC (rev 7802) +++ main/trunk/platform/windows/install/oorexx.nsi 2012-05-27 00:43:24 UTC (rev 7803) @@ -3412,13 +3412,13 @@ ${NSD_Check} $Delete_ooRexx_Tree_CK EnableWindow $Delete_ooRexx_Tree_CK 0 ${else} - ${NSD_CreateLabel} 0 0 100% 64u $0 + ${NSD_CreateLabel} 0 0 100% 80u $0 Pop $Label_One - ${NSD_CreateLabel} 0 80u 100% 16u "To DELETE the entire $INSTDIR directory tree, check the check box." + ${NSD_CreateLabel} 0 100u 100% 16u "To DELETE the entire $INSTDIR directory tree, check the check box." Pop $Label_Two - ${NSD_CreateCheckBox} 0 100u 100% 8u "Delete entire directory tree" + ${NSD_CreateCheckBox} 0 120u 100% 8u "Delete entire directory tree" Pop $Delete_ooRexx_Tree_CK ${endif} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mie...@us...> - 2012-07-17 04:48:25
|
Revision: 8096 http://oorexx.svn.sourceforge.net/oorexx/?rev=8096&view=rev Author: miesfeld Date: 2012-07-17 04:48:19 +0000 (Tue, 17 Jul 2012) Log Message: ----------- Fix the name of the link to the ooDialog doc in trunk Modified Paths: -------------- main/trunk/platform/windows/install/oorexx.nsi Modified: main/trunk/platform/windows/install/oorexx.nsi =================================================================== --- main/trunk/platform/windows/install/oorexx.nsi 2012-07-17 04:45:07 UTC (rev 8095) +++ main/trunk/platform/windows/install/oorexx.nsi 2012-07-17 04:48:19 UTC (rev 8096) @@ -1049,10 +1049,10 @@ ${AddItem} "$SMPROGRAMS\${LONGNAME}\Documentation\ooRexx TCP-IP Sockets Functions Reference.lnk" CreateShortCut "$SMPROGRAMS\${LONGNAME}\Documentation\ooRexx rxFTP Class Reference.lnk" "$INSTDIR\doc\rxftp.pdf" "" "$INSTDIR\doc\rxftp.pdf" 0 ${AddItem} "$SMPROGRAMS\${LONGNAME}\Documentation\ooRexx rxFTP Class Reference.lnk" - CreateShortCut "$SMPROGRAMS\${LONGNAME}\Documentation\ooRexx ooDialog Method Reference.lnk" "$INSTDIR\doc\oodialog.pdf" "" "$INSTDIR\doc\oodialog.pdf" 0 - ${AddItem} "$SMPROGRAMS\${LONGNAME}\Documentation\ooRexx ooDialog Method Reference.lnk" - CreateShortCut "$SMPROGRAMS\${LONGNAME}\Documentation\ooRexx ooDialog User Guide.lnk" "$INSTDIR\doc\oodguide.pdf" "" "$INSTDIR\doc\oodguide.pdf" 0 - ${AddItem} "$SMPROGRAMS\${LONGNAME}\Documentation\ooRexx ooDialog User Guide.lnk" + CreateShortCut "$SMPROGRAMS\${LONGNAME}\Documentation\ooDialog Reference.lnk" "$INSTDIR\doc\oodialog.pdf" "" "$INSTDIR\doc\oodialog.pdf" 0 + ${AddItem} "$SMPROGRAMS\${LONGNAME}\Documentation\ooDialog Reference.lnk" + CreateShortCut "$SMPROGRAMS\${LONGNAME}\Documentation\ooDialog User Guide.lnk" "$INSTDIR\doc\oodguide.pdf" "" "$INSTDIR\doc\oodguide.pdf" 0 + ${AddItem} "$SMPROGRAMS\${LONGNAME}\Documentation\ooDialog User Guide.lnk" CreateShortCut "$SMPROGRAMS\${LONGNAME}\Documentation\ooRexx Rexx Extensions Reference.lnk" "$INSTDIR\doc\rexxextensions.pdf" "" "$INSTDIR\doc\rexxextensions.pdf" 0 ${AddItem} "$SMPROGRAMS\${LONGNAME}\Documentation\ooRexx Windows Extensions Reference.lnk" CreateShortCut "$SMPROGRAMS\${LONGNAME}\Documentation\ooRexx Unix Extensions Reference.lnk" "$INSTDIR\doc\unixextensions.pdf" "" "$INSTDIR\doc\unixextensions.pdf" 0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |