Merge branch 'master' into release

[deb_libcec.git] / support / create-installer.cmd

diff --git a/support/create-installer.cmd b/support/create-installer.cmd
index 5023ddc3696b83bd36636bf3917f308ef0300afa..8c37a8f93a8317d4559782fb3bd64441c578c12c 100644 (file)
--- a/support/create-installer.cmd
+++ b/support/create-installer.cmd
@@ -23,7 +23,11 @@ IF "%VS100COMNTOOLS%"=="" (
 del /s /f /q ..\build
 mkdir ..\build
 
-call create-driver-installer.cmd
+IF EXIST "..\support\p8-usbcec-driver-installer.exe" (
+  copy "..\support\p8-usbcec-driver-installer.exe" "..\build\."
+) ELSE (
+  call create-driver-installer.cmd
+)
 
 mkdir ..\build\x64
 
@@ -67,9 +71,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 +84,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
@@ -92,16 +102,18 @@ del /q /f ..\build\libcec.x64.lib
 
 rem Check for sign-binary.cmd, only present on the Pulse-Eight production build system
 rem Calls signtool.exe and signs the DLLs with Pulse-Eight's code signing key
-IF NOT EXIST "..\support\sign-binary.cmd" GOTO CREATEINSTALLER
+IF NOT EXIST "..\support\private\sign-binary.cmd" GOTO CREATEINSTALLER
 echo. Signing all binaries
-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\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\private\sign-binary.cmd ..\build\cec-client.exe
+CALL ..\support\private\sign-binary.cmd ..\build\CecSharpTester.exe
+CALL ..\support\private\sign-binary.cmd ..\build\libcec.dll
+CALL ..\support\private\sign-binary.cmd ..\build\LibCecSharp.dll
+CALL ..\support\private\sign-binary.cmd ..\build\cec-config-gui.exe
+CALL ..\support\private\sign-binary.cmd ..\build\x64\cec-client.x64.exe
+CALL ..\support\private\sign-binary.cmd ..\build\x64\CecSharpTester.exe
+CALL ..\support\private\sign-binary.cmd ..\build\x64\libcec.x64.dll
+CALL ..\support\private\sign-binary.cmd ..\build\x64\LibCecSharp.dll
+CALL ..\support\private\sign-binary.cmd ..\build\x64\cec-config-gui.exe
 
 :CREATEINSTALLER
 echo. Creating the installer
@@ -110,9 +122,9 @@ echo. Creating the installer
 IF NOT EXIST "..\build\libCEC-installer.exe" GOTO :ERRORCREATINGINSTALLER
 
 rem Sign the installer if sign-binary.cmd exists
-IF EXIST "..\support\sign-binary.cmd" (
+IF EXIST "..\support\private\sign-binary.cmd" (
   echo. Signing the installer binaries
-  CALL ..\support\sign-binary.cmd ..\build\libCEC-installer.exe
+  CALL ..\support\private\sign-binary.cmd ..\build\libCEC-installer.exe
 )
 
 echo. The installer can be found here: ..\build\libCEC-installer.exe
@@ -137,6 +149,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