From 3fbd210b2a74f299083306c309fedbe862ecf458 Mon Sep 17 00:00:00 2001 From: Jake Petroules Date: Tue, 20 Oct 2015 00:13:21 -0700 Subject: [PATCH] Make iostool arguments closer to phonegap ios-deploy. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit phonegap's ios-deploy tool is probably the most widely known command line tool for deploying and debugging iOS applications. Make several arguments identical to theirs with the eventual goal of making iostool and ios-deploy command lines interchangeable. This is a libexec (private) tool only used internally by Qt Creator, so the changes should not impact anyone. Change-Id: I51f25f9c466570ca65b415d4ea94c78285cff1c2 Reviewed-by: Eike Ziller Reviewed-by: Tor Arne Vestbø --- src/plugins/ios/iostoolhandler.cpp | 21 ++++++++--------- src/tools/iostool/main.cpp | 38 ++++++++++++++++-------------- 2 files changed, 30 insertions(+), 29 deletions(-) diff --git a/src/plugins/ios/iostoolhandler.cpp b/src/plugins/ios/iostoolhandler.cpp index 7d3fe5c7dba..d4e4fd63dfa 100644 --- a/src/plugins/ios/iostoolhandler.cpp +++ b/src/plugins/ios/iostoolhandler.cpp @@ -591,9 +591,9 @@ void IosDeviceToolHandlerPrivate::requestTransferApp(const QString &bundlePath, this->bundlePath = bundlePath; this->deviceId = deviceId; QStringList args; - args << QLatin1String("-device-id") << deviceId << QLatin1String("-bundle") - << bundlePath << QLatin1String("-timeout") << QString::number(timeout) - << QLatin1String("-deploy"); + args << QLatin1String("--id") << deviceId << QLatin1String("--bundle") + << bundlePath << QLatin1String("--timeout") << QString::number(timeout) + << QLatin1String("--install"); start(IosToolHandler::iosDeviceToolPath(), args); } @@ -606,18 +606,17 @@ void IosDeviceToolHandlerPrivate::requestRunApp(const QString &bundlePath, this->deviceId = deviceId; this->runKind = runType; QStringList args; - args << QLatin1String("-device-id") << deviceId << QLatin1String("-bundle") - << bundlePath << QLatin1String("-timeout") << QString::number(timeout); - //args << QLatin1String("--deploy"); // to remove when the separate deploy step is functional + args << QLatin1String("--id") << deviceId << QLatin1String("--bundle") + << bundlePath << QLatin1String("--timeout") << QString::number(timeout); switch (runType) { case IosToolHandler::NormalRun: - args << QLatin1String("-run"); + args << QLatin1String("--run"); break; case IosToolHandler::DebugRun: - args << QLatin1String("-debug"); + args << QLatin1String("--debug"); break; } - args << QLatin1String("-extra-args") << extraArgs; + args << QLatin1String("--args") << extraArgs; op = OpAppRun; start(IosToolHandler::iosDeviceToolPath(), args); } @@ -626,8 +625,8 @@ void IosDeviceToolHandlerPrivate::requestDeviceInfo(const QString &deviceId, int { this->deviceId = deviceId; QStringList args; - args << QLatin1String("-device-id") << deviceId << QLatin1String("-device-info") - << QLatin1String("-timeout") << QString::number(timeout); + args << QLatin1String("--id") << deviceId << QLatin1String("--device-info") + << QLatin1String("--timeout") << QString::number(timeout); op = OpDeviceInfo; start(IosToolHandler::iosDeviceToolPath(), args); } diff --git a/src/tools/iostool/main.cpp b/src/tools/iostool/main.cpp index f902f761cd5..90eed751b33 100644 --- a/src/tools/iostool/main.cpp +++ b/src/tools/iostool/main.cpp @@ -531,34 +531,36 @@ void IosTool::run(const QStringList &args) out.writeStartElement(QLatin1String("query_result")); for (int iarg = 1; iarg < args.size(); ++iarg) { const QString &arg = args[iarg]; - if (arg == QLatin1String("-device-id")) { + if (arg == QLatin1String("-i") || arg == QLatin1String("--id")) { if (++iarg == args.size()) { - writeMsg("missing device id value after -device-id"); + writeMsg(QStringLiteral("missing device id value after ") + arg); printHelp = true; } deviceId = args.value(iarg); - } else if (arg == QLatin1String("-bundle")) { + } else if (arg == QLatin1String("-b") || arg == QLatin1String("--bundle")) { if (++iarg == args.size()) { - writeMsg("missing bundle path after -bundle"); + writeMsg(QStringLiteral("missing bundle path after ") + arg); printHelp = true; } bundlePath = args.value(iarg); - } else if (arg == QLatin1String("-deploy")) { + } else if (arg == QLatin1String("--install")) { appOp = Ios::IosDeviceManager::AppOp(appOp | Ios::IosDeviceManager::Install); - } else if (arg == QLatin1String("-run")) { + } else if (arg == QLatin1String("--run")) { appOp = Ios::IosDeviceManager::AppOp(appOp | Ios::IosDeviceManager::Run); - } else if (arg == QLatin1String("-ipv6")) { + } else if (arg == QLatin1String("--noninteractive")) { + // ignored for compatibility + } else if (arg == QLatin1String("--ipv6")) { ipv6 = true; - } else if (arg == QLatin1String("-verbose")) { + } else if (arg == QLatin1String("-v") || arg == QLatin1String("--verbose")) { echoRelays = true; - } else if (arg == QLatin1String("-debug")) { + } else if (arg == QLatin1String("-d") || arg == QLatin1String("--debug")) { appOp = Ios::IosDeviceManager::AppOp(appOp | Ios::IosDeviceManager::Run); debug = true; - } else if (arg == QLatin1String("-device-info")) { + } else if (arg == QLatin1String("--device-info")) { deviceInfo = true; - } else if (arg == QLatin1String("-timeout")) { + } else if (arg == QLatin1String("-t") || arg == QLatin1String("--timeout")) { if (++iarg == args.size()) { - writeMsg("missing timeout value after -timeout"); + writeMsg(QStringLiteral("missing timeout value after ") + arg); printHelp = true; } bool ok = false; @@ -569,10 +571,10 @@ void IosTool::run(const QStringList &args) writeMsg("timeout value should be an integer"); printHelp = true; } - } else if (arg == QLatin1String("-extra-args")) { + } else if (arg == QLatin1String("-a") || arg == QLatin1String("--args")) { extraArgs = args.mid(iarg + 1, args.size() - iarg - 1); iarg = args.size(); - } else if (arg == QLatin1String("-help") || arg == QLatin1String("--help")) { + } else if (arg == QLatin1String("-h") || arg == QLatin1String("--help")) { printHelp = true; } else { writeMsg(QString::fromLatin1("unexpected argument \"%1\"").arg(arg)); @@ -580,9 +582,9 @@ void IosTool::run(const QStringList &args) } if (printHelp) { out.writeStartElement(QLatin1String("msg")); - out.writeCharacters(QLatin1String("iosTool [-device-id ] [-bundle ] [-deploy] [-run] [-debug]\n")); - out.writeCharacters(QLatin1String(" [-device-info] [-timeout ] [-verbose]\n")); // to do pass in env as stub does - out.writeCharacters(QLatin1String(" [-extra-args ]")); + out.writeCharacters(QLatin1String("iostool [--id ] [--bundle ] [--install] [--run] [--debug]\n")); + out.writeCharacters(QLatin1String(" [--device-info] [--timeout ] [--verbose]\n")); // to do pass in env as stub does + out.writeCharacters(QLatin1String(" [--args ]")); out.writeEndElement(); doExit(-1); return; @@ -611,7 +613,7 @@ void IosTool::run(const QStringList &args) } if (deviceInfo) { if (!bundlePath.isEmpty()) - writeMsg("-device-info overrides bundlePath"); + writeMsg("--device-info overrides --bundle"); ++opLeft; manager->requestDeviceInfo(deviceId, timeout); } else if (!bundlePath.isEmpty()) {