Commit 07037d6b authored by Friedemann Kleint's avatar Friedemann Kleint
Browse files

Symbian/ABLD: Determine package name (make sis) correctly for 4.6.1

Also delete the old package before executing "make sis" to ensure
that no old file lingers around should the naming change again.
parent ffc149ab
...@@ -387,6 +387,17 @@ void S60DeviceRunConfiguration::setCommandLineArguments(const QStringList &args) ...@@ -387,6 +387,17 @@ void S60DeviceRunConfiguration::setCommandLineArguments(const QStringList &args)
m_commandLineArguments = args; m_commandLineArguments = args;
} }
// Fix up target specification for "make sis":
// "udeb"-> "debug", "urel" -> "release"
static inline QString fixBaseNameTarget(const QString &in)
{
if (in == QLatin1String("udeb"))
return QLatin1String("debug");
if (in == QLatin1String("urel"))
return QLatin1String("release");
return in;
}
void S60DeviceRunConfiguration::updateTarget() void S60DeviceRunConfiguration::updateTarget()
{ {
if (m_cachedTargetInformationValid) if (m_cachedTargetInformationValid)
...@@ -431,8 +442,8 @@ void S60DeviceRunConfiguration::updateTarget() ...@@ -431,8 +442,8 @@ void S60DeviceRunConfiguration::updateTarget()
m_target = QLatin1String("udeb"); m_target = QLatin1String("udeb");
else else
m_target = QLatin1String("urel"); m_target = QLatin1String("urel");
m_baseFileName += QLatin1Char('_') + m_platform + QLatin1Char('_') + m_target; m_baseFileName += QLatin1Char('_') + fixBaseNameTarget(m_target)
+ QLatin1Char('-') + m_platform;
m_cachedTargetInformationValid = true; m_cachedTargetInformationValid = true;
emit targetInformationChanged(); emit targetInformationChanged();
} }
...@@ -621,6 +632,16 @@ static inline QString msgRun(const QString &cmd, const QStringList &args) ...@@ -621,6 +632,16 @@ static inline QString msgRun(const QString &cmd, const QStringList &args)
return QDir::toNativeSeparators(cmd) + blank + args.join(QString(blank)); return QDir::toNativeSeparators(cmd) + blank + args.join(QString(blank));
} }
static inline bool ensureDeleteFile(const QString &fileName, QString *errorMessage)
{
QFile file(fileName);
if (file.exists() && !file.remove()) {
*errorMessage = S60DeviceRunControlBase::tr("Unable to remove existing file '%1': %2").arg(fileName, file.errorString());
return false;
}
return true;
}
void S60DeviceRunControlBase::start() void S60DeviceRunControlBase::start()
{ {
m_deployProgress = new QFutureInterface<void>; m_deployProgress = new QFutureInterface<void>;
...@@ -651,6 +672,11 @@ void S60DeviceRunControlBase::start() ...@@ -651,6 +672,11 @@ void S60DeviceRunControlBase::start()
settingsCategory, settingsPage); settingsCategory, settingsPage);
return; return;
} }
// Be sure to delete old files
if (!ensureDeleteFile(m_signedPackage, &errorMessage)) {
error(this, errorMessage);
emit finished();
}
QStringList makeSisArgs; QStringList makeSisArgs;
makeSisArgs << QLatin1String("sis") makeSisArgs << QLatin1String("sis")
...@@ -660,6 +686,7 @@ void S60DeviceRunControlBase::start() ...@@ -660,6 +686,7 @@ void S60DeviceRunControlBase::start()
emit addToOutputWindow(this, msgRun(m_makeTool, makeSisArgs)); emit addToOutputWindow(this, msgRun(m_makeTool, makeSisArgs));
if (debug) if (debug)
qDebug() << m_makeTool << makeSisArgs << m_workingDirectory; qDebug() << m_makeTool << makeSisArgs << m_workingDirectory;
m_makesisProcess->start(m_makeTool, makeSisArgs, QIODevice::ReadOnly); m_makesisProcess->start(m_makeTool, makeSisArgs, QIODevice::ReadOnly);
m_makesisProcess->closeWriteChannel(); m_makesisProcess->closeWriteChannel();
} }
...@@ -712,11 +739,8 @@ static inline bool renameFile(const QString &sourceName, const QString &targetNa ...@@ -712,11 +739,8 @@ static inline bool renameFile(const QString &sourceName, const QString &targetNa
{ {
if (sourceName == targetName) if (sourceName == targetName)
return true; return true;
QFile target(targetName); if (!ensureDeleteFile(targetName, errorMessage))
if (target.exists() && !target.remove()) {
*errorMessage = S60DeviceRunControlBase::tr("Unable to remove existing file '%1': %2").arg(targetName, target.errorString());
return false; return false;
}
QFile source(sourceName); QFile source(sourceName);
if (!source.rename(targetName)) { if (!source.rename(targetName)) {
*errorMessage = S60DeviceRunControlBase::tr("Unable to rename file '%1' to '%2': %3") *errorMessage = S60DeviceRunControlBase::tr("Unable to rename file '%1' to '%2': %3")
......
...@@ -442,8 +442,11 @@ SymbianDeviceManager::SymbianDeviceList SymbianDeviceManager::blueToothDevices() ...@@ -442,8 +442,11 @@ SymbianDeviceManager::SymbianDeviceList SymbianDeviceManager::blueToothDevices()
} }
} }
// New kernel versions support /dev/ttyUSB0, /dev/ttyUSB1. Trk responds // New kernel versions support /dev/ttyUSB0, /dev/ttyUSB1. Trk responds
// on the latter (usually). // on the latter (usually), try first.
const QString ttyUSBDevice = QLatin1String("/dev/ttyUSB1"); static const char *usbTtyDevices[] = { "/dev/ttyUSB1", "/dev/ttyUSB0" };
const int usbTtyCount = sizeof(usbTtyDevices)/sizeof(const char *);
for (int d = 0; d < usbTtyCount; d++) {
const QString ttyUSBDevice = QLatin1String(usbTtyDevices[d]);
if (QFileInfo(ttyUSBDevice).exists()) { if (QFileInfo(ttyUSBDevice).exists()) {
SymbianDeviceData *device = new SymbianDeviceData; SymbianDeviceData *device = new SymbianDeviceData;
device->type = SerialPortCommunication; device->type = SerialPortCommunication;
...@@ -451,6 +454,7 @@ SymbianDeviceManager::SymbianDeviceList SymbianDeviceManager::blueToothDevices() ...@@ -451,6 +454,7 @@ SymbianDeviceManager::SymbianDeviceList SymbianDeviceManager::blueToothDevices()
device->friendlyName = QString::fromLatin1("USB/Serial device (%1)").arg(device->portName); device->friendlyName = QString::fromLatin1("USB/Serial device (%1)").arg(device->portName);
rc.push_back(SymbianDevice(device)); rc.push_back(SymbianDevice(device));
} }
}
#endif #endif
return rc; return rc;
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment