fixed for new paths
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@4101 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
parent
a99cda74d9
commit
dd596bc6ba
13 changed files with 28 additions and 28 deletions
|
@ -19,7 +19,7 @@ Function .onInit
|
|||
; '0' if everything closed normal, and '-1' if some error occured.
|
||||
|
||||
MessageBox MB_OK "Transparency"
|
||||
File /oname=$PLUGINSDIR\splash.bmp "${NSISDIR}\Contrib\Makensisw\logo.bmp"
|
||||
File /oname=$PLUGINSDIR\splash.bmp "${NSISDIR}\Contrib\Graphics\Wizard\orange-uninstall.bmp"
|
||||
advsplash::show 2000 0 0 0x1856B1 $PLUGINSDIR\splash
|
||||
Pop $0
|
||||
|
||||
|
|
|
@ -17,9 +17,9 @@ ShowInstDetails show
|
|||
|
||||
ReserveFile "${NSISDIR}\Plugins\InstallOptions.dll"
|
||||
ReserveFile "testimgs.ini"
|
||||
ReserveFile "${NSISDIR}\Contrib\Makensisw\toolbar.bmp"
|
||||
ReserveFile "${NSISDIR}\Contrib\Makensisw\toolbar24.bmp"
|
||||
ReserveFile "${NSISDIR}\Contrib\Makensisw\shell.ico"
|
||||
ReserveFile "${NSISDIR}\Contrib\Graphics\Checks\colorful.bmp"
|
||||
ReserveFile "${NSISDIR}\Contrib\Graphics\Checks\modern.bmp"
|
||||
ReserveFile "${NSISDIR}\Contrib\Graphics\Icons\pixel-install.ico"
|
||||
|
||||
;Order of pages
|
||||
Page custom SetCustom "" ": Testing InstallOptions" ;Custom page. InstallOptions gets called in SetCustom.
|
||||
|
@ -35,9 +35,9 @@ Function .onInit
|
|||
|
||||
InitPluginsDir
|
||||
File /oname=$PLUGINSDIR\testimgs.ini "testimgs.ini"
|
||||
File /oname=$PLUGINSDIR\image.bmp "${NSISDIR}\Contrib\Makensisw\toolbar.bmp"
|
||||
File /oname=$PLUGINSDIR\image2.bmp "${NSISDIR}\Contrib\Makensisw\toolbar24.bmp"
|
||||
File /oname=$PLUGINSDIR\icon.ico "${NSISDIR}\Contrib\Makensisw\shell.ico"
|
||||
File /oname=$PLUGINSDIR\image.bmp "${NSISDIR}\Contrib\Graphics\Checks\colorful.bmp"
|
||||
File /oname=$PLUGINSDIR\image2.bmp "${NSISDIR}\Contrib\Graphics\Checks\modern.bmp"
|
||||
File /oname=$PLUGINSDIR\icon.ico "${NSISDIR}\Contrib\Graphics\Icons\pixel-install.ico"
|
||||
|
||||
;Write image paths to the INI file
|
||||
|
||||
|
|
|
@ -7,7 +7,7 @@ XPStyle on
|
|||
Function .onInit
|
||||
# the plugins dir is automatically deleted when the installer exits
|
||||
InitPluginsDir
|
||||
File /oname=$PLUGINSDIR\splash.bmp "${NSISDIR}\Contrib\Makensisw\logo.bmp"
|
||||
File /oname=$PLUGINSDIR\splash.bmp "${NSISDIR}\Contrib\Graphics\Wizard\orange-nsis.bmp"
|
||||
#optional
|
||||
#File /oname=$PLUGINSDIR\splash.wav "C:\myprog\sound.wav"
|
||||
|
||||
|
|
|
@ -7,10 +7,10 @@
|
|||
!ifndef SysFunc.NSH.Included
|
||||
!define SysFunc.NSH.Included
|
||||
|
||||
!include "${NSISDIR}\Contrib\System\System.nsh"
|
||||
!include "${NSISDIR}\Examples\System\System.nsh"
|
||||
|
||||
!verbose 3 ; For WinMessages especially
|
||||
!include "${NSISDIR}\Include\WinMessages.nsh"
|
||||
!include "WinMessages.nsh"
|
||||
!verbose 4
|
||||
|
||||
; ================= GetInstallerExeName implementation =================
|
||||
|
|
|
@ -7,7 +7,7 @@ Name "System Plugin Example"
|
|||
OutFile "System.exe"
|
||||
SetPluginUnload alwaysoff
|
||||
|
||||
!include "${NSISDIR}\Contrib\System\sysfunc.nsh"
|
||||
!include "SysFunc.nsh"
|
||||
|
||||
Section "ThisNameIsIgnoredSoWhyBother?"
|
||||
SetOutPath $TEMP
|
||||
|
@ -23,7 +23,7 @@ Section "ThisNameIsIgnoredSoWhyBother?"
|
|||
; The same example but using icon from resource.dll.
|
||||
; You could use this dll for storing your resources, just replace FAR icon
|
||||
; with something you really need.
|
||||
File "${NSISDIR}\Contrib\System\Resource.dll"
|
||||
File "Resource.dll"
|
||||
System::Call '${sysMessageBeep} (${MB_ICONHAND})' ; custom beep
|
||||
!insertmacro smMessageBox "`$TEMP\resource.dll`" "Message box with custom icon from resource.dll!" "System Example 1b" ${MB_OKCANCEL} "i 103"
|
||||
Delete $TEMP\resource.dll
|
||||
|
@ -114,7 +114,7 @@ enumex: ; End of drives or user cancel
|
|||
; ----- Sample 7 ----- systemSplash -> Callbacks demonstration -----
|
||||
|
||||
; Logo
|
||||
File /oname=spltmp.bmp "${NSISDIR}\Contrib\Makensisw\logo.bmp"
|
||||
File /oname=spltmp.bmp "${NSISDIR}\Contrib\Graphics\Header\orange-nsis.bmp"
|
||||
; File /oname=spltmp.wav "d:\Windows\Media\tada.wav"
|
||||
|
||||
; I. systemSplash variant
|
||||
|
|
|
@ -28,7 +28,7 @@
|
|||
;--------------------------------
|
||||
;Pages
|
||||
|
||||
!insertmacro MUI_PAGE_LICENSE "${NSISDIR}\Contrib\Modern UI\License.txt"
|
||||
!insertmacro MUI_PAGE_LICENSE "${NSISDIR}\Docs\Modern UI\License.txt"
|
||||
!insertmacro MUI_PAGE_COMPONENTS
|
||||
!insertmacro MUI_PAGE_DIRECTORY
|
||||
!insertmacro MUI_PAGE_INSTFILES
|
||||
|
|
|
@ -30,7 +30,7 @@
|
|||
;--------------------------------
|
||||
;Pages
|
||||
|
||||
!insertmacro MUI_PAGE_LICENSE "${NSISDIR}\Contrib\Modern UI\License.txt"
|
||||
!insertmacro MUI_PAGE_LICENSE "${NSISDIR}\Docs\Modern UI\License.txt"
|
||||
!insertmacro MUI_PAGE_COMPONENTS
|
||||
!insertmacro MUI_PAGE_DIRECTORY
|
||||
!insertmacro MUI_PAGE_INSTFILES
|
||||
|
|
|
@ -23,7 +23,7 @@
|
|||
;--------------------------------
|
||||
;Pages
|
||||
|
||||
!insertmacro MUI_PAGE_LICENSE "${NSISDIR}\Contrib\Modern UI\License.txt"
|
||||
!insertmacro MUI_PAGE_LICENSE "${NSISDIR}\Docs\Modern UI\License.txt"
|
||||
Page custom CustomPageA
|
||||
!insertmacro MUI_PAGE_COMPONENTS
|
||||
Page custom CustomPageB
|
||||
|
|
|
@ -36,7 +36,7 @@
|
|||
;--------------------------------
|
||||
;Pages
|
||||
|
||||
!insertmacro MUI_PAGE_LICENSE "${NSISDIR}\Contrib\Modern UI\License.txt"
|
||||
!insertmacro MUI_PAGE_LICENSE "${NSISDIR}\Docs\Modern UI\License.txt"
|
||||
!insertmacro MUI_PAGE_COMPONENTS
|
||||
!insertmacro MUI_PAGE_DIRECTORY
|
||||
!insertmacro MUI_PAGE_INSTFILES
|
||||
|
|
|
@ -34,7 +34,7 @@
|
|||
;--------------------------------
|
||||
;Pages
|
||||
|
||||
!insertmacro MUI_PAGE_LICENSE "${NSISDIR}\Contrib\Modern UI\License.txt"
|
||||
!insertmacro MUI_PAGE_LICENSE "${NSISDIR}\Docs\Modern UI\License.txt"
|
||||
!insertmacro MUI_PAGE_COMPONENTS
|
||||
!insertmacro MUI_PAGE_DIRECTORY
|
||||
|
||||
|
|
|
@ -29,7 +29,7 @@
|
|||
;Pages
|
||||
|
||||
!insertmacro MUI_PAGE_WELCOME
|
||||
!insertmacro MUI_PAGE_LICENSE "${NSISDIR}\Contrib\Modern UI\License.txt"
|
||||
!insertmacro MUI_PAGE_LICENSE "${NSISDIR}\Docs\Modern UI\License.txt"
|
||||
!insertmacro MUI_PAGE_COMPONENTS
|
||||
!insertmacro MUI_PAGE_DIRECTORY
|
||||
!insertmacro MUI_PAGE_INSTFILES
|
||||
|
|
|
@ -33,7 +33,7 @@ InstallDirRegKey HKLM "Software\NSISCrap\BigNSISTest" ""
|
|||
CheckBitmap "..\Contrib\Graphics\Checks\classic-cross.bmp"
|
||||
|
||||
LicenseText "A test text, make sure it's all there"
|
||||
LicenseData "..\Source\exehead\Main.c"
|
||||
LicenseData "bigtest.nsi"
|
||||
|
||||
;--------------------------------
|
||||
|
||||
|
@ -73,7 +73,7 @@ Section "" ; empty string makes it hidden, so would starting with -
|
|||
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\BigNSISTest" "UninstallString" '"$INSTDIR\bt-uninst.exe"'
|
||||
|
||||
SetOutPath $INSTDIR
|
||||
File /a "..\Source\exehead\fileform.h"
|
||||
File /a "silent.nsi"
|
||||
CreateDirectory "$INSTDIR\shiz\crap" ; 2 recursively create a directory for fun.
|
||||
WriteUninstaller "bt-uninst.exe"
|
||||
|
||||
|
@ -153,9 +153,9 @@ Section "Test Branching"
|
|||
|
||||
SetOutPath $INSTDIR
|
||||
|
||||
IfFileExists "$INSTDIR\Ui.c" 0 BranchTest69
|
||||
IfFileExists "$INSTDIR\LogicLib.nsi" 0 BranchTest69
|
||||
|
||||
MessageBox MB_YESNO|MB_ICONQUESTION "Would you like to overwrite $INSTDIR\Ui.c?" IDNO NoOverwrite ; skipped if file doesn't exist
|
||||
MessageBox MB_YESNO|MB_ICONQUESTION "Would you like to overwrite $INSTDIR\LogicLib.nsi?" IDNO NoOverwrite ; skipped if file doesn't exist
|
||||
|
||||
BranchTest69:
|
||||
|
||||
|
@ -163,7 +163,7 @@ Section "Test Branching"
|
|||
|
||||
NoOverwrite:
|
||||
|
||||
File "..\Source\exehead\Ui.c" ; skipped if answered no
|
||||
File "LogicLib.nsi" ; skipped if answered no
|
||||
SetOverwrite try ; NOT AN INSTRUCTION, NOT COUNTED IN SKIPPINGS
|
||||
|
||||
MessageBox MB_YESNO|MB_ICONQUESTION "Would you like to skip the rest of this section?" IDYES EndTestBranch
|
||||
|
@ -238,7 +238,7 @@ Function "CSCTest"
|
|||
SetOutPath $INSTDIR ; for working directory
|
||||
CreateShortCut "$SMPROGRAMS\Big NSIS Test\Uninstall BIG NSIS Test.lnk" "$INSTDIR\bt-uninst.exe" ; use defaults for parameters, icon, etc.
|
||||
; this one will use notepad's icon, start it minimized, and give it a hotkey (of Ctrl+Shift+Q)
|
||||
CreateShortCut "$SMPROGRAMS\Big NSIS Test\fileform.h.lnk" "$INSTDIR\fileform.h" "" "$WINDIR\notepad.exe" 0 SW_SHOWMINIMIZED CONTROL|SHIFT|Q
|
||||
CreateShortCut "$SMPROGRAMS\Big NSIS Test\silent.nsi.lnk" "$INSTDIR\silent.nsi" "" "$WINDIR\notepad.exe" 0 SW_SHOWMINIMIZED CONTROL|SHIFT|Q
|
||||
CreateShortCut "$SMPROGRAMS\Big NSIS Test\TheDir.lnk" "$INSTDIR\" "" "" 0 SW_SHOWMAXIMIZED CONTROL|SHIFT|Z
|
||||
|
||||
FunctionEnd
|
||||
|
@ -283,8 +283,8 @@ Section "Uninstall"
|
|||
|
||||
DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\BigNSISTest"
|
||||
DeleteRegKey HKLM "SOFTWARE\NSISCrap\BigNSISTest"
|
||||
Delete "$INSTDIR\fileform.h"
|
||||
Delete "$INSTDIR\Ui.c"
|
||||
Delete "$INSTDIR\silent.nsi"
|
||||
Delete "$INSTDIR\LogicLib.nsi"
|
||||
Delete "$INSTDIR\bt-uninst.exe"
|
||||
Delete "$INSTDIR\test.ini"
|
||||
Delete "$SMPROGRAMS\Big NSIS Test\*.*"
|
||||
|
|
|
@ -33,7 +33,7 @@ LoadLanguageFile "${NSISDIR}\Contrib\Language files\Slovak.nlf"
|
|||
; License data
|
||||
; Not exactly translated, but it shows what's needed
|
||||
LicenseLangString myLicenseData ${LANG_ENGLISH} "bigtest.nsi"
|
||||
LicenseLangString myLicenseData ${LANG_DUTCH} "cvsdata.nsi"
|
||||
LicenseLangString myLicenseData ${LANG_DUTCH} "waplugin.nsi"
|
||||
LicenseLangString myLicenseData ${LANG_FRENCH} "example1.nsi"
|
||||
LicenseLangString myLicenseData ${LANG_GERMAN} "example2.nsi"
|
||||
LicenseLangString myLicenseData ${LANG_KOREAN} "gfx.nsi"
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue