From 10c03f2c2ee8de84829e5b38e655a0a7b14c737a Mon Sep 17 00:00:00 2001 From: Lars Op den Kamp Date: Fri, 10 Feb 2012 20:19:17 +0100 Subject: [PATCH] added the new config tool to the installer --- project/libCEC.nsi | 37 ++++++++++++++++++++++-- src/cec-config-gui/cec-config-gui.csproj | 4 +-- support/create-installer.cmd | 9 ++++++ 3 files changed, 45 insertions(+), 5 deletions(-) diff --git a/project/libCEC.nsi b/project/libCEC.nsi index 2d73500..1803809 100644 --- a/project/libCEC.nsi +++ b/project/libCEC.nsi @@ -147,9 +147,9 @@ Section "CEC debug client" SecCecClient ; Copy to the installation directory SetOutPath "$INSTDIR" - File /x p8-usbcec-driver-installer.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" @@ -167,6 +167,32 @@ Section "CEC debug client" SecCecClient 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" + 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)." + ${EndIf} + !insertmacro MUI_STARTMENU_WRITE_END + +SectionEnd + ;-------------------------------- ;Uninstaller Section @@ -175,13 +201,14 @@ Section "Uninstall" SetShellVarContext current 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" ; Uninstall the driver @@ -196,6 +223,10 @@ Section "Uninstall" 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" diff --git a/src/cec-config-gui/cec-config-gui.csproj b/src/cec-config-gui/cec-config-gui.csproj index 84f4131..3dab4e5 100644 --- a/src/cec-config-gui/cec-config-gui.csproj +++ b/src/cec-config-gui/cec-config-gui.csproj @@ -9,7 +9,7 @@ prompt - bin\x64\Release\ + ..\..\build\ TRACE true pdbonly @@ -25,7 +25,7 @@ prompt - bin\x86\Release\ + ..\..\build\ TRACE true pdbonly diff --git a/support/create-installer.cmd b/support/create-installer.cmd index 5023ddc..1d76a37 100644 --- a/support/create-installer.cmd +++ b/support/create-installer.cmd @@ -67,9 +67,11 @@ echo. Cleaning LibCecSharp (x64) echo. Compiling LibCecSharp (x64) %COMPILER9% LibCecSharp.sln /build "Release|x64" /project LibCecSharp %COMPILER9% LibCecSharp.sln /build "Release|x64" /project CecSharpTester +%COMPILER9% LibCecSharp.sln /build "Release|x64" /project cec-config-gui copy ..\build\LibCecSharp.dll ..\build\x64\LibCecSharp.dll copy ..\build\CecSharpTester.exe ..\build\x64\CecSharpTester.exe +copy ..\build\cec-config-gui.exe ..\build\x64\cec-config-gui.exe :libcecsharpx86 rem Compile LibCecSharp (x86) @@ -78,11 +80,15 @@ echo. Cleaning LibCecSharp (x86) echo. Compiling LibCecSharp (x86) %COMPILER9% LibCecSharp.sln /build "Release|x86" /project LibCecSharp %COMPILER9% LibCecSharp.sln /build "Release|x86" /project CecSharpTester +%COMPILER9% LibCecSharp.sln /build "Release|x86" /project cec-config-gui :NOSDK9 rem Clean things up before creating the installer del /q /f ..\build\LibCecSharp.pdb del /q /f ..\build\CecSharpTester.pdb +del /q /f ..\build\cec-config-gui.pdb +del /q /f ..\build\cec-config-gui.vshost.exe.manifest +del /q /f ..\build\cec-config-gui.vshost.exe copy ..\build\cec-client.x64.exe ..\build\x64\cec-client.x64.exe del /q /f ..\build\cec-client.x64.exe copy ..\build\libcec.x64.dll ..\build\x64\libcec.x64.dll @@ -98,10 +104,12 @@ CALL ..\support\sign-binary.cmd ..\build\cec-client.exe CALL ..\support\sign-binary.cmd ..\build\CecSharpTester.exe CALL ..\support\sign-binary.cmd ..\build\libcec.dll CALL ..\support\sign-binary.cmd ..\build\LibCecSharp.dll +CALL ..\support\sign-binary.cmd ..\build\cec-config-gui.exe CALL ..\support\sign-binary.cmd ..\build\x64\cec-client.x64.exe CALL ..\support\sign-binary.cmd ..\build\x64\CecSharpTester.exe CALL ..\support\sign-binary.cmd ..\build\x64\libcec.x64.dll CALL ..\support\sign-binary.cmd ..\build\x64\LibCecSharp.dll +CALL ..\support\sign-binary.cmd ..\build\x64\cec-config-gui.exe :CREATEINSTALLER echo. Creating the installer @@ -137,6 +145,7 @@ echo. The installer could not be created. The most likely cause is that somethin :EXIT del /q /f ..\build\cec-client.exe del /q /f ..\build\CecSharpTester.exe +del /q /f ..\build\cec-config-gui.exe del /q /f ..\build\*.dll del /q /f ..\build\*.lib del /q /f ..\build\*.exp -- 2.34.1