dragonleo/NSIS
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

no need for function usage deceleration or un. suffix anymore

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@5786 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik 2008-11-21 13:22:57 +00:00
parent 4425d93e75
commit 6226f58d8b
6 changed files with 49 additions and 197 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Examples/FileFunc.nsi
View file

@ -14,26 +14,6 @@ RequestExecutionLevel user
!include "WinMessages.nsh" !include "WinMessages.nsh"
!include "FileFunc.nsh" !include "FileFunc.nsh"
!insertmacro Locate
!insertmacro GetSize
!insertmacro DriveSpace
!insertmacro GetDrives
!insertmacro GetTime
!insertmacro GetFileAttributes
!insertmacro GetFileVersion
!insertmacro GetExeName
!insertmacro GetExePath
!insertmacro GetParameters
!insertmacro GetOptions
!insertmacro GetRoot
!insertmacro GetParent
!insertmacro GetFileName
!insertmacro GetBaseName
!insertmacro GetFileExt
!insertmacro BannerTrimPath
!insertmacro DirState
!insertmacro RefreshShellIcons
Var INI Var INI
Var HWND Var HWND
Var STATE Var STATE

84
Examples/FileFuncTest.nsi
View file

@ -24,50 +24,6 @@ Var OUT7
!include "FileFunc.nsh" !include "FileFunc.nsh"
!include "LogicLib.nsh" !include "LogicLib.nsh"
!insertmacro Locate
!insertmacro GetSize
!insertmacro DriveSpace
!insertmacro GetDrives
!insertmacro GetTime
!insertmacro GetFileAttributes
!insertmacro GetFileVersion
!insertmacro GetExeName
!insertmacro GetExePath
!insertmacro GetParameters
!insertmacro GetOptions
!insertmacro GetOptionsS
!insertmacro GetRoot
!insertmacro GetParent
!insertmacro GetFileName
!insertmacro GetBaseName
!insertmacro GetFileExt
!insertmacro BannerTrimPath
!insertmacro DirState
!insertmacro RefreshShellIcons
!insertmacro un.Locate
!insertmacro un.GetSize
!insertmacro un.GetDrives
!insertmacro un.DriveSpace
!insertmacro un.GetTime
!insertmacro un.GetFileAttributes
!insertmacro un.GetFileVersion
!insertmacro un.GetExeName
!insertmacro un.GetExePath
!insertmacro un.GetParameters
!insertmacro un.GetOptions
!insertmacro un.GetOptionsS
!insertmacro un.GetRoot
!insertmacro un.GetParent
!insertmacro un.GetFileName
!insertmacro un.GetBaseName
!insertmacro un.GetFileExt
!insertmacro un.BannerTrimPath
!insertmacro un.DirState
!insertmacro un.RefreshShellIcons
;############### INSTALL ############### ;############### INSTALL ###############
!define StackVerificationStart `!insertmacro StackVerificationStart` !define StackVerificationStart `!insertmacro StackVerificationStart`
@ -585,26 +541,26 @@ SectionEnd
;############### UNINSTALL ############### ;############### UNINSTALL ###############
Section un.Uninstall Section un.Uninstall
${un.Locate} '$DOCUMENTS' '/L=FD /M=*.* /S=0B /G=0' 'un.LocateCallback' ${Locate} '$DOCUMENTS' '/L=FD /M=*.* /S=0B /G=0' 'un.LocateCallback'
${un.GetSize} '$WINDIR' '/M=Explorer.exe /S=0K /G=0' $OUT1 $OUT2 $OUT3 ${GetSize} '$WINDIR' '/M=Explorer.exe /S=0K /G=0' $OUT1 $OUT2 $OUT3
${un.DriveSpace} 'C:\' '/D=F /S=M' $OUT1 ${DriveSpace} 'C:\' '/D=F /S=M' $OUT1
${un.GetDrives} 'FDD+CDROM' 'un.GetDrivesCallback' ${GetDrives} 'FDD+CDROM' 'un.GetDrivesCallback'
${un.GetTime} '' 'L' $OUT1 $OUT2 $OUT3 $OUT4 $OUT5 $OUT6 $OUT7 ${GetTime} '' 'L' $OUT1 $OUT2 $OUT3 $OUT4 $OUT5 $OUT6 $OUT7
${un.GetFileAttributes} '$WINDIR\explorer.exe' 'ALL' $OUT1 ${GetFileAttributes} '$WINDIR\explorer.exe' 'ALL' $OUT1
${un.GetFileVersion} '$WINDIR\explorer.exe' $OUT1 ${GetFileVersion} '$WINDIR\explorer.exe' $OUT1
${un.GetExeName} $OUT1 ${GetExeName} $OUT1
${un.GetExePath} $OUT1 ${GetExePath} $OUT1
${un.GetParameters} $OUT1 ${GetParameters} $OUT1
${un.GetOptions} '/INSTDIR=C:\Program Files\Common Files /SILENT=yes' '/INSTDIR=' $OUT1 ${GetOptions} '/INSTDIR=C:\Program Files\Common Files /SILENT=yes' '/INSTDIR=' $OUT1
${un.GetOptionsS} '/INSTDIR=C:\Program Files\Common Files /SILENT=yes' '/INSTDIR=' $OUT1 ${GetOptionsS} '/INSTDIR=C:\Program Files\Common Files /SILENT=yes' '/INSTDIR=' $OUT1
${un.GetRoot} 'C:\Program Files\NSIS' $OUT1 ${GetRoot} 'C:\Program Files\NSIS' $OUT1
${un.GetParent} 'C:\Program Files\Winamp\uninstwa.exe' $OUT1 ${GetParent} 'C:\Program Files\Winamp\uninstwa.exe' $OUT1
${un.GetFileName} 'C:\Program Files\Winamp\uninstwa.exe' $OUT1 ${GetFileName} 'C:\Program Files\Winamp\uninstwa.exe' $OUT1
${un.GetBaseName} 'C:\Program Files\Winamp\uninstwa.exe' $OUT1 ${GetBaseName} 'C:\Program Files\Winamp\uninstwa.exe' $OUT1
${un.GetFileExt} 'C:\Program Files\Winamp\uninstwa.exe' $OUT1 ${GetFileExt} 'C:\Program Files\Winamp\uninstwa.exe' $OUT1
${un.BannerTrimPath} 'C:\Server\Documents\Terminal\license.htm' '35A' $OUT1 ${BannerTrimPath} 'C:\Server\Documents\Terminal\license.htm' '35A' $OUT1
${un.DirState} '$TEMP' $OUT1 ${DirState} '$TEMP' $OUT1
${un.RefreshShellIcons} ${RefreshShellIcons}
SectionEnd SectionEnd
Function un.LocateCallback Function un.LocateCallback

