From 9f9d2c7b7ebccbfabb302c9d1cf699b06b71d401 Mon Sep 17 00:00:00 2001 From: Dan Halbert Date: Fri, 3 Aug 2018 22:02:15 -0400 Subject: [PATCH] do not install CPX drivers on win10 --- .../adafruit_circuit_playground_express.cat | Bin .../adafruit_circuit_playground_express.inf | 0 post_install.bat | 18 ++++++++++++++++++ 3 files changed, 18 insertions(+) rename drivers/{ => prewin10}/adafruit_circuit_playground_express.cat (100%) rename drivers/{ => prewin10}/adafruit_circuit_playground_express.inf (100%) diff --git a/drivers/adafruit_circuit_playground_express.cat b/drivers/prewin10/adafruit_circuit_playground_express.cat similarity index 100% rename from drivers/adafruit_circuit_playground_express.cat rename to drivers/prewin10/adafruit_circuit_playground_express.cat diff --git a/drivers/adafruit_circuit_playground_express.inf b/drivers/prewin10/adafruit_circuit_playground_express.inf similarity index 100% rename from drivers/adafruit_circuit_playground_express.inf rename to drivers/prewin10/adafruit_circuit_playground_express.inf diff --git a/post_install.bat b/post_install.bat index 6585177d..de1e613f 100644 --- a/post_install.bat +++ b/post_install.bat @@ -7,4 +7,22 @@ if "%PROCESSOR_ARCHITECTURE%" == "AMD64" ( ) ELSE ( drivers\dpinst-x86.exe %ARGS% ) + +@echo off +setlocal +for /f "tokens=4-5 delims=[.] " %%i in ('ver') do @(if %%i==Version (set VERSION=%%j) else (set VERSION=%%i)) +if %VERSION% GEQ 10 ( + exit /b 0 +) +endlocal + +REM dpinst /PATH has problems with relative paths, so use absolute path. +if "%PROCESSOR_ARCHITECTURE%" == "AMD64" ( + drivers\dpinst-amd64.exe /PATH %cd%\drivers\prewin10 %ARGS% +) ELSE IF "%PROCESSOR_ARCHITEW6432%" == "AMD64" ( + drivers\dpinst-amd64.exe /PATH %cd%\drivers\prewin10 %ARGS% +) ELSE ( + drivers/dpinst-x86.exe /PATH %cd%\drivers\prewin10 %ARGS% +) + exit /b 0