X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2Faltos-windows.nsi;h=6f296f186505575aad53580de170f36a610c5516;hp=37777fd6c852cf37fb2d0e60b636e90c6663c4c6;hb=da42f406e88ccc821cd45d5a94d5afec65ec50e9;hpb=51c7741040d95c5deece939dae5e4136cc04afc4

diff --git a/altosui/altos-windows.nsi b/altosui/altos-windows.nsi
index 37777fd6..6f296f18 100644
--- 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,8 +79,8 @@ 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/teledongle-v0.2/teledongle-v0.2-${VERSION}.ihx"
 
 SectionEnd
 
@@ -103,7 +110,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