diff options
| author | Keith Packard <keithp@keithp.com> | 2015-03-29 12:10:47 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2015-03-29 12:10:47 -0700 |
| commit | 356617a3476e237311b8bbcefd6beda8271b120d (patch) | |
| tree | 76d67b20815ea631f6d07615b082a33a1fb48013 /micropeak | |
| parent | fe76229618643f0af7eae965e7a8fc6c70410d27 (diff) | |
windows: Use new windows stub to launch applications
This avoids needing to locate javaw on the system while also making
the registry entries less fragile.
Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'micropeak')
| -rw-r--r-- | micropeak/micropeak-windows.nsi.in | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/micropeak/micropeak-windows.nsi.in b/micropeak/micropeak-windows.nsi.in index a3779630..e210f8a0 100644 --- a/micropeak/micropeak-windows.nsi.in +++ b/micropeak/micropeak-windows.nsi.in @@ -104,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/${WIN_APP_ICON}" - CreateShortCut "$SMPROGRAMS\${REG_NAME}.lnk" "$INSTDIR\${FAT_NAME}" "" "$INSTDIR\${WIN_APP_ICON}" + 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\${WIN_APP_ICON}" + CreateShortCut "$DESKTOP\${REG_NAME}.lnk" "$INSTDIR\${WIN_APP_EXE}" "" "$INSTDIR\${WIN_APP_ICON}" SectionEnd Section "Documentation" @@ -129,11 +130,8 @@ Section "File Associations" SetOutPath $INSTDIR - File "../icon/${WIN_APP_EXE}" File "../icon/${WIN_MPD_EXE}" - SearchPath $1 "javaw.exe" - ; application elements DeleteRegKey HKCR "${PROG_ID}" @@ -143,7 +141,7 @@ Section "File Associations" 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" "" '"$1" -Djava.library.path="$INSTDIR" -jar "$INSTDIR\${FAT_NAME}" "%1"' + WriteRegExpandStr HKCR "${PROG_ID_MPD}\shell\play\command" "" '"$INSTDIR\${WIN_APP_EXE}" "%1"' ; .mpd elements |