diff options
| author | Keith Packard <keithp@keithp.com> | 2016-05-04 23:56:44 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2016-05-04 23:56:44 -0700 |
| commit | 13179f614a99cad3016832ac1b365eaa4208c10f (patch) | |
| tree | 73d121d34a94c28b09a9551acbc69a348623d95d /micropeak | |
| parent | 85191fe911a5ea4af384bff9b2ed9986679cd9fd (diff) | |
micropeak: Change order of windows install so that java detect works
I have no idea why this matters, but if you run the FTDI script before
trying to detect java, then the javaw.exe program isn't found and java
detection fails.
Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'micropeak')
| -rw-r--r-- | micropeak/micropeak-windows.nsi.in | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/micropeak/micropeak-windows.nsi.in b/micropeak/micropeak-windows.nsi.in index c3b63f7b..34f5908d 100644 --- a/micropeak/micropeak-windows.nsi.in +++ b/micropeak/micropeak-windows.nsi.in @@ -62,15 +62,6 @@ UninstPage instfiles ; And the stuff to install -Section "FTDI USB Driver" - SetOutPath $INSTDIR - - File "CDM_v2.12.00_WHQL_Certified.exe" - - StrCpy $2 "$INSTDIR\CDM_v2.12.00_WHQL_Certified.exe" - ExecWait $2 -SectionEnd - Section "Install Driver" InstDriver InstDrv::InitDriverSetup /NOUNLOAD {4D36E96D-E325-11CE-BFC1-08002BE10318} AltusMetrumSerial @@ -117,6 +108,15 @@ Section "${REG_NAME} Desktop Shortcut" CreateShortCut "$DESKTOP\${REG_NAME}.lnk" "$INSTDIR\${WIN_APP_EXE}" "" "$INSTDIR\${WIN_APP_ICON}" SectionEnd +Section "FTDI USB Driver" + SetOutPath $INSTDIR + + File "CDM_v2.12.00_WHQL_Certified.exe" + + StrCpy $2 "$INSTDIR\CDM_v2.12.00_WHQL_Certified.exe" + ExecWait $2 +SectionEnd + Section "Documentation" SetOutPath $INSTDIR |