projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'telemini' of ssh://git.gag.com/scm/git/fw/altos into telemini
[fw/altos]
/
altosui
/
altos-windows.nsi
diff --git
a/altosui/altos-windows.nsi
b/altosui/altos-windows.nsi
index d7c4b32a4b20a5031516217cf4bd61da32a71dcb..a12380952b981f5ec49b212a7e632ad0eb020510 100644
(file)
--- a/
altosui/altos-windows.nsi
+++ b/
altosui/altos-windows.nsi
@@
-31,18
+31,23
@@
UninstPage instfiles
; And the stuff to install
Section "Install Driver" InstDriver
; 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} AltusMetrumSerial
Pop $0
DetailPrint "InitDriverSetup: $0"
Pop $0
DetailPrint "InitDriverSetup: $0"
-
InstDrv::DeleteOemInfFiles /NOUNLOAD
InstDrv::CreateDevice /NOUNLOAD
InstDrv::DeleteOemInfFiles /NOUNLOAD
InstDrv::CreateDevice /NOUNLOAD
+
SetOutPath $TEMP
File "../telemetrum.inf"
InstDrv::InstallDriver /NOUNLOAD "$TEMP\telemetrum.inf"
SetOutPath $INSTDIR
File "../telemetrum.inf"
SetOutPath $TEMP
File "../telemetrum.inf"
InstDrv::InstallDriver /NOUNLOAD "$TEMP\telemetrum.inf"
SetOutPath $INSTDIR
File "../telemetrum.inf"
+
+ SetOutPath $WINDIR\Inf
+ File "../telemetrum.inf"
+
SectionEnd
Section "AltosUI Application"
SectionEnd
Section "AltosUI Application"
@@
-56,6
+61,8
@@
Section "AltosUI Application"
File "cmu_us_kal.jar"
File "en_us.jar"
File "freetts.jar"
File "cmu_us_kal.jar"
File "en_us.jar"
File "freetts.jar"
+ File "jfreechart.jar"
+ File "jcommon.jar"
File "*.dll"
File "*.dll"
@@
-73,10
+80,20
@@
Section "TeleMetrum and TeleDongle Firmware"
SetOutPath $INSTDIR
File "../src/telemetrum-v1.0/telemetrum-v1.0-${VERSION}.ihx"
SetOutPath $INSTDIR
File "../src/telemetrum-v1.0/telemetrum-v1.0-${VERSION}.ihx"
+ File "../src/telemetrum-v1.1/telemetrum-v1.1-${VERSION}.ihx"
File "../src/teledongle-v0.2/teledongle-v0.2-${VERSION}.ihx"
SectionEnd
File "../src/teledongle-v0.2/teledongle-v0.2-${VERSION}.ihx"
SectionEnd
+Section "Documentation"
+
+ SetOutPath $INSTDIR
+
+ File "../doc/altusmetrum.pdf"
+ File "../doc/altos.pdf"
+ File "../doc/telemetrum-outline.pdf"
+SectionEnd
+
Section "Uninstaller"
; Deal with the uninstaller
Section "Uninstaller"
; Deal with the uninstaller
@@
-103,7
+120,7
@@
Section "Uninstall"
RMDir "$INSTDIR"
; Remove devices
RMDir "$INSTDIR"
; Remove devices
- InstDrv::InitDriverSetup /NOUNLOAD {4D36E96D-E325-11CE-BFC1-08002BE10318}
"Altus Metrum"
+ InstDrv::InitDriverSetup /NOUNLOAD {4D36E96D-E325-11CE-BFC1-08002BE10318}
AltusMetrumSerial
InstDrv::DeleteOemInfFiles /NOUNLOAD
InstDrv::RemoveAllDevices
InstDrv::DeleteOemInfFiles /NOUNLOAD
InstDrv::RemoveAllDevices