Applied some installer tweaks.

This commit is contained in:
LoRd_MuldeR 2015-10-14 21:20:28 +02:00
parent db68e2ad3d
commit 3da3e72a6d
6 changed files with 25 additions and 2 deletions

2
.gitignore vendored
View File

@ -17,3 +17,5 @@
*.old
*.db
*.local.*
/etc/*.ini
/etc/*.log

BIN
etc/reshacker.exe Normal file

Binary file not shown.

BIN
etc/rhash.exe Normal file

Binary file not shown.

2
etc/setup/setup.manifest Normal file
View File

@ -0,0 +1,2 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"><assemblyIdentity version="1.0.0.0" processorArchitecture="X86" name="Nullsoft.NSIS.exehead" type="win32"/><description>Nullsoft Install System</description><dependency><dependentAssembly><assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" processorArchitecture="X86" publicKeyToken="6595b64144ccf1df" language="*" /></dependentAssembly></dependency><trustInfo xmlns="urn:schemas-microsoft-com:asm.v3"><security><requestedPrivileges><requestedExecutionLevel level="requireAdministrator" uiAccess="false"/></requestedPrivileges></security></trustInfo><compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1"><application><supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/><supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/><supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/><supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/><supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/></application></compatibility></assembly>

View File

@ -61,6 +61,16 @@
!include `StdUtils.nsh`
;--------------------------------
;Manifest
;--------------------------------
!packhdr "$%TEMP%\~exehead.tmp" `"..\reshacker.exe" -addoverwrite "$%TEMP%\~exehead.tmp", "$%TEMP%\~exehead.tmp", "setup.manifest", 24,1,1033`
!delfile "..\reshacker.log"
!delfile "..\reshacker.ini"
;--------------------------------
;Installer Attributes
;--------------------------------
@ -82,7 +92,7 @@ InstallDirRegKey HKLM "${MyRegPath}" "InstallLocation"
SetCompressor /SOLID LZMA
SetCompressorDictSize 64
!packhdr "$%TEMP%\exehead.tmp" '"${X264_UPX_PATH}\upx.exe" --brute "$%TEMP%\exehead.tmp"'
#!packhdr "$%TEMP%\exehead.tmp" '"${X264_UPX_PATH}\upx.exe" --brute "$%TEMP%\exehead.tmp"'
;--------------------------------

View File

@ -65,7 +65,7 @@ OutFile "${X264_OUTPUT_FILE}"
BrandingText "${X264_DATE} / Build #${X264_BUILD}"
Icon "${NSISDIR}\Contrib\Graphics\Icons\orange-install.ico"
ChangeUI all "${NSISDIR}\Contrib\UIs\sdbarker_tiny.exe"
ShowInstDetails show
ShowInstDetails nevershow
AutoCloseWindow true
InstallDir ""
@ -94,6 +94,7 @@ SubCaption 4 " "
ReserveFile "${NSISDIR}\Plugins\System.dll"
ReserveFile "${NSISDIR}\Plugins\StdUtils.dll"
ReserveFile "${NSISDIR}\Plugins\SelfDel.dll"
;--------------------------------
@ -128,6 +129,12 @@ Section "-LaunchTheInstaller"
InitPluginsDir
SetOutPath "$PLUGINSDIR"
${StdUtils.TestParameter} $R0 "Update"
${If} "$R0" == "true"
SetFileAttributes "$EXEPATH" FILE_ATTRIBUTE_NORMAL
SelfDel::del /RMDIR
${EndIf}
SetOverwrite on
File "/oname=${InstallerFileName}" "${X264_SOURCE_FILE}"
@ -194,6 +201,7 @@ Section "-LaunchTheInstaller"
SetDetailsPrint listonly
SetErrorLevel 1
SetOutPath "$TEMP"
Abort "Aborted."
; --------
@ -202,4 +210,5 @@ Section "-LaunchTheInstaller"
Delete /REBOOTOK "${InstallerFileName}"
SetErrorLevel 0
SetOutPath "$TEMP"
SectionEnd