From 7295b54e6bee4a814caa2be3aca7ee010d2fe199 Mon Sep 17 00:00:00 2001 From: Steve Wadsworth Date: Wed, 19 Dec 2018 15:50:55 -0800 Subject: [PATCH] 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 --- jre_warning.html | 37 +++----- templates/install-windows.xml.template | 118 ++++++++++++------------- 2 files changed, 72 insertions(+), 83 deletions(-) diff --git a/jre_warning.html b/jre_warning.html index 7bd579c4..6e4bd795 100644 --- a/jre_warning.html +++ b/jre_warning.html @@ -1,35 +1,24 @@ - - Java Runtime Warning - - -
-

Java Runtime Warning

+ + Java Runtime Warning + + +
+

Java Runtime Warning

+

64-bit Java detected

-

This application and its installer both require a 32-bit Java Runtime - Environment, even if the operating system is 64-bit.

+

This application requires a 32-bit Java Runtime Environment, even if the operating system is 64-bit.

-

If this installer is run with a 64-bit version of Java, it will not complete - successfully.

+

If RomRaider is run with a 64-bit version of Java, some functions will not work properly.

-

If RomRaider is run with a 64-bit version of Java, it will not function - properly.

+

Please ensure that a 32-bit version of Java with a minimum version of 1.6 is installed.

-

Please ensure that a 32-bit version of Java with a minimum version of 1.6 is - installed.

- -

For further information, please consult the
-RomRaider - Troubleshooting Forum.

- -

To download a 32-bit version of Java, please visit - Java SE Downloads - and choose a x86 JRE for your operating system.

+

For further information, please consult the RomRaider Troubleshooting Forum

It is recommended that you cancel the RomRaider installation now by pressing the Quit button below.

-
- +
+ diff --git a/templates/install-windows.xml.template b/templates/install-windows.xml.template index 1d221b73..6a1fc610 100644 --- a/templates/install-windows.xml.template +++ b/templates/install-windows.xml.template @@ -8,88 +8,88 @@ @name.package@ @version.major@.@version.minor@.@version.patch@ @version.extra@ @version.extra1@ - + @supporturl@ - - + + + + + - + + - - - - + + + + - - - - - - - + + + + + + + RomRaider binary files - - - - + + + + - + - - - - + + + + - + - - - - - - - - - - - - - - - + + + + + + + + + + + + + - - + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + @name.package@ Source Files - +