windows: try harder to get windows install to work

[fw/altos] / altosui / altos-windows.nsi

diff --git a/altosui/altos-windows.nsi b/altosui/altos-windows.nsi
index 37777fd6c852cf37fb2d0e60b636e90c6663c4c6..0e9859675a54146477525f74af29e8539294995a 100644 (file)
--- a/altosui/altos-windows.nsi
+++ b/altosui/altos-windows.nsi
@@ -9,7 +9,7 @@ InstallDir "$PROGRAMFILES\AltusMetrum"
 InstallDirRegKey HKLM "Software\AltusMetrum" "Install_Dir"
 
 LicenseText "GNU General Public License Version 2"
-LicenseData "../../COPYING"
+LicenseData "../COPYING"
 
 ; Need admin privs for Vista or Win7
 RequestExecutionLevel admin
@@ -31,18 +31,40 @@ UninstPage instfiles
 ; And the stuff to install
 
 Section "Install Driver" InstDriver
-       InstDrv::InitDriverSetup /NOUNLOAD {4D36E96D-E325-11CE-BFC1-08002BE10318} "Altus Metrum"
+
+       InstDrv::InitDriverSetup /NOUNLOAD {4D36E96D-E325-11CE-BFC1-08002BE10318} USB\VID_FFFE&PID_000A
        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"
+       File "../telemetrum.inf"
        InstDrv::InstallDriver /NOUNLOAD "$TEMP\telemetrum.inf"
 
        SetOutPath $INSTDIR
-       File "../../telemetrum.inf"
+       File "../telemetrum.inf"
 SectionEnd
 
 Section "AltosUI Application"
@@ -59,7 +81,7 @@ Section "AltosUI Application"
 
        File "*.dll"
 
-       File "../../icon/*.ico"
+       File "../icon/*.ico"
 
        CreateShortCut "$SMPROGRAMS\AltusMetrum.lnk" "$INSTDIR\altosui-fat.jar" "" "$INSTDIR\altus-metrum.ico"
 SectionEnd
@@ -72,8 +94,8 @@ Section "TeleMetrum and TeleDongle Firmware"
 
        SetOutPath $INSTDIR
 
-       File "../../src/telemetrum-v1.0/telemetrum-v1.0-${VERSION}.ihx"
-       File "../../src/teledongle-v0.2/teledongle-v0.2-${VERSION}.ihx"
+       File "../src/telemetrum-v1.0/telemetrum-v1.0-${VERSION}.ihx"
+       File "../src/teledongle-v0.2/teledongle-v0.2-${VERSION}.ihx"
 
 SectionEnd
 
@@ -103,7 +125,10 @@ Section "Uninstall"
        RMDir "$INSTDIR"
 
        ; Remove devices
-       InstDrv::InitDriverSetup /NOUNLOAD {4D36E96D-E325-11CE-BFC1-08002BE10318} "Altus Metrum"
+       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::DeleteOemInfFiles /NOUNLOAD
        InstDrv::RemoveAllDevices