Browse Source

Better error handling for strip

master
probonopd 8 years ago
parent
commit
6325cd4140
  1. 2
      linuxdeployqt/main.cpp
  2. 13
      shared/shared.cpp

2
linuxdeployqt/main.cpp

@ -38,7 +38,7 @@ int main(int argc, char **argv)
if (argc > 1) if (argc > 1)
appBinaryPath = QString::fromLocal8Bit(argv[1]); appBinaryPath = QString::fromLocal8Bit(argv[1]);
appBinaryPath = QDir::cleanPath(appBinaryPath); appBinaryPath = QDir::cleanPath(appBinaryPath).trimmed();
if (argc < 2 || appBinaryPath.startsWith("-")) { if (argc < 2 || appBinaryPath.startsWith("-")) {
qDebug() << "Usage: linuxdeployqt app-binary [options]"; qDebug() << "Usage: linuxdeployqt app-binary [options]";

13
shared/shared.cpp

@ -625,10 +625,17 @@ void runStrip(const QString &binaryPath)
QProcess strip; QProcess strip;
strip.start("strip", QStringList() << "-x" << binaryPath); strip.start("strip", QStringList() << "-x" << binaryPath);
strip.waitForFinished(); strip.waitForFinished();
if (strip.exitCode() != 0) {
LogError() << strip.readAllStandardError(); if (strip.exitCode() == 0)
LogError() << strip.readAllStandardOutput(); return;
if (strip.readAllStandardError().contains("Not enough room for program headers")) {
LogError() << QFileInfo(binaryPath).completeBaseName() << "already stripped.";
} else {
LogError() << "Error stripping" << QFileInfo(binaryPath).completeBaseName() << ":" << strip.readAllStandardError();
LogError() << "Error stripping" << QFileInfo(binaryPath).completeBaseName() << ":" << strip.readAllStandardOutput();
} }
} }
void stripAppBinary(const QString &bundlePath) void stripAppBinary(const QString &bundlePath)

Loading…
Cancel
Save