X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=support%2Fcreate-installer.bat;h=b4d1ca7100cfb744cd86b69b2483511e0386b0f2;hb=63a0b02bd5b8432353e9848468d3b0cf64012c93;hp=8c37a8f93a8317d4559782fb3bd64441c578c12c;hpb=29b0e8dd959f007f2646783147328fadbd671c7c;p=deb_libcec.git

diff --git a/support/create-installer.bat b/support/create-installer.bat
index 8c37a8f..b4d1ca7 100644
--- a/support/create-installer.bat
+++ b/support/create-installer.bat
@@ -1,5 +1,7 @@
 @echo off
 
+set EXITCODE=1
+
 rem Check for NSIS
 IF EXIST "%ProgramFiles%\NSIS\makensis.exe" (
   set NSIS="%ProgramFiles%\NSIS\makensis.exe"
@@ -7,10 +9,6 @@ IF EXIST "%ProgramFiles%\NSIS\makensis.exe" (
   set NSIS="%ProgramFiles(x86)%\NSIS\makensis.exe"
 ) ELSE GOTO NONSIS
 
-rem Check for the Windows DDK
-IF NOT EXIST "C:\WinDDK\7600.16385.1" GOTO NODDK
-set DDK="C:\WinDDK\7600.16385.1"
-
 rem Check for VC10
 IF "%VS100COMNTOOLS%"=="" (
   set COMPILER10="%ProgramFiles%\Microsoft Visual Studio 10.0\Common7\IDE\VCExpress.exe"
@@ -26,6 +24,10 @@ mkdir ..\build
 IF EXIST "..\support\p8-usbcec-driver-installer.exe" (
   copy "..\support\p8-usbcec-driver-installer.exe" "..\build\."
 ) ELSE (
+  rem Check for the Windows DDK
+  IF NOT EXIST "C:\WinDDK\7600.16385.1" GOTO NODDK
+  set DDK="C:\WinDDK\7600.16385.1"
+
   call create-driver-installer.cmd
 )
 
@@ -56,8 +58,6 @@ echo. Compiling cec-client (x86)
 rem Check for VC9
 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
@@ -127,8 +127,14 @@ IF EXIST "..\support\private\sign-binary.cmd" (
   CALL ..\support\private\sign-binary.cmd ..\build\libCEC-installer.exe
 )
 
-echo. The installer can be found here: ..\build\libCEC-installer.exe
+IF "%1%"=="" (
+  echo. The installer can be found here: ..\build\libCEC-installer.exe
+) ELSE (
+  move ..\build\libCEC-installer.exe ..\build\libCEC-%1%-installer.exe
+  echo. The installer can be found here: ..\build\libCEC-%1%-installer.exe
+)
 
+set EXITCODE=0
 GOTO EXIT
 
 :NOSDK10
@@ -155,4 +161,11 @@ del /q /f ..\build\*.lib
 del /q /f ..\build\*.exp
 del /s /f /q ..\build\x64
 rmdir ..\build\x64
-cd ..\support
\ No newline at end of file
+cd ..\support
+
+IF "%1%"=="" (
+  echo. exitcode = %EXITCODE%
+) ELSE (
+  exit %EXITCODE%
+)
+