9
Examples/TextFunc.nsi
View file

@ -14,15 +14,6 @@ RequestExecutionLevel user
!include "WinMessages.nsh" !include "WinMessages.nsh"
!include "TextFunc.nsh" !include "TextFunc.nsh"
!insertmacro LineFind
!insertmacro LineRead
!insertmacro FileReadFromEnd
!insertmacro LineSum
!insertmacro FileJoin
!insertmacro ConfigRead
!insertmacro ConfigWrite
!insertmacro FileRecode
Var HWND Var HWND
Var INI Var INI
Var LOG Var LOG

56
Examples/TextFuncTest.nsi
View file

@ -21,36 +21,6 @@ Var OUT
!include "TextFunc.nsh" !include "TextFunc.nsh"
!insertmacro LineFind
!insertmacro LineRead
!insertmacro FileReadFromEnd
!insertmacro LineSum
!insertmacro FileJoin
!insertmacro TextCompare
!insertmacro TextCompareS
!insertmacro ConfigRead
!insertmacro ConfigReadS
!insertmacro ConfigWrite
!insertmacro ConfigWriteS
!insertmacro FileRecode
!insertmacro TrimNewLines
!insertmacro un.LineFind
!insertmacro un.LineRead
!insertmacro un.FileReadFromEnd
!insertmacro un.LineSum
!insertmacro un.FileJoin
!insertmacro un.TextCompare
!insertmacro un.TextCompareS
!insertmacro un.ConfigRead
!insertmacro un.ConfigReadS
!insertmacro un.ConfigWrite
!insertmacro un.ConfigWriteS
!insertmacro un.FileRecode
!insertmacro un.TrimNewLines
;############### INSTALL ############### ;############### INSTALL ###############
!define StackVerificationStart `!insertmacro StackVerificationStart` !define StackVerificationStart `!insertmacro StackVerificationStart`
@ -416,19 +386,19 @@ SectionEnd
;############### UNINSTALL ############### ;############### UNINSTALL ###############
Section un.Uninstall Section un.Uninstall
${un.LineFind} '$TEMPFILE1' '/NUL' '1:-1' 'un.LineFindCallback' ${LineFind} '$TEMPFILE1' '/NUL' '1:-1' 'un.LineFindCallback'
${un.LineRead} '$TEMPFILE1' '-1' $OUT ${LineRead} '$TEMPFILE1' '-1' $OUT
${un.FileReadFromEnd} '$TEMPFILE1' 'un.FileReadFromEndCallback' ${FileReadFromEnd} '$TEMPFILE1' 'un.FileReadFromEndCallback'
${un.LineSum} '$TEMPFILE1' $OUT ${LineSum} '$TEMPFILE1' $OUT
${un.FileJoin} '$TEMPFILE1' '$TEMPFILE2' '$TEMPFILE3' ${FileJoin} '$TEMPFILE1' '$TEMPFILE2' '$TEMPFILE3'
${un.TextCompare} '$TEMPFILE1' '$TEMPFILE2' 'FastDiff' 'un.TextCompareCallback' ${TextCompare} '$TEMPFILE1' '$TEMPFILE2' 'FastDiff' 'un.TextCompareCallback'
${un.TextCompareS} '$TEMPFILE1' '$TEMPFILE2' 'FastDiff' 'un.TextCompareCallback' ${TextCompareS} '$TEMPFILE1' '$TEMPFILE2' 'FastDiff' 'un.TextCompareCallback'
${un.ConfigRead} '$TEMPFILE1' '3c=' $OUT ${ConfigRead} '$TEMPFILE1' '3c=' $OUT
${un.ConfigReadS} '$TEMPFILE1' '3c=' $OUT ${ConfigReadS} '$TEMPFILE1' '3c=' $OUT
${un.ConfigWrite} '$TEMPFILE1' '5E=' 'e**' $OUT ${ConfigWrite} '$TEMPFILE1' '5E=' 'e**' $OUT
${un.ConfigWriteS} '$TEMPFILE1' '5E=' 'e**' $OUT ${ConfigWriteS} '$TEMPFILE1' '5E=' 'e**' $OUT
${un.FileRecode} '$TEMPFILE1' 'CharToOem' ${FileRecode} '$TEMPFILE1' 'CharToOem'
${un.TrimNewLines} 'Text Line$\r$\n' $OUT ${TrimNewLines} 'Text Line$\r$\n' $OUT
SectionEnd SectionEnd
Function un.LineFindCallback Function un.LineFindCallback

9
Examples/WordFunc.nsi
View file

@ -18,15 +18,6 @@ Var STATE
!include "WinMessages.nsh" !include "WinMessages.nsh"
!include "WordFunc.nsh" !include "WordFunc.nsh"
!insertmacro WordFind
!insertmacro WordFind2X
!insertmacro WordReplace
!insertmacro WordAdd
!insertmacro WordInsert
!insertmacro StrFilter
!insertmacro VersionCompare
!insertmacro VersionConvert
Page Custom ShowCustom LeaveCustom Page Custom ShowCustom LeaveCustom
Function ShowCustom Function ShowCustom

68
Examples/WordFuncTest.nsi
View file

@ -17,42 +17,6 @@ Var OUT
!include "WordFunc.nsh" !include "WordFunc.nsh"
!insertmacro WordFind
!insertmacro WordFindS
!insertmacro WordFind2X
!insertmacro WordFind2XS
!insertmacro WordFind3X
!insertmacro WordFind3XS
!insertmacro WordReplace
!insertmacro WordReplaceS
!insertmacro WordAdd
!insertmacro WordAddS
!insertmacro WordInsert
!insertmacro WordInsertS
!insertmacro StrFilter
!insertmacro StrFilterS
!insertmacro VersionCompare
!insertmacro VersionConvert
!insertmacro un.WordFind
!insertmacro un.WordFindS
!insertmacro un.WordFind2X
!insertmacro un.WordFind2XS
!insertmacro un.WordFind3X
!insertmacro un.WordFind3XS
!insertmacro un.WordReplace
!insertmacro un.WordReplaceS
!insertmacro un.WordAdd
!insertmacro un.WordAddS
!insertmacro un.WordInsert
!insertmacro un.WordInsertS
!insertmacro un.StrFilter
!insertmacro un.StrFilterS
!insertmacro un.VersionCompare
!insertmacro un.VersionConvert
;############### INSTALL ############### ;############### INSTALL ###############
!define StackVerificationStart `!insertmacro StackVerificationStart` !define StackVerificationStart `!insertmacro StackVerificationStart`
@ -627,20 +591,20 @@ SectionEnd
;############### UNINSTALL ############### ;############### UNINSTALL ###############
Section un.Uninstall Section un.Uninstall
${un.WordFind} 'C:\io.sys C:\Program Files C:\WINDOWS' ' C:\' '-02' $OUT ${WordFind} 'C:\io.sys C:\Program Files C:\WINDOWS' ' C:\' '-02' $OUT
${un.WordFindS} 'C:\io.sys C:\Program Files C:\WINDOWS' ' C:\' '-02' $OUT ${WordFindS} 'C:\io.sys C:\Program Files C:\WINDOWS' ' C:\' '-02' $OUT
${un.WordFind2X} '[C:\io.sys];[C:\logo.sys];[C:\WINDOWS]' '[C:\' '];' '+2' $OUT ${WordFind2X} '[C:\io.sys];[C:\logo.sys];[C:\WINDOWS]' '[C:\' '];' '+2' $OUT
${un.WordFind2XS} '[C:\io.sys];[C:\logo.sys];[C:\WINDOWS]' '[C:\' '];' '+2' $OUT ${WordFind2XS} '[C:\io.sys];[C:\logo.sys];[C:\WINDOWS]' '[C:\' '];' '+2' $OUT
${un.WordFind3X} '[1.AAB];[2.BAA];[3.BBB];' '[' 'AA' '];' '+1' $OUT ${WordFind3X} '[1.AAB];[2.BAA];[3.BBB];' '[' 'AA' '];' '+1' $OUT
${un.WordFind3XS} '[1.AAB];[2.BAA];[3.BBB];' '[' 'AA' '];' '+1' $OUT ${WordFind3XS} '[1.AAB];[2.BAA];[3.BBB];' '[' 'AA' '];' '+1' $OUT
${un.WordReplace} 'C:\io.sys C:\logo.sys C:\WINDOWS' 'SYS' 'bmp' '+2' $OUT ${WordReplace} 'C:\io.sys C:\logo.sys C:\WINDOWS' 'SYS' 'bmp' '+2' $OUT
${un.WordReplaceS} 'C:\io.sys C:\logo.sys C:\WINDOWS' 'SYS' 'bmp' '+2' $OUT ${WordReplaceS} 'C:\io.sys C:\logo.sys C:\WINDOWS' 'SYS' 'bmp' '+2' $OUT
${un.WordAdd} 'C:\io.sys C:\WINDOWS' ' ' '+C:\WINDOWS C:\config.sys' $OUT ${WordAdd} 'C:\io.sys C:\WINDOWS' ' ' '+C:\WINDOWS C:\config.sys' $OUT
${un.WordAddS} 'C:\io.sys C:\WINDOWS' ' ' '+C:\WINDOWS C:\config.sys' $OUT ${WordAddS} 'C:\io.sys C:\WINDOWS' ' ' '+C:\WINDOWS C:\config.sys' $OUT
${un.WordInsert} 'C:\io.sys C:\WINDOWS' ' ' 'C:\logo.sys' '-2' $OUT ${WordInsert} 'C:\io.sys C:\WINDOWS' ' ' 'C:\logo.sys' '-2' $OUT
${un.WordInsertS} 'C:\io.sys C:\WINDOWS' ' ' 'C:\logo.sys' '-2' $OUT ${WordInsertS} 'C:\io.sys C:\WINDOWS' ' ' 'C:\logo.sys' '-2' $OUT
${un.StrFilter} '123abc 456DEF 7890|%#' '+' '' '' $OUT ${StrFilter} '123abc 456DEF 7890|%#' '+' '' '' $OUT
${un.StrFilterS} '123abc 456DEF 7890|%#' '+' '' '' $OUT ${StrFilterS} '123abc 456DEF 7890|%#' '+' '' '' $OUT
${un.VersionCompare} '1.1.1.9' '1.1.1.01' $OUT ${VersionCompare} '1.1.1.9' '1.1.1.01' $OUT
${un.VersionConvert} '9.0a' '' $OUT ${VersionConvert} '9.0a' '' $OUT
SectionEnd SectionEnd