* fix installer issues and require Java 7 on Windows
This commit is contained in:
parent
9e0d6de56f
commit
45435fa529
|
@ -15,7 +15,7 @@
|
|||
<icon>..\icons\shortcut.ico</icon>
|
||||
<jre>
|
||||
<path></path>
|
||||
<minVersion>1.6.0</minVersion>
|
||||
<minVersion>1.7.0</minVersion>
|
||||
<maxVersion></maxVersion>
|
||||
<jdkPreference>preferJre</jdkPreference>
|
||||
</jre>
|
||||
|
|
|
@ -15,7 +15,7 @@
|
|||
<icon>..\icons\shortcut.ico</icon>
|
||||
<jre>
|
||||
<path></path>
|
||||
<minVersion>1.6.0</minVersion>
|
||||
<minVersion>1.7.0</minVersion>
|
||||
<maxVersion></maxVersion>
|
||||
<jdkPreference>preferJre</jdkPreference>
|
||||
</jre>
|
||||
|
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
@ -306,7 +306,7 @@ Section "$(Section_Name_MainProduct)" SECTIONID_MAINPRODUCT
|
|||
${endif}
|
||||
|
||||
DetailPrint "Installing latest version..."
|
||||
nsExec::Exec 'msiexec /quiet /i "$PLUGINSDIR\FileBot.msi"'
|
||||
nsExec::Exec 'msiexec /passive /i "$PLUGINSDIR\FileBot.msi"'
|
||||
Pop $MSI_STATUS # grab return value
|
||||
|
||||
${if} $MSI_STATUS == "0"
|
||||
|
@ -317,6 +317,7 @@ Section "$(Section_Name_MainProduct)" SECTIONID_MAINPRODUCT
|
|||
!insertmacro OpenCandyInstallEmbedded
|
||||
# [/OpenCandy]
|
||||
${else}
|
||||
DetailPrint "msiexec error $MSI_STATUS"
|
||||
DetailPrint "Install failed."
|
||||
Abort
|
||||
${endif}
|
||||
|
|
|
@ -15,9 +15,8 @@
|
|||
<icon>..\icons\shortcut.ico</icon>
|
||||
<jre>
|
||||
<path></path>
|
||||
<minVersion>1.6.0</minVersion>
|
||||
<minVersion>1.7.0</minVersion>
|
||||
<maxVersion></maxVersion>
|
||||
<jdkPreference>preferJre</jdkPreference>
|
||||
<maxHeapSize>256</maxHeapSize>
|
||||
</jre>
|
||||
</launch4jConfig>
|
Binary file not shown.
Loading…
Reference in New Issue