From 3b5651d311d4268a130996e71afc11b508e59637 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Sun, 15 Jun 2014 16:10:15 -0700 Subject: [PATCH 1/1] 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 --- altosui/Makefile.am | 4 ++-- altosui/altos-windows.nsi.in | 15 +++++++++------ altusmetrum.cat | Bin 0 -> 6263 bytes altusmetrum.inf | 3 ++- telegps/Makefile.am | 2 +- telegps/telegps-windows.nsi.in | 23 ++++++++++++++++------- 6 files changed, 30 insertions(+), 17 deletions(-) create mode 100644 altusmetrum.cat diff --git a/altosui/Makefile.am b/altosui/Makefile.am index ddeb8ea3..820c9734 100644 --- a/altosui/Makefile.am +++ b/altosui/Makefile.am @@ -144,7 +144,7 @@ MACOSX_INFO_PLIST=Info.plist MACOSX_FILES=$(FAT_FILES) libaltos.dylib $(MACOSX_INFO_PLIST) $(DOC) ReadMe-Mac.rtf $(MACOSX_ICON) MACOSX_EXTRA=$(FIRMWARE) -WINDOWS_FILES=$(FAT_FILES) altos.dll altos64.dll $(top_srcdir)/altusmetrum.inf $(WINDOWS_ICON) +WINDOWS_FILES=$(FAT_FILES) altos.dll altos64.dll $(top_srcdir)/altusmetrum.inf $(top_srcdir)/altusmetrum.cat $(WINDOWS_ICON) all-local: classes/altosui $(JAR) altosui altosui-test altosui-jdb @@ -334,4 +334,4 @@ $(MACOSX_DIST): $(MACOSX_FILES) $(MACOSX_EXTRA) Makefile $(WINDOWS_DIST): $(WINDOWS_FILES) altos-windows.nsi -rm -f $@ - makensis -Oaltos-windows.log "-XOutFile $@" "-DVERSION=$(VERSION)" altos-windows.nsi + makensis -Oaltos-windows.log "-XOutFile $@" "-DVERSION=$(VERSION)" altos-windows.nsi || (cat altos-windows.log && exit 1) diff --git a/altosui/altos-windows.nsi.in b/altosui/altos-windows.nsi.in index 5a632f89..32498039 100644 --- a/altosui/altos-windows.nsi.in +++ b/altosui/altos-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 diff --git a/altusmetrum.cat b/altusmetrum.cat new file mode 100644 index 0000000000000000000000000000000000000000..2d7e8b26526d58c7b687a0fbb864aaad7f00b170 GIT binary patch literal 6263 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 literal 0 HcmV?d00001 diff --git a/altusmetrum.inf b/altusmetrum.inf index 220069b3..45905cc8 100755 --- a/altusmetrum.inf +++ b/altusmetrum.inf @@ -6,9 +6,10 @@ Signature = "$Windows NT$" Class = Modem ClassGUID = {4D36E96D-E325-11CE-BFC1-08002BE10318} Provider = %Mfg% -DriverVer = 08/05/2010,7.1.1.0 +DriverVer = 06/15/2014,7.1.1.0 PnpLockDown = 0 DriverPackageDisplayName = %DriverName% +CatalogFile = altusmetrum.cat [DestinationDirs] FakeModemCopyFileSection = 12 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" -- 2.30.2