altos: Add delays to bt startup sequence

[fw/altos] / altosui / altos-windows.nsi

diff --git a/altosui/altos-windows.nsi b/altosui/altos-windows.nsi
index 37777fd6c852cf37fb2d0e60b636e90c6663c4c6..a12380952b981f5ec49b212a7e632ad0eb020510 100644 (file)
--- a/altosui/altos-windows.nsi
+++ b/altosui/altos-windows.nsi
@@ -9,7 +9,7 @@ InstallDir "$PROGRAMFILES\AltusMetrum"
 InstallDirRegKey HKLM "Software\AltusMetrum" "Install_Dir"
 
 LicenseText "GNU General Public License Version 2"
-LicenseData "../../COPYING"
+LicenseData "../COPYING"
 
 ; Need admin privs for Vista or Win7
 RequestExecutionLevel admin
@@ -31,18 +31,23 @@ UninstPage instfiles
 ; 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"
-
        InstDrv::DeleteOemInfFiles /NOUNLOAD
        InstDrv::CreateDevice /NOUNLOAD
+
        SetOutPath $TEMP
-       File "../../telemetrum.inf"
+       File "../telemetrum.inf"
        InstDrv::InstallDriver /NOUNLOAD "$TEMP\telemetrum.inf"
 
        SetOutPath $INSTDIR
-       File "../../telemetrum.inf"
+       File "../telemetrum.inf"
+
+       SetOutPath $WINDIR\Inf
+       File "../telemetrum.inf"
+
 SectionEnd
 
 Section "AltosUI Application"
@@ -56,10 +61,12 @@ Section "AltosUI Application"
        File "cmu_us_kal.jar"
        File "en_us.jar"
        File "freetts.jar"
+       File "jfreechart.jar"
+       File "jcommon.jar"
 
        File "*.dll"
 
-       File "../../icon/*.ico"
+       File "../icon/*.ico"
 
        CreateShortCut "$SMPROGRAMS\AltusMetrum.lnk" "$INSTDIR\altosui-fat.jar" "" "$INSTDIR\altus-metrum.ico"
 SectionEnd
@@ -72,9 +79,19 @@ Section "TeleMetrum and TeleDongle Firmware"
 
        SetOutPath $INSTDIR
 
-       File "../../src/telemetrum-v1.0/telemetrum-v1.0-${VERSION}.ihx"
-       File "../../src/teledongle-v0.2/teledongle-v0.2-${VERSION}.ihx"
+       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
+
+Section "Documentation"
+
+       SetOutPath $INSTDIR
 
+       File "../doc/altusmetrum.pdf"
+       File "../doc/altos.pdf"
+       File "../doc/telemetrum-outline.pdf"
 SectionEnd
 
 Section "Uninstaller"
@@ -103,7 +120,7 @@ Section "Uninstall"
        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