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

Make sure we always install the "native" RegTool binary.

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6890 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
anders_k 2017-07-24 21:38:21 +00:00
parent a65c5a4d98
commit 7a18d3e4bc
2 changed files with 17 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Examples/makensis.nsi
View file

@ -11,7 +11,7 @@
;--------------------------------
;Configuration
!ifdef NSIS_MAKENSIS64
!if ${NSIS_PTR_SIZE} > 4
!define BITS 64
!define NAMESUFFIX " (64 bit)"
!else
@ -124,7 +124,7 @@ VIAddVersionKey "LegalCopyright" "http://nsis.sf.net/License"
;Installer Sections
!macro InstallPlugin pi
!ifdef NSIS_MAKENSIS64
!if ${BITS} >= 64
File "/oname=$InstDir\Plugins\amd64-unicode\${pi}.dll" ..\Plugins\amd64-unicode\${pi}.dll
!else
File "/oname=$InstDir\Plugins\x86-ansi\${pi}.dll" ..\Plugins\x86-ansi\${pi}.dll
@ -133,7 +133,7 @@ VIAddVersionKey "LegalCopyright" "http://nsis.sf.net/License"
!macroend
!macro InstallStub stub
!ifdef NSIS_MAKENSIS64
!if ${BITS} >= 64
File ..\Stubs\${stub}-amd64-unicode
!else
File ..\Stubs\${stub}-x86-ansi
@ -237,12 +237,19 @@ ${MementoSection} "NSIS Core Files (required)" SecCore
SetOutPath $INSTDIR\Bin
File ..\Bin\LibraryLocal.exe
File ..\Bin\RegTool-x86.bin
File /nonfatal ..\Bin\RegTool-amd64.bin
!if ${BITS} >= 64
File /NonFatal ..\Bin\RegTool-x86.bin
File ..\Bin\RegTool-amd64.bin
!else
File ..\Bin\RegTool-x86.bin
!if /FileExists ..\Bin\RegTool-amd64.bin ; It is unlikely that this exists, avoid the /NonFatal warning.
File ..\Bin\RegTool-amd64.bin
!endif
!endif
CreateDirectory $INSTDIR\Plugins\x86-ansi
CreateDirectory $INSTDIR\Plugins\x86-unicode
!ifdef NSIS_MAKENSIS64
!if ${BITS} >= 64
CreateDirectory $INSTDIR\Plugins\amd64-unicode
!endif
!insertmacro InstallPlugin TypeLib