Skip to content

Commit d196488

Browse files
committed
added: .Net applications
1 parent bcccaec commit d196488

File tree

4 files changed

+54
-2
lines changed

4 files changed

+54
-2
lines changed

.gitmodules

+3
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,6 @@
44
[submodule "support"]
55
path = support
66
url = https://github.com/Pulse-Eight/libcec-support.git
7+
[submodule "src/dotnet"]
8+
path = src/dotnet
9+
url = https://github.com/Pulse-Eight/cec-dotnet.git

project/libCEC.nsi

+34-2
Original file line numberDiff line numberDiff line change
@@ -141,9 +141,11 @@ Section "CEC Debug Client" SecCecClient
141141

142142
; Copy to the installation directory
143143
SetOutPath "$INSTDIR"
144-
File "..\build\x86\*.exe"
144+
File "..\build\x86\cec-client.exe"
145+
File "..\build\x86\cecc-client.exe"
145146
SetOutPath "$INSTDIR\x64"
146-
File /nonfatal "..\build\amd64\*.exe"
147+
File /nonfatal "..\build\amd64\cec-client.exe"
148+
File /nonfatal "..\build\amd64\cecc-client.exe"
147149

148150
!insertmacro MUI_STARTMENU_WRITE_BEGIN Application
149151
SetOutPath "$INSTDIR"
@@ -162,6 +164,35 @@ Section "CEC Debug Client" SecCecClient
162164

163165
SectionEnd
164166

167+
Section "libCEC Tray" SecDotNet
168+
SetShellVarContext current
169+
SectionIn 1 3
170+
171+
; Copy to the installation directory
172+
SetOutPath "$INSTDIR"
173+
File "..\build\x86\CecSharpTester.exe"
174+
File "..\build\x86\cec-tray.exe"
175+
SetOutPath "$INSTDIR\x64"
176+
File /nonfatal "..\build\amd64\CecSharpTester.exe"
177+
File /nonfatal "..\build\amd64\cec-tray.exe"
178+
179+
!insertmacro MUI_STARTMENU_WRITE_BEGIN Application
180+
SetOutPath "$INSTDIR"
181+
182+
CreateDirectory "$SMPROGRAMS\$StartMenuFolder"
183+
${If} ${RunningX64}
184+
CreateShortCut "$SMPROGRAMS\$StartMenuFolder\cec-tray.lnk" "$INSTDIR\x64\cec-tray.exe" \
185+
"" "$INSTDIR\x64\cec-tray.exe" 0 SW_SHOWNORMAL \
186+
"" "Start libCEC Tray (x64)."
187+
${Else}
188+
CreateShortCut "$SMPROGRAMS\$StartMenuFolder\cec-tray.lnk" "$INSTDIR\cec-tray.exe" \
189+
"" "$INSTDIR\cec-tray.exe" 0 SW_SHOWNORMAL \
190+
"" "Start libCEC Tray."
191+
${EndIf}
192+
!insertmacro MUI_STARTMENU_WRITE_END
193+
194+
SectionEnd
195+
165196
Section "Python bindings" SecPythonCec
166197
SetShellVarContext current
167198
SectionIn 1 3
@@ -319,6 +350,7 @@ Section "Uninstall"
319350
${If} ${RunningX64}
320351
Delete "$SMPROGRAMS\$StartMenuFolder\libCEC Tray (x64).lnk"
321352
${EndIf}
353+
Delete "$SMPROGRAMS\$StartMenuFolder\cec-tray.lnk"
322354
Delete "$SMPROGRAMS\$StartMenuFolder\CEC Test client.lnk"
323355
${If} ${RunningX64}
324356
Delete "$SMPROGRAMS\$StartMenuFolder\CEC Test client (x64).lnk"

src/dotnet

Submodule dotnet added at 7379455

windows/create-installer.cmd

+16
Original file line numberDiff line numberDiff line change
@@ -43,14 +43,26 @@ echo. Cleaning libCEC (x64)
4343
echo. Compiling libCEC (x64)
4444
%COMPILER12% libcec.sln /Build "Release|x64" /Project LibCecSharp
4545
%COMPILER12% libcec.sln /Build "Release|x64"
46+
echo. Compiling .Net applications
47+
cd "%MYDIR%..\src\dotnet\project"
48+
%COMPILER12% cec-dotnet.sln /Build "Release|x64"
49+
copy ..\build\amd64\CecSharpTester.exe %MYDIR%..\build\amd64\CecSharpTester.exe
50+
copy ..\build\amd64\cec-tray.exe %MYDIR%..\build\amd64\cec-tray.exe
4651

4752
:libcecx86
4853
rem Compile libCEC and cec-client Win32
54+
cd "%MYDIR%..\project"
4955
echo. Cleaning libCEC (x86)
5056
%COMPILER12% libcec.sln /Clean "Release|x86"
5157
echo. Compiling libCEC (x86)
5258
%COMPILER12% libcec.sln /Build "Release|x86" /Project LibCecSharp
5359
%COMPILER12% libcec.sln /Build "Release|x86"
60+
echo. Compiling .Net applications
61+
cd "%MYDIR%..\src\dotnet\project"
62+
%COMPILER12% cec-dotnet.sln /Build "Release|x86"
63+
copy ..\build\x86\CecSharpTester.exe %MYDIR%..\build\x86\CecSharpTester.exe
64+
copy ..\build\x86\cec-tray.exe %MYDIR%..\build\x86\cec-tray.exe
65+
cd "%MYDIR%..\project"
5466

5567
rem Clean things up before creating the installer
5668
del /q /f %MYDIR%..\build\x86\LibCecSharp.pdb
@@ -64,10 +76,14 @@ CALL ..\support\private\sign-binary.cmd %MYDIR%..\build\x86\cec.dll
6476
CALL ..\support\private\sign-binary.cmd %MYDIR%..\build\x86\LibCecSharp.dll
6577
CALL ..\support\private\sign-binary.cmd %MYDIR%..\build\x86\cec-client.exe
6678
CALL ..\support\private\sign-binary.cmd %MYDIR%..\build\x86\cecc-client.exe
79+
CALL ..\support\private\sign-binary.cmd %MYDIR%..\build\x86\cec-tray.exe
80+
CALL ..\support\private\sign-binary.cmd %MYDIR%..\build\x86\CecSharpTester.exe
6781
CALL ..\support\private\sign-binary.cmd %MYDIR%..\build\amd64\cec.dll
6882
CALL ..\support\private\sign-binary.cmd %MYDIR%..\build\amd64\LibCecSharp.dll
6983
CALL ..\support\private\sign-binary.cmd %MYDIR%..\build\amd64\cec-client.exe
7084
CALL ..\support\private\sign-binary.cmd %MYDIR%..\build\amd64\cecc-client.exe
85+
CALL ..\support\private\sign-binary.cmd %MYDIR%..\build\amd64\cec-tray.exe
86+
CALL ..\support\private\sign-binary.cmd %MYDIR%..\build\amd64\CecSharpTester.exe
7187

7288
:CREATEINSTALLER
7389
echo. Creating the installer

0 commit comments

Comments
 (0)