repositories
/
deb_libcec.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
also updated the copyright years in posix-only files
[deb_libcec.git]
/
project
/
libCEC.nsi
diff --git
a/project/libCEC.nsi
b/project/libCEC.nsi
index 8fb714333b346ef35a46f9540973a503f5344b04..23f341afd69c169022c092eee8c10a8de271a654 100644
(file)
--- a/
project/libCEC.nsi
+++ b/
project/libCEC.nsi
@@
-8,7
+8,7
@@
!include "x64.nsh"
Name "libCEC"
!include "x64.nsh"
Name "libCEC"
-OutFile "libCEC-installer.exe"
+OutFile "
..\build\
libCEC-installer.exe"
XPStyle on
InstallDir "$PROGRAMFILES\libCEC"
XPStyle on
InstallDir "$PROGRAMFILES\libCEC"
@@
-16,7
+16,7
@@
InstallDirRegKey HKCU "Software\libCEC" ""
RequestExecutionLevel admin
Var StartMenuFolder
RequestExecutionLevel admin
Var StartMenuFolder
-!define MUI_FINISHPAGE_LINK "
Please v
isit http://www.pulse-eight.com/ for more information."
+!define MUI_FINISHPAGE_LINK "
V
isit http://www.pulse-eight.com/ for more information."
!define MUI_FINISHPAGE_LINK_LOCATION "http://www.pulse-eight.com/"
!define MUI_ABORTWARNING
!define MUI_FINISHPAGE_LINK_LOCATION "http://www.pulse-eight.com/"
!define MUI_ABORTWARNING
@@
-45,23
+45,41
@@
Section "libCEC" SecLibCEC
SetShellVarContext current
SectionIn RO
SectionIn 1 #section is in installtype Full
SetShellVarContext current
SectionIn RO
SectionIn 1 #section is in installtype Full
+
+ ; Copy to the installation directory
SetOutPath "$INSTDIR"
File "..\AUTHORS"
SetOutPath "$INSTDIR"
File "..\AUTHORS"
- File
"..\cec-client
.exe"
+ File
/x dpinst*.exe "..\build\*
.exe"
File "..\ChangeLog"
File "..\COPYING"
File "..\ChangeLog"
File "..\COPYING"
- File "..\libcec.dll"
- File "..\libcec.lib"
- File "..\libcec.pdb"
- File "..\pthreadVC2.dll"
File "..\README"
File "..\README"
+ File "..\build\*.dll"
+ SetOutPath "$INSTDIR\x64"
+ File /nonfatal "..\build\x64\*"
+
+ ; Copy to XBMC\system
+ ReadRegStr $1 HKCU "Software\XBMC" ""
+ ${If} $1 != ""
+ SetOutPath "$1\system"
+ File "..\build\libcec.dll"
+ ${EndIf}
+ ; Copy the driver installer and .inf file
SetOutPath "$INSTDIR\driver"
SetOutPath "$INSTDIR\driver"
- File "..\dpinst-amd64.exe"
- File "..\dpinst-x86.exe"
+ File "..\
build\
dpinst-amd64.exe"
+ File "..\
build\
dpinst-x86.exe"
File "..\OEM001.inf"
File "..\OEM001.inf"
+
+ ; Copy the headers
SetOutPath "$INSTDIR\include"
SetOutPath "$INSTDIR\include"
- File /r /x *.so "..\include\*.*"
+ File /r /x *.so "..\include\cec*.*"
+
+ ; Copy libcec.dll and libcec.x64.dll to the system directory
+ SetOutPath "$SYSDIR"
+ File "..\build\libcec.dll"
+ ${If} ${RunningX64}
+ File /nonfatal "..\build\x64\libcec.x64.dll"
+ ${EndIf}
;Store installation folder
WriteRegStr HKCU "Software\libCEC" "" $INSTDIR
;Store installation folder
WriteRegStr HKCU "Software\libCEC" "" $INSTDIR
@@
-76,6
+94,11
@@
Section "libCEC" SecLibCEC
CreateShortCut "$SMPROGRAMS\$StartMenuFolder\CEC Test client.lnk" "$INSTDIR\cec-client.exe" \
"" "$INSTDIR\cec-client.exe" 0 SW_SHOWNORMAL \
"" "Start the CEC Test client."
CreateShortCut "$SMPROGRAMS\$StartMenuFolder\CEC Test client.lnk" "$INSTDIR\cec-client.exe" \
"" "$INSTDIR\cec-client.exe" 0 SW_SHOWNORMAL \
"" "Start the CEC Test client."
+ ${If} ${RunningX64}
+ CreateShortCut "$SMPROGRAMS\$StartMenuFolder\CEC Test client (x64).lnk" "$INSTDIR\x64\cec-client.x64.exe" \
+ "" "$INSTDIR\cec-client.x64.exe" 0 SW_SHOWNORMAL \
+ "" "Start the CEC Test client (x64)."
+ ${EndIf}
CreateShortCut "$SMPROGRAMS\$StartMenuFolder\Uninstall libCEC.lnk" "$INSTDIR\Uninstall.exe" \
"" "$INSTDIR\Uninstall.exe" 0 SW_SHOWNORMAL \
"" "Uninstall libCEC."
CreateShortCut "$SMPROGRAMS\$StartMenuFolder\Uninstall libCEC.lnk" "$INSTDIR\Uninstall.exe" \
"" "$INSTDIR\Uninstall.exe" 0 SW_SHOWNORMAL \
"" "Uninstall libCEC."
@@
-125,13
+148,13
@@
Section "Uninstall"
ExecWait '"$INSTDIR\driver\dpinst-x64.exe" /u "$INSTDIR\driver\OEM001.inf"'
${EndIf}
Delete "$INSTDIR\AUTHORS"
ExecWait '"$INSTDIR\driver\dpinst-x64.exe" /u "$INSTDIR\driver\OEM001.inf"'
${EndIf}
Delete "$INSTDIR\AUTHORS"
- Delete "$INSTDIR\cec
-client
.exe"
+ Delete "$INSTDIR\cec
*
.exe"
Delete "$INSTDIR\ChangeLog"
Delete "$INSTDIR\COPYING"
Delete "$INSTDIR\ChangeLog"
Delete "$INSTDIR\COPYING"
- Delete "$INSTDIR\
libcec
.dll"
- Delete "$INSTDIR\
libcec
.lib"
- Delete "$INSTDIR\
libcec.pdb
"
- Delete "$INSTDIR\
pthreadVC2.dll
"
+ Delete "$INSTDIR\
*
.dll"
+ Delete "$INSTDIR\
*
.lib"
+ Delete "$INSTDIR\
x64\*.dll
"
+ Delete "$INSTDIR\
x64\*.lib
"
Delete "$INSTDIR\README"
Delete "$INSTDIR\driver\OEM001.inf"
Delete "$INSTDIR\driver\dpinst-amd64.exe"
Delete "$INSTDIR\README"
Delete "$INSTDIR\driver\OEM001.inf"
Delete "$INSTDIR\driver\dpinst-amd64.exe"
@@
-143,6
+166,9
@@
Section "Uninstall"
!insertmacro MUI_STARTMENU_GETFOLDER Application $StartMenuFolder
Delete "$SMPROGRAMS\$StartMenuFolder\CEC Test client.lnk"
!insertmacro MUI_STARTMENU_GETFOLDER Application $StartMenuFolder
Delete "$SMPROGRAMS\$StartMenuFolder\CEC Test client.lnk"
+ ${If} ${RunningX64}
+ Delete "$SMPROGRAMS\$StartMenuFolder\CEC Test client (x64).lnk"
+ ${EndIf}
Delete "$SMPROGRAMS\$StartMenuFolder\Uninstall libCEC.lnk"
Delete "$SMPROGRAMS\$StartMenuFolder\Visit Pulse-Eight.url"
RMDir "$SMPROGRAMS\$StartMenuFolder"
Delete "$SMPROGRAMS\$StartMenuFolder\Uninstall libCEC.lnk"
Delete "$SMPROGRAMS\$StartMenuFolder\Visit Pulse-Eight.url"
RMDir "$SMPROGRAMS\$StartMenuFolder"