Cherry-pick SysInfo from #680
Signed-off-by: timoreo <contact@timoreo.fr>
This commit is contained in:
parent
9a4a92de4f
commit
a97387b692
@ -580,6 +580,8 @@ SET(LAUNCHER_SOURCES
|
||||
UpdateController.h
|
||||
ApplicationMessage.h
|
||||
ApplicationMessage.cpp
|
||||
SysInfo.h
|
||||
SysInfo.cpp
|
||||
|
||||
# GUI - general utilities
|
||||
DesktopServices.h
|
||||
|
155
launcher/SysInfo.cpp
Normal file
155
launcher/SysInfo.cpp
Normal file
@ -0,0 +1,155 @@
|
||||
#include <QString>
|
||||
#include <QDebug>
|
||||
#include "settings/SettingsObject.h"
|
||||
#ifdef Q_OS_MACOS
|
||||
#include <sys/sysctl.h>
|
||||
#endif
|
||||
#include <FileSystem.h>
|
||||
#include <QStandardPaths>
|
||||
#include <QFileInfo>
|
||||
#include "MessageLevel.h"
|
||||
#include <QFile>
|
||||
#include <QProcess>
|
||||
#include <QMap>
|
||||
#include "java/JavaUtils.h"
|
||||
#include "FileSystem.h"
|
||||
#include "Commandline.h"
|
||||
#include "Application.h"
|
||||
|
||||
#ifdef Q_OS_MACOS
|
||||
bool rosettaDetect() {
|
||||
int ret = 0;
|
||||
size_t size = sizeof(ret);
|
||||
if (sysctlbyname("sysctl.proc_translated", &ret, &size, NULL, 0) == -1)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
if(ret == 0)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
if(ret == 1)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
#endif
|
||||
|
||||
namespace SysInfo {
|
||||
QString currentSystem() {
|
||||
#if defined(Q_OS_LINUX)
|
||||
return "linux";
|
||||
#elif defined(Q_OS_MACOS)
|
||||
return "osx";
|
||||
#elif defined(Q_OS_WINDOWS)
|
||||
return "windows";
|
||||
#elif defined(Q_OS_FREEBSD)
|
||||
return "freebsd";
|
||||
#elif defined(Q_OS_OPENBSD)
|
||||
return "openbsd";
|
||||
#else
|
||||
return "unknown";
|
||||
#endif
|
||||
}
|
||||
|
||||
QString useQTForArch(){
|
||||
auto qtArch = QSysInfo::currentCpuArchitecture();
|
||||
#if defined(Q_OS_MACOS) && !defined(Q_PROCESSOR_ARM)
|
||||
if(rosettaDetect())
|
||||
{
|
||||
return "arm64";
|
||||
}
|
||||
else
|
||||
{
|
||||
return "x86_64";
|
||||
}
|
||||
#endif
|
||||
return qtArch;
|
||||
}
|
||||
|
||||
QString runCheckerForArch(const SettingsObjectPtr& settingsObj){
|
||||
QString checkerJar = FS::PathCombine(APPLICATION->getJarsPath(), "JavaCheck.jar");
|
||||
|
||||
QStringList args;
|
||||
|
||||
QProcessPtr process = new QProcess();
|
||||
args.append({"-jar", checkerJar});
|
||||
process->setArguments(args);
|
||||
process->setProgram(settingsObj->get("JavaPath").toString());
|
||||
process->setProcessChannelMode(QProcess::SeparateChannels);
|
||||
process->setProcessEnvironment(CleanEnviroment());
|
||||
qDebug() << "Running java checker: " + settingsObj->get("JavaPath").toString() + args.join(" ");;
|
||||
|
||||
process->start();
|
||||
if(!process->waitForFinished(15000)){
|
||||
// we've been waiting for 15 seconds! wtf! OR... it already finished. But HOW WOULD THAT HAPPEN?
|
||||
process->kill(); // die. BUUURNNNN
|
||||
// fallback to using polymc arch
|
||||
return useQTForArch();
|
||||
} else {
|
||||
// yay we can use the java arch
|
||||
QString stdout_javaChecker;
|
||||
QString stderr_javaChecker;
|
||||
|
||||
// process stdout
|
||||
QByteArray data = process->readAllStandardOutput();
|
||||
QString added = QString::fromLocal8Bit(data);
|
||||
added.remove('\r');
|
||||
stdout_javaChecker += added;
|
||||
|
||||
// process stderr
|
||||
data = process->readAllStandardError();
|
||||
added = QString::fromLocal8Bit(data);
|
||||
added.remove('\r');
|
||||
stderr_javaChecker += added;
|
||||
|
||||
QMap<QString, QString> results;
|
||||
QStringList lines = stdout_javaChecker.split("\n", QString::SkipEmptyParts);
|
||||
for(QString line : lines)
|
||||
{
|
||||
line = line.trimmed();
|
||||
// NOTE: workaround for GH-4125, where garbage is getting printed into stdout on bedrock linux
|
||||
if (line.contains("/bedrock/strata")) {
|
||||
continue;
|
||||
}
|
||||
|
||||
auto parts = line.split('=', QString::SkipEmptyParts);
|
||||
if(parts.size() != 2 || parts[0].isEmpty() || parts[1].isEmpty())
|
||||
{
|
||||
continue;
|
||||
}
|
||||
else
|
||||
{
|
||||
results.insert(parts[0], parts[1]);
|
||||
}
|
||||
}
|
||||
|
||||
if(!results.contains("os.arch") || !results.contains("java.version") || !results.contains("java.vendor"))
|
||||
{
|
||||
// wtf man why
|
||||
// fallback to using polymc arch
|
||||
return useQTForArch();
|
||||
}
|
||||
|
||||
return results["os.arch"];
|
||||
}
|
||||
}
|
||||
|
||||
QString currentArch(const SettingsObjectPtr& settingsObj) {
|
||||
auto realJavaArchitecture = settingsObj->get("JavaRealArchitecture").toString();
|
||||
if(realJavaArchitecture == ""){
|
||||
//BRO WHY NOW I HAVE TO USE A JAVA CHECKER >:(
|
||||
qDebug() << "SysInfo: BRO I HAVE TO USE A JAVA CHECKER WHY IS JAVA ARCH BORKED";
|
||||
settingsObj->set("JavaRealArchitecture", runCheckerForArch(settingsObj));
|
||||
realJavaArchitecture = settingsObj->get("JavaRealArchitecture").toString();
|
||||
}
|
||||
//qDebug() << "SysInfo: realJavaArch = " << realJavaArchitecture;
|
||||
if(realJavaArchitecture == "aarch64"){
|
||||
return "arm64";
|
||||
} else {
|
||||
return realJavaArchitecture;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
13
launcher/SysInfo.h
Normal file
13
launcher/SysInfo.h
Normal file
@ -0,0 +1,13 @@
|
||||
#include <QString>
|
||||
#include "settings/SettingsObject.h"
|
||||
#ifdef Q_OS_MACOS
|
||||
#include <sys/sysctl.h>
|
||||
#endif
|
||||
|
||||
namespace SysInfo {
|
||||
QString currentSystem();
|
||||
QString currentArch(const SettingsObjectPtr& settingsObj);
|
||||
QString runCheckerForArch(const SettingsObjectPtr& settingsObj);
|
||||
QString useQTForArch();
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user