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>

6 files changed, 30 insertions, 17 deletions

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 00000000..2d7e8b26
--- /dev/null
+++ b/altusmetrum.cat
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"