diff options
| author | Keith Packard <keithp@keithp.com> | 2014-06-15 16:10:15 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2014-06-15 16:30:08 -0700 |
| commit | 3b5651d311d4268a130996e71afc11b508e59637 (patch) | |
| tree | b3ab44a654d5309b5ff666206ec87238f16ae05c /telegps | |
| parent | ef6998c2d052bf639f257b71baefacf3a652506f (diff) | |
windows: Sign altusmetrum.inf with altusmetrum.cat
This .cat file will need to be updated when we get our 'real'
signature.
Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'telegps')
| -rw-r--r-- | telegps/Makefile.am | 2 | ||||
| -rw-r--r-- | telegps/telegps-windows.nsi.in | 23 |
2 files changed, 17 insertions, 8 deletions
diff --git a/telegps/Makefile.am b/telegps/Makefile.am index 99c2fb4a..7b550e9e 100644 --- a/telegps/Makefile.am +++ b/telegps/Makefile.am @@ -128,7 +128,7 @@ MACOSX_README=ReadMe-Mac.rtf MACOSX_FILES=$(FAT_FILES) libaltos.dylib $(MACOSX_INFO_PLIST) $(MACOSX_README) $(DOC) $(MACOSX_ICON) MACOSX_EXTRA=$(FIRMWARE) -WINDOWS_FILES=$(FAT_FILES) altos.dll altos64.dll $(top_srcdir)/altusmetrum.inf $(DOC) $(WINDOWS_ICON) +WINDOWS_FILES=$(FAT_FILES) altos.dll altos64.dll $(top_srcdir)/altusmetrum.inf $(top_srcdir)/altusmetrum.cat $(DOC) $(WINDOWS_ICON) if FATINSTALL diff --git a/telegps/telegps-windows.nsi.in b/telegps/telegps-windows.nsi.in index 43699faf..e6798c46 100644 --- a/telegps/telegps-windows.nsi.in +++ b/telegps/telegps-windows.nsi.in @@ -94,15 +94,18 @@ Section "Install Driver" InstDriver InstDrv::DeleteOemInfFiles /NOUNLOAD InstDrv::CreateDevice /NOUNLOAD - SetOutPath $TEMP - File "../altusmetrum.inf" - InstDrv::InstallDriver /NOUNLOAD "$TEMP\altusmetrum.inf" - SetOutPath $INSTDIR File "../altusmetrum.inf" + File "../altusmetrum.cat" - SetOutPath $WINDIR\Inf - File "../altusmetrum.inf" + ${DisableX64FSRedirection} + IfFileExists $WINDIR\System32\PnPutil.exe 0 nopnp + ${DisableX64FSRedirection} + nsExec::ExecToLog '"$WINDIR\System32\PnPutil.exe" -i -a "$INSTDIR\altusmetrum.inf"' + Goto done +nopnp: + InstDrv::InstallDriver /NOUNLOAD "$INSTDIR\altusmetrum.inf" +done: SectionEnd @@ -135,13 +138,14 @@ Section "TeleGPS Desktop Shortcut" CreateShortCut "$DESKTOP\TeleGPS.lnk" "$INSTDIR\telegps-fat.jar" "" "$INSTDIR\telegps.ico" SectionEnd -Section "TeleGPS Firmware" +Section "TeleGPS, TeleDongle and TeleBT Firmware" SetOutPath $INSTDIR File "../src/telegps-v1.0/telegps-v1.0-${VERSION}.ihx" File "../src/teledongle-v0.2/teledongle-v0.2-${VERSION}.ihx" File "../src/telebt-v1.0/telebt-v1.0-${VERSION}.ihx" + SectionEnd Section "Documentation" @@ -178,6 +182,11 @@ Section "Uninstall" Delete "$INSTDIR\*.*" RMDir "$INSTDIR" + ; Remove devices + InstDrv::InitDriverSetup /NOUNLOAD {4D36E96D-E325-11CE-BFC1-08002BE10318} AltusMetrumSerial + InstDrv::DeleteOemInfFiles /NOUNLOAD + InstDrv::RemoveAllDevices + ; Remove shortcuts, if any Delete "$SMPROGRAMS\TeleGPS.lnk" Delete "$DESKTOP\TeleGPS.lnk" |