Commit 37fa34e2 authored by Christian Kandeler's avatar Christian Kandeler
Browse files

Maemo: Fix deployment issues with disabled packaging.

parent a0d1d7af
...@@ -352,10 +352,12 @@ void MaemoDeployStep::start() ...@@ -352,10 +352,12 @@ void MaemoDeployStep::start()
const int deployableCount = m_deployables->deployableCount(); const int deployableCount = m_deployables->deployableCount();
for (int i = 0; i < deployableCount; ++i) { for (int i = 0; i < deployableCount; ++i) {
const MaemoDeployable &d = m_deployables->deployableAt(i); const MaemoDeployable &d = m_deployables->deployableAt(i);
if (currentlyNeedsDeployment(hostName, d)) if (currentlyNeedsDeployment(hostName, d)
|| QFileInfo(d.localFilePath).isDir()) {
m_filesToCopy << d; m_filesToCopy << d;
} }
} }
}
if (m_needsInstall || !m_filesToCopy.isEmpty()) { if (m_needsInstall || !m_filesToCopy.isEmpty()) {
if (m_cachedDeviceConfig->type() == MaemoDeviceConfig::Emulator if (m_cachedDeviceConfig->type() == MaemoDeviceConfig::Emulator
...@@ -650,6 +652,8 @@ void MaemoDeployStep::installToSysroot() ...@@ -650,6 +652,8 @@ void MaemoDeployStep::installToSysroot()
+ d.remoteDir + sep + QFileInfo(d.localFilePath).fileName(); + d.remoteDir + sep + QFileInfo(d.localFilePath).fileName();
sysRootDir.mkpath(d.remoteDir.mid(1)); sysRootDir.mkpath(d.remoteDir.mid(1));
QFile::remove(targetFilePath); QFile::remove(targetFilePath);
QString dummy;
MaemoGlobal::removeRecursively(targetFilePath, dummy);
if (!MaemoGlobal::copyRecursively(d.localFilePath, targetFilePath)) { if (!MaemoGlobal::copyRecursively(d.localFilePath, targetFilePath)) {
writeOutput(tr("Sysroot installation failed: " writeOutput(tr("Sysroot installation failed: "
"Could not copy '%1' to '%2'. Continuing anyway.") "Could not copy '%1' to '%2'. Continuing anyway.")
......
...@@ -30,7 +30,6 @@ ...@@ -30,7 +30,6 @@
** Nokia at qt-info@nokia.com. ** Nokia at qt-info@nokia.com.
** **
**************************************************************************/ **************************************************************************/
#include "maemoglobal.h" #include "maemoglobal.h"
#include "maemoconstants.h" #include "maemoconstants.h"
......
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