rusefi
/
RomRaider
mirror of https://github.com/rusefi/RomRaider.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Enable a warning panel when a 64-bit JRE is detected 

Installer panel is conditional on JVM architecture being detected as "amd64"

Enable 64-bit Windows for installer
- add 64-bit ShellLink DLL to installer template
- update info panel text to reflect change
Installer panel is conditional on JVM architecture being detected as "amd64"
Application is not yet 64-bit ready

Potential issue:
Specifying 32-bit Java to run the installer JAR file will bypass the warning
but the shortcuts may still use a 64-bit version
This commit is contained in:
Steve Wadsworth 2018-12-19 15:50:55 -08:00 committed by Dale Schultz
parent 6cd4a95601
commit 7295b54e6b
2 changed files with 72 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
jre_warning.html
View File

@ -5,27 +5,16 @@
</head>
<body>
<center>
<h2>Java Runtime Warning</h2>
<h1>Java Runtime Warning</h1>
<h2>64-bit Java detected</H2>
<p>This application and its installer both require a 32-bit Java Runtime
Environment, even if the operating system is 64-bit.</p>
<p>This application requires a 32-bit Java Runtime Environment, even if the operating system is 64-bit.</p>
<p>If this installer is run with a 64-bit version of Java, it will not complete
successfully.</p>
<p>If RomRaider is run with a 64-bit version of Java, some functions will not work properly.</p>
<p>If RomRaider is run with a 64-bit version of Java, it will not function
properly.</p>
<p>Please ensure that a 32-bit version of Java with a minimum version of 1.6 is installed.</p>
<p>Please ensure that a 32-bit version of Java with a minimum version of 1.6 is
installed.</p>
<p>For further information, please consult the<br>
<a href="http://www.romraider.com/forum/viewforum.php?f=5">RomRaider
Troubleshooting Forum</a>.</p>
<p>To download a 32-bit version of Java, please visit
<a href="http://java.sun.com/javase/downloads/index.jsp">Java SE Downloads</a>
and choose a x86 JRE for your operating system.</p>
<p>For further information, please consult the <a href="http://www.romraider.com/forum/viewforum.php?f=5">RomRaider Troubleshooting Forum</a></p>
<p>It is recommended that you <b>cancel</b> the RomRaider installation now by
pressing the <b>Quit</b> button below.</p>

8
templates/install-windows.xml.template
View File

@ -12,11 +12,15 @@
</authors>
<url>@supporturl@</url>
</info>
<native type="izpack" name="ShellLink.dll" />
<native type="izpack" name="ShellLink_x64.dll" />
<guiprefs width="640" height="480" resizable="no" />
<locale>
<langpack iso3="eng" />
</locale>
<resources>
<res id="LicencePanel.licence" src="license.txt" />
<res id="HTMLInfoPanel.info" src="jre_warning.html" />
@ -57,9 +61,7 @@
<file src="plugins/aem2.plugin" targetdir="$INSTALL_PATH/plugins" />
<file src="plugins/aem.plugin" targetdir="$INSTALL_PATH/plugins" />
<file src="plugins/aem.xwifi.plugin" targetdir="$INSTALL_PATH/plugins" />
<file src="plugins/apsx.plugin" targetdir="$INSTALL_PATH/plugins"/>
<file src="plugins/fourteenpoint7.plugin" targetdir="$INSTALL_PATH/plugins" />
<file src="plugins/ecotrons.plugin" targetdir="$INSTALL_PATH/plugins"/>
<file src="plugins/innovate.plugin" targetdir="$INSTALL_PATH/plugins" />
<file src="plugins/lm2_mts.plugin" targetdir="$INSTALL_PATH/plugins" />
<file src="plugins/mrf.plugin" targetdir="$INSTALL_PATH/plugins" />
@ -78,8 +80,6 @@
<exclude name="plugins/aem.plugin" />
<exclude name="plugins/aem2.plugin" />
<exclude name="plugins/aem.xwifi.plugin" />
<exclude name="plugins/apsx.plugin"/>
<exclude name="plugins/ecotrons.plugin"/>
<exclude name="plugins/fourteenpoint7.plugin" />
<exclude name="plugins/innovate.plugin" />
<exclude name="plugins/lm2_mts.plugin" />