Update of /cvsroot/popfile/windows
In directory sc8-pr-cvs1:/tmp/cvs-serv18214
Modified Files:
installer.nsi
Log Message:
Replace hard-coded Registry and Start Menu entries by references to the MUI_PRODUCT define.
Index: installer.nsi
===================================================================
RCS file: /cvsroot/popfile/windows/installer.nsi,v
retrieving revision 1.101
retrieving revision 1.102
diff -C2 -d -r1.101 -r1.102
*** installer.nsi 6 Aug 2003 21:45:41 -0000 1.101
--- installer.nsi 7 Aug 2003 11:22:38 -0000 1.102
***************
*** 96,100 ****
--- 96,102 ----
#--------------------------------------------------------------------------
+ ;--------------------------------------------------------------------------
; POPFile constants have been given names beginning with 'C_' (eg C_README)
+ ;--------------------------------------------------------------------------
!define MUI_PRODUCT "POPFile"
***************
*** 163,167 ****
VIProductVersion "0.20.0.0"
! VIAddVersionKey "ProductName" "POPFile"
VIAddVersionKey "Comments" "POPFile Homepage: http://popfile.sourceforge.net"
VIAddVersionKey "CompanyName" "POPFile Team"
--- 165,169 ----
VIProductVersion "0.20.0.0"
! VIAddVersionKey "ProductName" "${MUI_PRODUCT}"
VIAddVersionKey "Comments" "POPFile Homepage: http://popfile.sourceforge.net"
VIAddVersionKey "CompanyName" "POPFile Team"
***************
*** 280,284 ****
; The 'hdr-common.bmp' icon is only 90 x 57 pixels, much smaller than the 150 x 57 pixel
; space provided by the default 'modern_headerbmpr.exe' UI, so we use a custom UI which
! ; leaves more room for the TITLE and SUB-TITLE text.
!define MUI_UI_HEADERBITMAP_RIGHT "UI\pfi_headerbmpr.exe"
--- 282,286 ----
; The 'hdr-common.bmp' icon is only 90 x 57 pixels, much smaller than the 150 x 57 pixel
; space provided by the default 'modern_headerbmpr.exe' UI, so we use a custom UI which
! ; leaves more room for the TITLE and SUBTITLE text.
!define MUI_UI_HEADERBITMAP_RIGHT "UI\pfi_headerbmpr.exe"
***************
*** 357,361 ****
!define MUI_LANGDLL_REGISTRY_ROOT "HKLM"
! !define MUI_LANGDLL_REGISTRY_KEY "SOFTWARE\POPFile"
!define MUI_LANGDLL_REGISTRY_VALUENAME "Installer Language"
--- 359,363 ----
!define MUI_LANGDLL_REGISTRY_ROOT "HKLM"
! !define MUI_LANGDLL_REGISTRY_KEY "SOFTWARE\${MUI_PRODUCT}"
!define MUI_LANGDLL_REGISTRY_VALUENAME "Installer Language"
***************
*** 419,423 ****
InstallDir "$PROGRAMFILES\${MUI_PRODUCT}"
! InstallDirRegKey HKLM SOFTWARE\POPFile InstallLocation
#--------------------------------------------------------------------------
--- 421,425 ----
InstallDir "$PROGRAMFILES\${MUI_PRODUCT}"
! InstallDirRegKey HKLM "SOFTWARE\${MUI_PRODUCT}" InstallLocation
#--------------------------------------------------------------------------
***************
*** 520,524 ****
!insertmacro MUI_INSTALLOPTIONS_READ ${G_STARTUP} "ioA.ini" "Field 5" "State"
! WriteRegStr HKLM SOFTWARE\POPFile InstallLocation $INSTDIR
; Install the POPFile Core files
--- 522,526 ----
!insertmacro MUI_INSTALLOPTIONS_READ ${G_STARTUP} "ioA.ini" "Field 5" "State"
! WriteRegStr HKLM "SOFTWARE\${MUI_PRODUCT}" InstallLocation $INSTDIR
; Install the POPFile Core files
***************
*** 717,742 ****
; ('SetOutPath' is one way to change the value of $OUTDIR)
! SetOutPath $SMPROGRAMS\POPFile
SetOutPath $INSTDIR
! CreateShortCut "$SMPROGRAMS\POPFile\Run POPFile.lnk" \
"$INSTDIR\perl.exe" popfile.pl \
"$INSTDIR\Platform\POPFileIcon.dll"
! CreateShortCut "$SMPROGRAMS\POPFile\Run POPFile in background.lnk" \
"$INSTDIR\wperl.exe" popfile.pl \
"$INSTDIR\Platform\POPFileIcon.dll"
! CreateShortCut "$SMPROGRAMS\POPFile\Uninstall POPFile.lnk" \
"$INSTDIR\uninstall.exe"
! SetOutPath $SMPROGRAMS\POPFile
! WriteINIStr "$SMPROGRAMS\POPFile\POPFile User Interface.url" \
"InternetShortcut" "URL" "http://127.0.0.1:${G_GUI}/"
! WriteINIStr "$SMPROGRAMS\POPFile\Shutdown POPFile.url" \
"InternetShortcut" "URL" "http://127.0.0.1:${G_GUI}/shutdown"
! WriteINIStr "$SMPROGRAMS\POPFile\Manual.url" \
"InternetShortcut" "URL" "file://$INSTDIR/manual/en/manual.html"
! WriteINIStr "$SMPROGRAMS\POPFile\FAQ.url" \
"InternetShortcut" "URL" \
"http://sourceforge.net/docman/display_doc.php?docid=14421&group_id=63137"
! SetOutPath $SMPROGRAMS\POPFile\Support
! WriteINIStr "$SMPROGRAMS\POPFile\Support\POPFile Home Page.url" \
"InternetShortcut" "URL" "http://popfile.sourceforge.net/"
--- 719,744 ----
; ('SetOutPath' is one way to change the value of $OUTDIR)
! SetOutPath "$SMPROGRAMS\${MUI_PRODUCT}"
SetOutPath $INSTDIR
! CreateShortCut "$SMPROGRAMS\${MUI_PRODUCT}\Run POPFile.lnk" \
"$INSTDIR\perl.exe" popfile.pl \
"$INSTDIR\Platform\POPFileIcon.dll"
! CreateShortCut "$SMPROGRAMS\${MUI_PRODUCT}\Run POPFile in background.lnk" \
"$INSTDIR\wperl.exe" popfile.pl \
"$INSTDIR\Platform\POPFileIcon.dll"
! CreateShortCut "$SMPROGRAMS\${MUI_PRODUCT}\Uninstall POPFile.lnk" \
"$INSTDIR\uninstall.exe"
! SetOutPath "$SMPROGRAMS\${MUI_PRODUCT}"
! WriteINIStr "$SMPROGRAMS\${MUI_PRODUCT}\POPFile User Interface.url" \
"InternetShortcut" "URL" "http://127.0.0.1:${G_GUI}/"
! WriteINIStr "$SMPROGRAMS\${MUI_PRODUCT}\Shutdown POPFile.url" \
"InternetShortcut" "URL" "http://127.0.0.1:${G_GUI}/shutdown"
! WriteINIStr "$SMPROGRAMS\${MUI_PRODUCT}\Manual.url" \
"InternetShortcut" "URL" "file://$INSTDIR/manual/en/manual.html"
! WriteINIStr "$SMPROGRAMS\${MUI_PRODUCT}\FAQ.url" \
"InternetShortcut" "URL" \
"http://sourceforge.net/docman/display_doc.php?docid=14421&group_id=63137"
! SetOutPath "$SMPROGRAMS\${MUI_PRODUCT}\Support"
! WriteINIStr "$SMPROGRAMS\${MUI_PRODUCT}\Support\POPFile Home Page.url" \
"InternetShortcut" "URL" "http://popfile.sourceforge.net/"
***************
*** 1728,1732 ****
Push ${L_EXE}
Call WaitUntilUnlocked
! ExecShell "open" "$SMPROGRAMS\POPFile\Run POPFile.lnk"
goto wait_for_popfile
--- 1730,1734 ----
Push ${L_EXE}
Call WaitUntilUnlocked
! ExecShell "open" "$SMPROGRAMS\${MUI_PRODUCT}\Run POPFile.lnk"
goto wait_for_popfile
***************
*** 1752,1756 ****
Push ${L_EXE}
Call WaitUntilUnlocked
! ExecShell "open" "$SMPROGRAMS\POPFile\Run POPFile in background.lnk"
wait_for_popfile:
--- 1754,1758 ----
Push ${L_EXE}
Call WaitUntilUnlocked
! ExecShell "open" "$SMPROGRAMS\${MUI_PRODUCT}\Run POPFile in background.lnk"
wait_for_popfile:
***************
*** 2020,2030 ****
SetDetailsPrint listonly
! Delete $SMPROGRAMS\POPFile\Support\*.url
! RMDir $SMPROGRAMS\POPFile\Support
! Delete $SMPROGRAMS\POPFile\*.lnk
! Delete $SMPROGRAMS\POPFile\*.url
Delete "$SMSTARTUP\Run POPFile in background.lnk"
! RMDir $SMPROGRAMS\POPFile
SetDetailsPrint textonly
--- 2022,2032 ----
SetDetailsPrint listonly
! Delete "$SMPROGRAMS\${MUI_PRODUCT}\Support\*.url"
! RMDir "$SMPROGRAMS\${MUI_PRODUCT}\Support"
! Delete "$SMPROGRAMS\${MUI_PRODUCT}\*.lnk"
! Delete "$SMPROGRAMS\${MUI_PRODUCT}\*.url"
Delete "$SMSTARTUP\Run POPFile in background.lnk"
! RMDir "$SMPROGRAMS\${MUI_PRODUCT}"
SetDetailsPrint textonly
***************
*** 2158,2162 ****
DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${MUI_PRODUCT}"
! DeleteRegKey HKLM SOFTWARE\POPFile
; if $INSTDIR was removed, skip these next ones
--- 2160,2164 ----
DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${MUI_PRODUCT}"
! DeleteRegKey HKLM "SOFTWARE\${MUI_PRODUCT}"
; if $INSTDIR was removed, skip these next ones
|
