Magic-Mirror/cutter
1
0
Fork 0
mirror of https://github.com/rizinorg/cutter.git synced 2024-11-23 12:59:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update rizin and version API (#3008)

Browse Source
This commit is contained in:
billow 2022-08-09 09:29:08 +08:00 committed by GitHub
parent 9e2201aa81
commit 35f9bfe135
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dist/bundle_python.ps1 vendored
View File

@ -2,7 +2,7 @@ $arch = $args[0]
$dist = $args[1] $dist = $args[1]
$py_version = (python --version).Split()[1] $py_version = (python --version).Split()[1]
$py_base = "python" + $py_version[0] + $py_version[2] $py_base = "python" + $py_version.Split('.')[0] + $py_version.Split('.')[1]
$py_platform = If ($arch -eq "x64") {"amd64"} Else {"win32"} $py_platform = If ($arch -eq "x64") {"amd64"} Else {"win32"}
$py_url = "https://www.python.org/ftp/python/${py_version}/python-${py_version}-embed-${py_platform}.zip" $py_url = "https://www.python.org/ftp/python/${py_version}/python-${py_version}-embed-${py_platform}.zip"

2
rizin

@ -1 +1 @@
Subproject commit b79201b49a0d687c854b6e2f0c88fc8a7f2afa61 Subproject commit 215e49253d3a35e1aae340b7ae8465018254ae87

8
src/core/Cutter.cpp
View File

@ -4297,10 +4297,9 @@ void CutterCore::loadScript(const QString &scriptname)
triggerRefreshAll(); triggerRefreshAll();
} }
QString CutterCore::getRizinVersionReadable() QString CutterCore::getRizinVersionReadable(const char *program)
{ {
return QString("%1 (%2)").arg(QString::fromUtf8(RZ_VERSION), return fromOwnedCharPtr(rz_version_str(program));
QString::fromUtf8(RZ_GITTIP).left(7));
} }
QString CutterCore::getVersionInformation() QString CutterCore::getVersionInformation()
@ -4337,7 +4336,8 @@ QString CutterCore::getVersionInformation()
/* ... */ /* ... */
{ NULL, NULL } { NULL, NULL }
}; };
versionInfo.append(QString("%1 rz\n").arg(getRizinVersionReadable())); versionInfo.append(getRizinVersionReadable());
versionInfo.append("\n");
for (i = 0; vcs[i].name; i++) { for (i = 0; vcs[i].name; i++) {
struct vcs_t *v = &vcs[i]; struct vcs_t *v = &vcs[i];
const char *name = v->callback(); const char *name = v->callback();

2
src/core/Cutter.h
View File

@ -201,7 +201,7 @@ public:
{ {
return asyncCmdEsil(command.toUtf8().constData(), task); return asyncCmdEsil(command.toUtf8().constData(), task);
} }
QString getRizinVersionReadable(); QString getRizinVersionReadable(const char *program = nullptr);
QString getVersionInformation(); QString getVersionInformation();
CutterJson parseJson(char *res, const char *cmd = nullptr); CutterJson parseJson(char *res, const char *cmd = nullptr);