X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=micropeak%2Fmicropeak-windows.nsi.in;h=e210f8a0c31e5aadc42881f5654820b6531f88a3;hp=d8e475051778d61d9e6b7d34972081417f80269b;hb=356617a3476e237311b8bbcefd6beda8271b120d;hpb=5871225a0c442cf5afa41a444ff8bfb8f4002721

diff --git a/micropeak/micropeak-windows.nsi.in b/micropeak/micropeak-windows.nsi.in
index d8e47505..e210f8a0 100644
--- a/micropeak/micropeak-windows.nsi.in
+++ b/micropeak/micropeak-windows.nsi.in
@@ -4,11 +4,13 @@
 !include java.nsh
 !include refresh-sh.nsh
 
-!define REG_NAME "MicroPeak"
-!define PROG_ID "org.altusmetrum.micropeak.1"
-!define FAT_NAME "micropeak-fat.jar"
-!define ICO_ICO "micro-peak.ico"
-!define ICO_EXE "micro-peak.exe"
+!define REG_NAME	"MicroPeak"
+!define PROG_ID		"org.altusmetrum.micropeak.1"
+!define PROG_ID_MPD	"org.altusmetrum.micropeak.mpd.1"
+!define FAT_NAME	"micropeak-fat.jar"
+!define WIN_APP_ICON	"altusmetrum-micropeak.ico"
+!define WIN_APP_EXE	"altusmetrum-micropeak.exe"
+!define WIN_MPD_EXE	"application-vnd.altusmetrum.micropeak.exe"
 
 Name "${REG_NAME} Installer"
 
@@ -69,6 +71,29 @@ Section "FTDI USB Driver"
 	ExecWait $2
 SectionEnd
 
+Section "Install Driver" InstDriver
+
+	InstDrv::InitDriverSetup /NOUNLOAD {4D36E96D-E325-11CE-BFC1-08002BE10318} AltusMetrumSerial
+	Pop $0
+	DetailPrint "InitDriverSetup: $0"
+	InstDrv::DeleteOemInfFiles /NOUNLOAD
+	InstDrv::CreateDevice /NOUNLOAD
+
+	SetOutPath $INSTDIR
+	File "../altusmetrum.inf"
+	File "../altusmetrum.cat"
+
+	${DisableX64FSRedirection}
+	IfFileExists $WINDIR\System32\PnPutil.exe 0 nopnp
+		${DisableX64FSRedirection}
+		nsExec::ExecToLog '"$WINDIR\System32\PnPutil.exe" -i -a "$INSTDIR\altusmetrum.inf"'
+		Goto done
+nopnp:
+		InstDrv::InstallDriver /NOUNLOAD "$INSTDIR\altusmetrum.inf"
+done:
+
+SectionEnd
+
 Section "${REG_NAME} Application"
 	Call DetectJRE
 
@@ -79,16 +104,17 @@ Section "${REG_NAME} Application"
 	File "altosuilib_@ALTOSUILIB_VERSION@.jar"
 	File "jfreechart.jar"
 	File "jcommon.jar"
+	File "../icon/${WIN_APP_EXE}"
 
 	File "*.dll"
 
-	File "../icon/${ICO_ICO}"
+	File "../icon/${WIN_APP_ICON}"
 
-	CreateShortCut "$SMPROGRAMS\${REG_NAME}.lnk" "$SYSDIR\javaw.exe" "-jar ${FAT_NAME}" "$INSTDIR\${ICO_ICO}"
+	CreateShortCut "$SMPROGRAMS\${REG_NAME}.lnk" "$INSTDIR\${WIN_APP_EXE}" "" "$INSTDIR\${WIN_APP_ICON}"
 SectionEnd
 
 Section "${REG_NAME} Desktop Shortcut"
-	CreateShortCut "$DESKTOP\${REG_NAME}.lnk" "$INSTDIR\${FAT_NAME}"  "" "$INSTDIR\${ICO_ICO}"
+	CreateShortCut "$DESKTOP\${REG_NAME}.lnk" "$INSTDIR\${WIN_APP_EXE}"  "" "$INSTDIR\${WIN_APP_ICON}"
 SectionEnd
 
 Section "Documentation"
