X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=project%2FlibCEC.nsi;h=82a538c19958709409a677ec3dcf51aae0081123;hb=8cdaa0596e85ac4d3997be1e1f0d142e5b1c38ee;hp=bf14ee0631d46840f784a7cb185cc5c03f3ce2f1;hpb=d4954fb707149c68b7c17e465c5358a69db0449c;p=deb_libcec.git diff --git a/project/libCEC.nsi b/project/libCEC.nsi index bf14ee0..82a538c 100644 --- a/project/libCEC.nsi +++ b/project/libCEC.nsi @@ -7,12 +7,12 @@ !include "LogicLib.nsh" !include "x64.nsh" -Name "libCEC" +Name "Pulse-Eight USB-CEC Adapter" OutFile "..\build\libCEC-installer.exe" XPStyle on -InstallDir "$PROGRAMFILES\libCEC" -InstallDirRegKey HKCU "Software\libCEC" "" +InstallDir "$PROGRAMFILES\Pulse-Eight\USB-CEC Adapter" +InstallDirRegKey HKLM "Software\Pulse-Eight\USB-CEC Adapter software" "" RequestExecutionLevel admin Var StartMenuFolder @@ -25,8 +25,8 @@ Var StartMenuFolder !insertmacro MUI_PAGE_COMPONENTS !insertmacro MUI_PAGE_DIRECTORY -!define MUI_STARTMENUPAGE_REGISTRY_ROOT "HKCU" -!define MUI_STARTMENUPAGE_REGISTRY_KEY "Software\libCEC" +!define MUI_STARTMENUPAGE_REGISTRY_ROOT "HKLM" +!define MUI_STARTMENUPAGE_REGISTRY_KEY "Software\Pulse-Eight\USB-CEC Adapter sofware" !define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "Start Menu Folder" !insertmacro MUI_PAGE_STARTMENU Application $StartMenuFolder @@ -49,20 +49,34 @@ Section "USB-CEC driver" SecDriver SectionIn RO SectionIn 1 2 3 + ; Uninstall the old unsigned software if it's found + ReadRegStr $1 HKCU "Software\libCEC" "" + ${If} $1 != "" + MessageBox MB_OK \ + "A previous libCEC and USB-CEC driver was found. This update requires the old version to be uninstalled. Press OK to uninstall the old version." + ExecWait '"$1\Uninstall.exe" /S _?=$1' + Delete "$1\Uninstall.exe" + 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" File "..\COPYING" - ; Copy the driver installer and .inf file + ; Copy the driver installer SetOutPath "$INSTDIR\driver" - File "..\build\dpinst-amd64.exe" - File "..\build\dpinst-x86.exe" - File "..\driver\p8usb-cec.inf" - File "..\driver\p8usb-cec.cat" + File "..\build\p8-usbcec-driver-installer.exe" ;Store installation folder - WriteRegStr HKCU "Software\libCEC" "" $INSTDIR + WriteRegStr HKLM "Software\Pulse-Eight\USB-CEC Adapter software" "" $INSTDIR ;Create uninstaller WriteUninstaller "$INSTDIR\Uninstall.exe" @@ -71,39 +85,36 @@ Section "USB-CEC driver" SecDriver SetOutPath "$INSTDIR" CreateDirectory "$SMPROGRAMS\$StartMenuFolder" - CreateShortCut "$SMPROGRAMS\$StartMenuFolder\Uninstall libCEC.lnk" "$INSTDIR\Uninstall.exe" \ + CreateShortCut "$SMPROGRAMS\$StartMenuFolder\Uninstall Pulse-Eight USB-CEC Adapter software.lnk" "$INSTDIR\Uninstall.exe" \ "" "$INSTDIR\Uninstall.exe" 0 SW_SHOWNORMAL \ - "" "Uninstall libCEC." + "" "Uninstall Pulse-Eight USB-CEC Adapter software." WriteINIStr "$SMPROGRAMS\$StartMenuFolder\Visit Pulse-Eight.url" "InternetShortcut" "URL" "http://www.pulse-eight.com/" !insertmacro MUI_STARTMENU_WRITE_END ;add entry to add/remove programs - WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\libCEC" \ - "DisplayName" "libCEC" - WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\libCEC" \ + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Pulse-Eight USB-CEC Adapter sofware" \ + "DisplayName" "Pulse-Eight USB-CEC Adapter software" + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Pulse-Eight USB-CEC Adapter sofware" \ "UninstallString" "$INSTDIR\uninstall.exe" - WriteRegDWORD HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\libCEC" \ + WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Pulse-Eight USB-CEC Adapter sofware" \ "NoModify" 1 - WriteRegDWORD HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\libCEC" \ + WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Pulse-Eight USB-CEC Adapter sofware" \ "NoRepair" 1 - WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\libCEC" \ + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Pulse-Eight USB-CEC Adapter sofware" \ "InstallLocation" "$INSTDIR" - WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\libCEC" \ + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Pulse-Eight USB-CEC Adapter sofware" \ "DisplayIcon" "$INSTDIR\cec-client.exe,0" - WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\libCEC" \ - "Publisher" "Pulse-Eight Ltd." - WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\libCEC" \ + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Pulse-Eight USB-CEC Adapter sofware" \ + "Publisher" "Pulse-Eight Limited" + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Pulse-Eight USB-CEC Adapter sofware" \ "HelpLink" "http://www.pulse-eight.com/" - WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\libCEC" \ + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Pulse-Eight USB-CEC Adapter sofware" \ "URLInfoAbout" "http://www.pulse-eight.com" ;install driver - ${If} ${RunningX64} - ExecWait '"$INSTDIR\driver\dpinst-amd64.exe" /lm /sa /sw /PATH "$INSTDIR\driver"' - ${Else} - ExecWait '"$INSTDIR\driver\dpinst-x86.exe" /lm /sa /sw /PATH "$INSTDIR\driver"' - ${EndIf} + ExecWait '"$INSTDIR\driver\p8-usbcec-driver-installer.exe" /S' + Delete "$INSTDIR\driver\p8-usbcec-driver-installer.exe" SectionEnd Section "libCEC" SecLibCec @@ -128,13 +139,6 @@ Section "libCEC" SecLibCec ; 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 @@ -143,21 +147,49 @@ Section "CEC debug client" SecCecClient ; Copy to the installation directory SetOutPath "$INSTDIR" - File /x dpinst*.exe "..\build\*.exe" + File /x p8-usbcec-driver-installer.exe /x cec-config-gui.exe "..\build\*.exe" SetOutPath "$INSTDIR\x64" - File /nonfatal "..\build\x64\*.exe" + File /nonfatal /x cec-config-gui.exe "..\build\x64\*.exe" !insertmacro MUI_STARTMENU_WRITE_BEGIN Application 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)." + ${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 + +SectionEnd + +Section "CEC configuration tool" SecCecConfig + SetShellVarContext current + SectionIn 1 3 + + ; Copy to the installation directory + SetOutPath "$INSTDIR" + File "..\build\cec-config-gui.exe" + SetOutPath "$INSTDIR\x64" + File /nonfatal "..\build\x64\cec-config-gui.exe" + + !insertmacro MUI_STARTMENU_WRITE_BEGIN Application + SetOutPath "$INSTDIR" + + CreateDirectory "$SMPROGRAMS\$StartMenuFolder" + ${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 @@ -170,40 +202,47 @@ Section "Uninstall" SetShellVarContext current - ${If} ${RunningX64} - ExecWait '"$INSTDIR\driver\dpinst-amd64.exe" /u "$INSTDIR\driver\p8usb-cec.inf"' - ${Else} - ExecWait '"$INSTDIR\driver\dpinst-x64.exe" /u "$INSTDIR\driver\p8usb-cec.inf"' - ${EndIf} Delete "$INSTDIR\AUTHORS" - Delete "$INSTDIR\cec*.exe" + Delete "$INSTDIR\*.exe" Delete "$INSTDIR\ChangeLog" Delete "$INSTDIR\COPYING" Delete "$INSTDIR\*.dll" Delete "$INSTDIR\*.lib" Delete "$INSTDIR\x64\*.dll" Delete "$INSTDIR\x64\*.lib" + Delete "$INSTDIR\x64\*.exe" Delete "$INSTDIR\README" - Delete "$INSTDIR\driver\p8usb-cec.inf" - Delete "$INSTDIR\driver\p8usb-cec.cat" - Delete "$INSTDIR\driver\dpinst-amd64.exe" - Delete "$INSTDIR\driver\dpinst-x86.exe" + 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" "" + ${If} $1 != "" + ExecWait '"$1\Uninstall.exe" /S _?=$1' + ${EndIf} RMDir /r "$INSTDIR\include" Delete "$INSTDIR\Uninstall.exe" RMDir /r "$INSTDIR" + RMDir "$PROGRAMFILES\Pulse-Eight" !insertmacro MUI_STARTMENU_GETFOLDER Application $StartMenuFolder + Delete "$SMPROGRAMS\$StartMenuFolder\CEC Adapter Configuration.lnk" + ${If} ${RunningX64} + Delete "$SMPROGRAMS\$StartMenuFolder\CEC Adapter Configuration (x64).lnk" + ${EndIf} 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\Uninstall Pulse-Eight USB-CEC Adapter software.lnk" Delete "$SMPROGRAMS\$StartMenuFolder\Visit Pulse-Eight.url" - RMDir "$SMPROGRAMS\$StartMenuFolder" - - DeleteRegKey HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\libCEC" - - DeleteRegKey /ifempty HKCU "Software\libCEC" + RMDir "$SMPROGRAMS\$StartMenuFolder" + DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Pulse-Eight USB-CEC Adapter sofware" + DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Pulse-Eight USB-CEC Adapter driver" + DeleteRegKey /ifempty HKLM "Software\Pulse-Eight\USB-CEC Adapter software" + DeleteRegKey /ifempty HKLM "Software\Pulse-Eight" SectionEnd