From 51c410c1c952e0e9bcf1b2c438813de63753be5f Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Sun, 28 Nov 2010 00:24:54 -0800 Subject: [PATCH] windows: Update NSIS installer file to use compatibility IDs This allows the file to contain a single InitDriverSetup function, making things shorter and (I hope) clearer. --- altosui/altos-windows.nsi | 32 ++++++-------------------------- 1 file changed, 6 insertions(+), 26 deletions(-) diff --git a/altosui/altos-windows.nsi b/altosui/altos-windows.nsi index 9bbfb885..6f296f18 100644 --- a/altosui/altos-windows.nsi +++ b/altosui/altos-windows.nsi @@ -32,39 +32,22 @@ UninstPage instfiles Section "Install Driver" InstDriver - InstDrv::InitDriverSetup /NOUNLOAD {4D36E96D-E325-11CE-BFC1-08002BE10318} USB\VID_FFFE&PID_000A + InstDrv::InitDriverSetup /NOUNLOAD {4D36E96D-E325-11CE-BFC1-08002BE10318} AltusMetrumSerial Pop $0 DetailPrint "InitDriverSetup: $0" InstDrv::DeleteOemInfFiles /NOUNLOAD InstDrv::CreateDevice /NOUNLOAD - InstDrv::InitDriverSetup /NOUNLOAD {4D36E96D-E325-11CE-BFC1-08002BE10318} USB\VID_FFFE&PID_000B - Pop $0 - DetailPrint "InitDriverSetup: $0" - InstDrv::DeleteOemInfFiles /NOUNLOAD - InstDrv::CreateDevice /NOUNLOAD - - InstDrv::InitDriverSetup /NOUNLOAD {4D36E96D-E325-11CE-BFC1-08002BE10318} USB\VID_FFFE&PID_000C - Pop $0 - DetailPrint "InitDriverSetup: $0" - InstDrv::DeleteOemInfFiles /NOUNLOAD - InstDrv::CreateDevice /NOUNLOAD - - InstDrv::InitDriverSetup /NOUNLOAD {4D36E96D-E325-11CE-BFC1-08002BE10318} USB\VID_FFFE&PID_000D - Pop $0 - DetailPrint "InitDriverSetup: $0" - InstDrv::DeleteOemInfFiles /NOUNLOAD - InstDrv::CreateDevice /NOUNLOAD - - SetOutPath $WINDIR\Inf - File "../telemetrum.inf" - SetOutPath $TEMP File "../telemetrum.inf" InstDrv::InstallDriver /NOUNLOAD "$TEMP\telemetrum.inf" SetOutPath $INSTDIR File "../telemetrum.inf" + + SetOutPath $WINDIR\Inf + File "../telemetrum.inf" + SectionEnd Section "AltosUI Application" @@ -127,10 +110,7 @@ Section "Uninstall" RMDir "$INSTDIR" ; Remove devices - InstDrv::InitDriverSetup /NOUNLOAD {4D36E96D-E325-11CE-BFC1-08002BE10318} USB\VID_FFFE&PID_000A - InstDrv::InitDriverSetup /NOUNLOAD {4D36E96D-E325-11CE-BFC1-08002BE10318} USB\VID_FFFE&PID_000B - InstDrv::InitDriverSetup /NOUNLOAD {4D36E96D-E325-11CE-BFC1-08002BE10318} USB\VID_FFFE&PID_000C - InstDrv::InitDriverSetup /NOUNLOAD {4D36E96D-E325-11CE-BFC1-08002BE10318} USB\VID_FFFE&PID_000D + InstDrv::InitDriverSetup /NOUNLOAD {4D36E96D-E325-11CE-BFC1-08002BE10318} AltusMetrumSerial InstDrv::DeleteOemInfFiles /NOUNLOAD InstDrv::RemoveAllDevices -- 2.30.2