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 /altosui | |
| 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 'altosui')
| -rw-r--r-- | altosui/Makefile.am | 4 | ||||
| -rw-r--r-- | altosui/altos-windows.nsi.in | 15 |
2 files changed, 11 insertions, 8 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 |