micropeak: Change order of windows install so that java detect works
authorKeith Packard <keithp@keithp.com>
Thu, 5 May 2016 06:56:44 +0000 (23:56 -0700)
committerKeith Packard <keithp@keithp.com>
Thu, 5 May 2016 06:56:44 +0000 (23:56 -0700)
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>
micropeak/micropeak-windows.nsi.in

index c3b63f7b31d6b3215764a4a601973178a8d02225..34f5908d38a15c1c9eb79bf6a909dc38e74ee44d 100644 (file)
@@ -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