X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=project%2Fcreate-installer.cmd;h=78daa7ef8039112107265e27ad3544929028e5b5;hb=7ebbb1a62355c2819caa42e28b081eff027b336d;hp=5187528a28c53886cc1e54b24e08394d84e7a394;hpb=f93e2ad3647a1fa5f3ce60908a18e6dfea1d1193;p=deb_libcec.git

diff --git a/project/create-installer.cmd b/project/create-installer.cmd
index 5187528..78daa7e 100644
--- a/project/create-installer.cmd
+++ b/project/create-installer.cmd
@@ -1,31 +1,59 @@
 @echo off
 
-set NSIS="C:\Program Files (x86)\NSIS\makensis.exe"
-set DDK=C:\WinDDK\7600.16385.1
+IF EXIST "%ProgramFiles%\NSIS\makensis.exe" (
+  set NSIS="%ProgramFiles%\NSIS\makensis.exe"
+) ELSE IF EXIST "%ProgramFiles(x86)%\NSIS\makensis.exe" (
+  set NSIS="%ProgramFiles(x86)%\NSIS\makensis.exe"
+) ELSE GOTO NONSIS
+
+IF NOT EXIST "C:\WinDDK\7600.16385.1" GOTO NODDK
+set DDK="C:\WinDDK\7600.16385.1"
 
 IF "%VS100COMNTOOLS%"=="" (
-  set COMPILER="%ProgramFiles%\Microsoft Visual Studio 10.0\Common7\IDE\VCExpress.exe"
+  set COMPILER10="%ProgramFiles%\Microsoft Visual Studio 10.0\Common7\IDE\VCExpress.exe"
 ) ELSE IF EXIST "%VS100COMNTOOLS%\..\IDE\VCExpress.exe" (
-  set COMPILER="%VS100COMNTOOLS%\..\IDE\VCExpress.exe"
+  set COMPILER10="%VS100COMNTOOLS%\..\IDE\VCExpress.exe"
 ) ELSE IF EXIST "%VS100COMNTOOLS%\..\IDE\devenv.exe" (
-  set COMPILER="%VS100COMNTOOLS%\..\IDE\devenv.exe"
+  set COMPILER10="%VS100COMNTOOLS%\..\IDE\devenv.exe"
 )
 
-rem Compile libCEC
 echo Cleaning libCEC
-%COMPILER% libcec.sln /clean Release
-
+%COMPILER10% libcec.sln /clean Release
 echo Compiling libCEC
-%COMPILER% libcec.sln /clean Release
-%COMPILER% libcec.sln /build Release
+%COMPILER10% libcec.sln /build Release /project libcec
+echo Compiling cec-client
+%COMPILER10% libcec.sln /build Release /project testclient
+echo Compiling LibCecSharp
+%COMPILER10% libcec.sln /build Release /project LibCecSharp
+
+IF "%VS90COMNTOOLS%"=="" (
+  set COMPILER9="%ProgramFiles%\Microsoft Visual Studio 9.0\Common7\IDE\VCExpress.exe"
+) ELSE IF EXIST "%VS90COMNTOOLS%\..\IDE\VCExpress.exe" (
+  set COMPILER9="%VS90COMNTOOLS%\..\IDE\VCExpress.exe"
+) ELSE IF EXIST "%VS90COMNTOOLS%\..\IDE\devenv.exe" (
+  set COMPILER9="%VS90COMNTOOLS%\..\IDE\devenv.exe"
+) ELSE GOTO NOSDK9
+
+echo Compiling LibCecSharp.Net2
+%COMPILER9% LibCecSharp.Net2.sln /build Release
 
-rem Copy driver installer
+:NOSDK9
 echo Copying driver installer
 copy "%DDK%\redist\DIFx\dpinst\MultiLin\amd64\dpinst.exe" ..\dpinst-amd64.exe
 copy "%DDK%\redist\DIFx\dpinst\MultiLin\x86\dpinst.exe" ..\dpinst-x86.exe
 
-rem Run the NSIS installer
 echo Creating the installer
 %NSIS% /V1 /X"SetCompressor /FINAL lzma" "libCEC.nsi"
 
-echo The installer can be found here: libCEC-installer.exe
\ No newline at end of file
+echo The installer can be found here: libCEC-installer.exe
+
+GOTO EXIT
+
+:NOSIS
+echo NSIS could not be found on your system.
+GOTO EXIT
+
+:NODDK
+echo Windows DDK could not be found on your system
+
+:EXIT
\ No newline at end of file