From dd596bc6bab74befb1042c467f9e7c0c44ea0e83 Mon Sep 17 00:00:00 2001 From: kichik Date: Sun, 19 Jun 2005 21:39:04 +0000 Subject: [PATCH] fixed for new paths git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@4101 212acab6-be3b-0410-9dea-997c60f758d6 --- Contrib/AdvSplash/Example.nsi | 2 +- Contrib/InstallOptions/testimgs.nsi | 12 ++++++------ Contrib/Splash/Example.nsi | 2 +- Contrib/System/SysFunc.nsh | 4 ++-- Contrib/System/System.nsi | 6 +++--- Examples/Modern UI/Basic.nsi | 2 +- Examples/Modern UI/HeaderBitmap.nsi | 2 +- Examples/Modern UI/InstallOptions.nsi | 2 +- Examples/Modern UI/MultiLanguage.nsi | 2 +- Examples/Modern UI/StartMenu.nsi | 2 +- Examples/Modern UI/WelcomeFinish.nsi | 2 +- Examples/bigtest.nsi | 16 ++++++++-------- Examples/languages.nsi | 2 +- 13 files changed, 28 insertions(+), 28 deletions(-) diff --git a/Contrib/AdvSplash/Example.nsi b/Contrib/AdvSplash/Example.nsi index a079c6ab..cd34e1f3 100644 --- a/Contrib/AdvSplash/Example.nsi +++ b/Contrib/AdvSplash/Example.nsi @@ -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 diff --git a/Contrib/InstallOptions/testimgs.nsi b/Contrib/InstallOptions/testimgs.nsi index c4d96740..1a832e91 100644 --- a/Contrib/InstallOptions/testimgs.nsi +++ b/Contrib/InstallOptions/testimgs.nsi @@ -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 diff --git a/Contrib/Splash/Example.nsi b/Contrib/Splash/Example.nsi index f59620ae..67d6684a 100644 --- a/Contrib/Splash/Example.nsi +++ b/Contrib/Splash/Example.nsi @@ -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" diff --git a/Contrib/System/SysFunc.nsh b/Contrib/System/SysFunc.nsh index e9c90365..57c20167 100644 --- a/Contrib/System/SysFunc.nsh +++ b/Contrib/System/SysFunc.nsh @@ -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 ================= diff --git a/Contrib/System/System.nsi b/Contrib/System/System.nsi index a5a1adf9..906a8a10 100644 --- a/Contrib/System/System.nsi +++ b/Contrib/System/System.nsi @@ -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 diff --git a/Examples/Modern UI/Basic.nsi b/Examples/Modern UI/Basic.nsi index b9a64157..6d970964 100644 --- a/Examples/Modern UI/Basic.nsi +++ b/Examples/Modern UI/Basic.nsi @@ -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 diff --git a/Examples/Modern UI/HeaderBitmap.nsi b/Examples/Modern UI/HeaderBitmap.nsi index f18fa024..80702014 100644 --- a/Examples/Modern UI/HeaderBitmap.nsi +++ b/Examples/Modern UI/HeaderBitmap.nsi @@ -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 diff --git a/Examples/Modern UI/InstallOptions.nsi b/Examples/Modern UI/InstallOptions.nsi index cf2eefdf..fad060e3 100644 --- a/Examples/Modern UI/InstallOptions.nsi +++ b/Examples/Modern UI/InstallOptions.nsi @@ -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 diff --git a/Examples/Modern UI/MultiLanguage.nsi b/Examples/Modern UI/MultiLanguage.nsi index 5981b269..32bf0037 100644 --- a/Examples/Modern UI/MultiLanguage.nsi +++ b/Examples/Modern UI/MultiLanguage.nsi @@ -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 diff --git a/Examples/Modern UI/StartMenu.nsi b/Examples/Modern UI/StartMenu.nsi index a3a97cd6..7fd46db0 100644 --- a/Examples/Modern UI/StartMenu.nsi +++ b/Examples/Modern UI/StartMenu.nsi @@ -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 diff --git a/Examples/Modern UI/WelcomeFinish.nsi b/Examples/Modern UI/WelcomeFinish.nsi index e7987894..8acb8584 100644 --- a/Examples/Modern UI/WelcomeFinish.nsi +++ b/Examples/Modern UI/WelcomeFinish.nsi @@ -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 diff --git a/Examples/bigtest.nsi b/Examples/bigtest.nsi index 65b6af6e..016d9541 100644 --- a/Examples/bigtest.nsi +++ b/Examples/bigtest.nsi @@ -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\*.*" diff --git a/Examples/languages.nsi b/Examples/languages.nsi index 4fd975f8..97596530 100644 --- a/Examples/languages.nsi +++ b/Examples/languages.nsi @@ -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"