ui: Coati states if it requires 32 or 64 bit Java
* also updated documentation
This commit is contained in:
@@ -362,7 +362,8 @@ add_files(
|
|||||||
|
|
||||||
utility/text/TextAccess.cpp
|
utility/text/TextAccess.cpp
|
||||||
utility/text/TextAccess.h
|
utility/text/TextAccess.h
|
||||||
|
|
||||||
|
utility/ApplicationArchitectureType.h
|
||||||
utility/AppPath.cpp
|
utility/AppPath.cpp
|
||||||
utility/AppPath.h
|
utility/AppPath.h
|
||||||
utility/Cache.h
|
utility/Cache.h
|
||||||
|
|||||||
@@ -0,0 +1,11 @@
|
|||||||
|
#ifndef APPLICATION_ARCHITECTURE_TYPE
|
||||||
|
#define APPLICATION_ARCHITECTURE_TYPE
|
||||||
|
|
||||||
|
enum ApplicationArchitectureType
|
||||||
|
{
|
||||||
|
APPLICATION_ARCHITECTURE_UNKNOWN,
|
||||||
|
APPLICATION_ARCHITECTURE_X86_32,
|
||||||
|
APPLICATION_ARCHITECTURE_X86_64
|
||||||
|
};
|
||||||
|
|
||||||
|
#endif // APPLICATION_ARCHITECTURE_TYPE
|
||||||
@@ -5,6 +5,7 @@
|
|||||||
#include "utility/messaging/type/MessageSwitchColorScheme.h"
|
#include "utility/messaging/type/MessageSwitchColorScheme.h"
|
||||||
#include "utility/ResourcePaths.h"
|
#include "utility/ResourcePaths.h"
|
||||||
#include "utility/utilityPathDetection.h"
|
#include "utility/utilityPathDetection.h"
|
||||||
|
#include "utility/utilityApp.h"
|
||||||
|
|
||||||
QtProjectWizzardContentPreferences::QtProjectWizzardContentPreferences(
|
QtProjectWizzardContentPreferences::QtProjectWizzardContentPreferences(
|
||||||
std::shared_ptr<ProjectSettings> settings, QtProjectWizzardWindow* window
|
std::shared_ptr<ProjectSettings> settings, QtProjectWizzardWindow* window
|
||||||
@@ -135,10 +136,26 @@ void QtProjectWizzardContentPreferences::populate(QGridLayout* layout, int& row)
|
|||||||
}
|
}
|
||||||
|
|
||||||
addLabelAndWidget("Java Path", m_javaPath, layout, row);
|
addLabelAndWidget("Java Path", m_javaPath, layout, row);
|
||||||
addHelpButton(
|
|
||||||
"Location of your Java 8 runtime dynamic library (for information on how to set these take a look at "
|
std::string javaVersionString = "";
|
||||||
|
switch (utility::getApplicationArchitectureType())
|
||||||
|
{
|
||||||
|
case APPLICATION_ARCHITECTURE_X86_32:
|
||||||
|
javaVersionString = "32 Bit ";
|
||||||
|
break;
|
||||||
|
case APPLICATION_ARCHITECTURE_X86_64:
|
||||||
|
javaVersionString = "64 Bit ";
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
javaVersionString += "Java 8";
|
||||||
|
|
||||||
|
addHelpButton((
|
||||||
|
"Provide the location of the jvm library inside the installation of your " + javaVersionString +
|
||||||
|
" runtime environment (for information on how to set these take a look at "
|
||||||
"<a href=\"https://coati.io/documentation/#FindingJavaRuntimeLibraryLocation\">"
|
"<a href=\"https://coati.io/documentation/#FindingJavaRuntimeLibraryLocation\">"
|
||||||
"Finding Java Runtime Library Location</a> or use the auto detection below)"
|
"Finding Java Runtime Library Location</a> or use the auto detection below)").c_str()
|
||||||
, layout, row
|
, layout, row
|
||||||
);
|
);
|
||||||
row++;
|
row++;
|
||||||
|
|||||||
@@ -1,6 +1,8 @@
|
|||||||
#include "utility/utilityApp.h"
|
#include "utility/utilityApp.h"
|
||||||
|
|
||||||
#include <QProcess>
|
#include <QProcess>
|
||||||
|
#include <qprocessordetection.h>
|
||||||
|
|
||||||
#include "utility/utilityString.h"
|
#include "utility/utilityString.h"
|
||||||
|
|
||||||
std::string utility::executeProcess(const char *cmd)
|
std::string utility::executeProcess(const char *cmd)
|
||||||
@@ -15,3 +17,15 @@ std::string utility::executeProcess(const char *cmd)
|
|||||||
|
|
||||||
return processoutput;
|
return processoutput;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
ApplicationArchitectureType utility::getApplicationArchitectureType()
|
||||||
|
{
|
||||||
|
#ifdef Q_PROCESSOR_X86_64
|
||||||
|
return APPLICATION_ARCHITECTURE_X86_64;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef Q_PROCESSOR_X86_32
|
||||||
|
return APPLICATION_ARCHITECTURE_X86_32;
|
||||||
|
#endif
|
||||||
|
return APPLICATION_ARCHITECTURE_UNKNOWN;
|
||||||
|
}
|
||||||
|
|||||||
@@ -3,9 +3,13 @@
|
|||||||
|
|
||||||
#include <QProcess>
|
#include <QProcess>
|
||||||
|
|
||||||
|
#include "utility/ApplicationArchitectureType.h"
|
||||||
|
|
||||||
namespace utility
|
namespace utility
|
||||||
{
|
{
|
||||||
std::string executeProcess(const char* cmd);
|
std::string executeProcess(const char* cmd);
|
||||||
|
|
||||||
|
ApplicationArchitectureType getApplicationArchitectureType();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -483,7 +483,7 @@
|
|||||||
|
|
||||||
<h2>Finding Java Runtime Library Location</h2>
|
<h2>Finding Java Runtime Library Location</h2>
|
||||||
|
|
||||||
<p>The current version of Coati requires Java 8 to index any Java project. To locate the required library file, please refer to the applicable description below.</p>
|
<p>The current version of Coati requires an installation of the Java 8 runtime environment to index any Java project. Make sure that Coati and your JRE share the same kind or architecture (a 32 bit Coati requires a 32 bit JRE). To locate the required library file, please refer to the applicable description below.</p>
|
||||||
|
|
||||||
<h3>On Windows</h3>
|
<h3>On Windows</h3>
|
||||||
<p>The Java Runtime Library (called <code>jvm.dll</code>) can be found inside of your JRE install folder and looks like this:</p>
|
<p>The Java Runtime Library (called <code>jvm.dll</code>) can be found inside of your JRE install folder and looks like this:</p>
|
||||||
|
|||||||
Reference in New Issue
Block a user