projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add firmware and libaltos to 'fat' target at top-level
[fw/altos]
/
ao-tools
/
altosui
/
altos-windows.nsi
diff --git
a/ao-tools/altosui/altos-windows.nsi
b/ao-tools/altosui/altos-windows.nsi
index 5ac708f9684a731efde36716950c3bc1842e0474..37777fd6c852cf37fb2d0e60b636e90c6663c4c6 100644
(file)
--- a/
ao-tools/altosui/altos-windows.nsi
+++ b/
ao-tools/altosui/altos-windows.nsi
@@
-2,8
+2,6
@@
Name "Altus Metrum Installer"
Name "Altus Metrum Installer"
-OutFile "Altos-Windows.exe"
-
; Default install directory
InstallDir "$PROGRAMFILES\AltusMetrum"
; Default install directory
InstallDir "$PROGRAMFILES\AltusMetrum"
@@
-42,29
+40,40
@@
Section "Install Driver" InstDriver
SetOutPath $TEMP
File "../../telemetrum.inf"
InstDrv::InstallDriver /NOUNLOAD "$TEMP\telemetrum.inf"
SetOutPath $TEMP
File "../../telemetrum.inf"
InstDrv::InstallDriver /NOUNLOAD "$TEMP\telemetrum.inf"
+
+ SetOutPath $INSTDIR
+ File "../../telemetrum.inf"
SectionEnd
Section "AltosUI Application"
SetOutPath $INSTDIR
SectionEnd
Section "AltosUI Application"
SetOutPath $INSTDIR
- File "windows/AltOS/*.jar"
- File "windows/AltOS/*.dll"
+ File "altosui-fat.jar"
+ File "cmudict04.jar"
+ File "cmulex.jar"
+ File "cmu_time_awb.jar"
+ File "cmutimelex.jar"
+ File "cmu_us_kal.jar"
+ File "en_us.jar"
+ File "freetts.jar"
+
+ File "*.dll"
- File "
windows/AltOS
/*.ico"
+ File "
../../icon
/*.ico"
- CreateShortCut "$SMPROGRAMS\AltusMetrum.lnk" "$INSTDIR\altosui.jar" "" "$INSTDIR\altus-metrum.ico"
+ CreateShortCut "$SMPROGRAMS\AltusMetrum.lnk" "$INSTDIR\altosui
-fat
.jar" "" "$INSTDIR\altus-metrum.ico"
SectionEnd
Section "AltosUI Desktop Shortcut"
SectionEnd
Section "AltosUI Desktop Shortcut"
- CreateShortCut "$DESKTOP\AltusMetrum.lnk" "$INSTDIR\altosui.jar" "" "$INSTDIR\altus-metrum.ico"
+ CreateShortCut "$DESKTOP\AltusMetrum.lnk" "$INSTDIR\altosui
-fat
.jar" "" "$INSTDIR\altus-metrum.ico"
SectionEnd
Section "TeleMetrum and TeleDongle Firmware"
SetOutPath $INSTDIR
SectionEnd
Section "TeleMetrum and TeleDongle Firmware"
SetOutPath $INSTDIR
- File "
windows/AltOS/telemetrum-v1.0
.ihx"
- File "
windows/AltOS/teledongle-v0.2
.ihx"
+ File "
../../src/telemetrum-v1.0/telemetrum-v1.0-${VERSION}
.ihx"
+ File "
../../src/teledongle-v0.2/teledongle-v0.2-${VERSION}
.ihx"
SectionEnd
SectionEnd