repositories
/
deb_libcec.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cec-config-gui: fix 'enabled' status of cbPortNumber now that libCEC no longer unsets...
[deb_libcec.git]
/
project
/
libCEC.nsi
diff --git
a/project/libCEC.nsi
b/project/libCEC.nsi
index 18038099f0cb82a88209767182c7dfe08031ab55..82a538c19958709409a677ec3dcf51aae0081123 100644
(file)
--- a/
project/libCEC.nsi
+++ b/
project/libCEC.nsi
@@
-59,6
+59,13
@@
Section "USB-CEC driver" SecDriver
RMDir "$1"
${EndIf}
RMDir "$1"
${EndIf}
+ ; Delete libcec.dll and libcec.x64.dll from the system directory
+ ; Let a seperate installer do this, when we need it
+ Delete "$SYSDIR\libcec.dll"
+ ${If} ${RunningX64}
+ Delete "$SYSDIR\libcec.x64.dll"
+ ${EndIf}
+
; Copy to the installation directory
SetOutPath "$INSTDIR"
File "..\AUTHORS"
; Copy to the installation directory
SetOutPath "$INSTDIR"
File "..\AUTHORS"
@@
-132,13
+139,6
@@
Section "libCEC" SecLibCec
; Copy the headers
SetOutPath "$INSTDIR\include"
File /r /x *.so "..\include\cec*.*"
; Copy the headers
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}
SectionEnd
Section "CEC debug client" SecCecClient
SectionEnd
Section "CEC debug client" SecCecClient
@@
-155,13
+155,14
@@
Section "CEC debug client" SecCecClient
SetOutPath "$INSTDIR"
CreateDirectory "$SMPROGRAMS\$StartMenuFolder"
SetOutPath "$INSTDIR"
CreateDirectory "$SMPROGRAMS\$StartMenuFolder"
- 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)."
${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)."
+ ${Else}
+ CreateShortCut "$SMPROGRAMS\$StartMenuFolder\CEC Test client.lnk" "$INSTDIR\cec-client.exe" \
+ "" "$INSTDIR\cec-client.exe" 0 SW_SHOWNORMAL \
+ "" "Start the CEC Test client."
${EndIf}
!insertmacro MUI_STARTMENU_WRITE_END
${EndIf}
!insertmacro MUI_STARTMENU_WRITE_END
@@
-181,13
+182,14
@@
Section "CEC configuration tool" SecCecConfig
SetOutPath "$INSTDIR"
CreateDirectory "$SMPROGRAMS\$StartMenuFolder"
SetOutPath "$INSTDIR"
CreateDirectory "$SMPROGRAMS\$StartMenuFolder"
- CreateShortCut "$SMPROGRAMS\$StartMenuFolder\CEC Adapter Configuration.lnk" "$INSTDIR\cec-config-gui.exe" \
- "" "$INSTDIR\cec-config-gui.exe" 0 SW_SHOWNORMAL \
- "" "Start the CEC Adapter Configuration tool."
${If} ${RunningX64}
CreateShortCut "$SMPROGRAMS\$StartMenuFolder\CEC Adapter Configuration (x64).lnk" "$INSTDIR\x64\cec-config-gui.exe" \
"" "$INSTDIR\x64\cec-config-gui.exe" 0 SW_SHOWNORMAL \
"" "Start the CEC Adapter Configuration tool (x64)."
${If} ${RunningX64}
CreateShortCut "$SMPROGRAMS\$StartMenuFolder\CEC Adapter Configuration (x64).lnk" "$INSTDIR\x64\cec-config-gui.exe" \
"" "$INSTDIR\x64\cec-config-gui.exe" 0 SW_SHOWNORMAL \
"" "Start the CEC Adapter Configuration tool (x64)."
+ ${Else}
+ CreateShortCut "$SMPROGRAMS\$StartMenuFolder\CEC Adapter Configuration.lnk" "$INSTDIR\cec-config-gui.exe" \
+ "" "$INSTDIR\cec-config-gui.exe" 0 SW_SHOWNORMAL \
+ "" "Start the CEC Adapter Configuration tool."
${EndIf}
!insertmacro MUI_STARTMENU_WRITE_END
${EndIf}
!insertmacro MUI_STARTMENU_WRITE_END
@@
-210,6
+212,10
@@
Section "Uninstall"
Delete "$INSTDIR\x64\*.lib"
Delete "$INSTDIR\x64\*.exe"
Delete "$INSTDIR\README"
Delete "$INSTDIR\x64\*.lib"
Delete "$INSTDIR\x64\*.exe"
Delete "$INSTDIR\README"
+ Delete "$SYSDIR\libcec.dll"
+ ${If} ${RunningX64}
+ Delete "$SYSDIR\libcec.x64.dll"
+ ${EndIf}
; Uninstall the driver
ReadRegStr $1 HKLM "Software\Pulse-Eight\USB-CEC Adapter driver" ""
; Uninstall the driver
ReadRegStr $1 HKLM "Software\Pulse-Eight\USB-CEC Adapter driver" ""