@@ -100,26 +126,31 @@ SectionEnd
 
 Section "File Associations"
 
+	${DisableX64FSRedirection}
+
 	SetOutPath $INSTDIR
 
-	File "../icon/${ICO_EXE}"
+	File "../icon/${WIN_MPD_EXE}"
 
 	; application elements
 	
-	WriteRegStr HKCR "${PROG_ID}"			""				"MicroPeak Data File"
-	WriteRegStr HKCR "${PROG_ID}"			"FriendlyTypeName"		"MicroPeak Data File"
-	WriteRegStr HKCR "${PROG_ID}\CurVer"		""				"${PROG_ID}"
-	WriteRegStr HKCR "${PROG_ID}\DefaultIcon"	""				'"$INSTDIR\${ICO_EXE}",-101'
-  WriteRegExpandStr HKCR "${PROG_ID}\shell\play\command" ""				'"%SYSTEMROOT%\System32\javaw.exe" -Djava.library.path="$INSTDIR" -jar "$INSTDIR\${FAT_NAME}" "%1"'
+	DeleteRegKey HKCR "${PROG_ID}"
+	DeleteRegKey HKCR "${PROG_ID_MPD}"
+
+	WriteRegStr HKCR "${PROG_ID_MPD}"		""				"MicroPeak Data File"
+	WriteRegStr HKCR "${PROG_ID_MPD}"		"FriendlyTypeName"		"MicroPeak Data File"
+	WriteRegStr HKCR "${PROG_ID_MPD}\CurVer"	""				"${PROG_ID_MPD}"
+	WriteRegStr HKCR "${PROG_ID_MPD}\DefaultIcon"	""				'"$INSTDIR\${WIN_MPD_EXE}",-101'
+  WriteRegExpandStr HKCR "${PROG_ID_MPD}\shell\play\command" ""				'"$INSTDIR\${WIN_APP_EXE}" "%1"'
 
 	; .mpd elements
 
-	WriteRegStr HKCR ".mpd"				""				"${PROG_ID}"
+	WriteRegStr HKCR ".mpd"				""				"${PROG_ID_MPD}"
 	WriteRegStr HKCR ".mpd"				"PerceivedType"			"MicroPeak Data File"
-	WriteRegStr HKCR ".mpd"				"Content Type"			"application/micropeak"
+	WriteRegStr HKCR ".mpd"				"Content Type"			"application/vnd.altusmetrum.micropeak"
 
-	WriteRegStr HKCR ".mpd\OpenWithProgids"		"${PROG_ID}"			""
-	WriteRegStr HKCR ".mpd\${PROG_ID}"		""				"${REG_NAME}"
+	WriteRegStr HKCR ".mpd\OpenWithProgids"		"${PROG_ID_MPD}"			""
+	WriteRegStr HKCR ".mpd\${PROG_ID_MPD}"		""				"${REG_NAME}"
 
 	Call RefreshShellIcons
 SectionEnd
@@ -153,15 +184,16 @@ Section "Uninstall"
 	DetailPrint "Delete uninstall reg entries"
 
 	DeleteRegKey   HKCR "${PROG_ID}"
+	DeleteRegKey   HKCR "${PROG_ID_MPD}"
 
-	DeleteRegKey   HKCR ".mpd\${PROG_ID}"
-	DeleteRegValue HKCR ".mpd\OpenWithProgids" "${PROG_ID}"
+	DeleteRegKey   HKCR ".mpd\${PROG_ID_MPD}"
+	DeleteRegValue HKCR ".mpd\OpenWithProgids" "${PROG_ID_MPD}"
 
 	Delete "$INSTDIR\${FAT_NAME}"
 	Delete "$INSTDIR\uninstall-${REG_NAME}.exe"
 
-	Delete "$INSTDIR\${ICO_ICO}"
-	Delete "$INSTDIR\${ICO_EXE}"
+	Delete "$INSTDIR\${WIN_APP_ICON}"
+	Delete "$INSTDIR\${WIN_APP_EXE}"
 
 	; Remove shortcuts, if any
 	Delete "$SMPROGRAMS\${REG_NAME}.lnk"