repositories
/
deb_libcec.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cec: fixed - don't keep the mutex locked in CCECProcessor::Initialise()
[deb_libcec.git]
/
project
/
libCEC.nsi
diff --git
a/project/libCEC.nsi
b/project/libCEC.nsi
index 2ec8c069b126e23e1b4689b7a4910e98e787dfe9..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"
@@
-45,30
+45,42
@@
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
*.exe"
+ File
/x dpinst*.exe "..\build\
*.exe"
File "..\ChangeLog"
File "..\COPYING"
File "..\ChangeLog"
File "..\COPYING"
- File "..\libcec*.dll"
- File "..\libcec*.lib"
- File "..\LibCecSharp*.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"
; Copy to XBMC\system
ReadRegStr $1 HKCU "Software\XBMC" ""
${If} $1 != ""
SetOutPath "$1\system"
- File "..\libcec.dll"
+ File "..\
build\
libcec.dll"
${EndIf}
${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"
File /r /x *.so "..\include\cec*.*"
SetOutPath "$INSTDIR\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
@@
-83,7
+95,7
@@
Section "libCEC" SecLibCEC
"" "$INSTDIR\cec-client.exe" 0 SW_SHOWNORMAL \
"" "Start the CEC Test client."
${If} ${RunningX64}
"" "$INSTDIR\cec-client.exe" 0 SW_SHOWNORMAL \
"" "Start the CEC Test client."
${If} ${RunningX64}
- CreateShortCut "$SMPROGRAMS\$StartMenuFolder\CEC Test client (x64).lnk" "$INSTDIR\cec-client.x64.exe" \
+ 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}
"" "$INSTDIR\cec-client.x64.exe" 0 SW_SHOWNORMAL \
"" "Start the CEC Test client (x64)."
${EndIf}
@@
-141,7
+153,8
@@
Section "Uninstall"
Delete "$INSTDIR\COPYING"
Delete "$INSTDIR\*.dll"
Delete "$INSTDIR\*.lib"
Delete "$INSTDIR\COPYING"
Delete "$INSTDIR\*.dll"
Delete "$INSTDIR\*.lib"
- Delete "$INSTDIR\*.pdb"
+ 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"