X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=ao-tools%2Faltosui%2Faltos-windows.nsi;h=37777fd6c852cf37fb2d0e60b636e90c6663c4c6;hp=5ac708f9684a731efde36716950c3bc1842e0474;hb=b456bd9d7bcd9d968e43c38eeb6fa6ad8c58f895;hpb=e844e8a0695e27af6f8e3e37a5e3bcc865b862e3

diff --git a/ao-tools/altosui/altos-windows.nsi b/ao-tools/altosui/altos-windows.nsi
index 5ac708f9..37777fd6 100644
--- a/ao-tools/altosui/altos-windows.nsi
+++ b/ao-tools/altosui/altos-windows.nsi
@@ -2,8 +2,6 @@
 
 Name "Altus Metrum Installer"
 
-OutFile "Altos-Windows.exe"
-
 ; 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 $INSTDIR
+	File "../../telemetrum.inf"
 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"
-	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
 
-	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