Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos

[fw/altos] / micropeak / micropeak-windows.nsi.in

diff --git a/micropeak/micropeak-windows.nsi.in b/micropeak/micropeak-windows.nsi.in
index a3779630630b40ded1c6b3b8756b6e491f957f23..c3b63f7b31d6b3215764a4a601973178a8d02225 100644 (file)
--- a/micropeak/micropeak-windows.nsi.in
+++ b/micropeak/micropeak-windows.nsi.in
@@ -65,9 +65,9 @@ UninstPage instfiles
 Section "FTDI USB Driver"
        SetOutPath $INSTDIR
 
-       File "CDM20824_Setup.exe"
+       File "CDM_v2.12.00_WHQL_Certified.exe"
 
-       StrCpy $2 "$INSTDIR\CDM20824_Setup.exe"
+       StrCpy $2 "$INSTDIR\CDM_v2.12.00_WHQL_Certified.exe"
        ExecWait $2
 SectionEnd
 
@@ -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