TianZD/linuxdeployqt
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add verbosity concerning non-properly deployed libs

Browse Source
This commit is contained in:
probonopd
2017-03-26 22:33:25 +02:00
parent 60725dec9a
commit 2897666c50
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
shared/shared.cpp
+6 -3
View File
@@ -539,6 +539,9 @@ void recursiveCopyAndDeploy(const QString &appDirPath, const QSet<QString> &rpat
QString fileDestinationPath = destinationPath + QLatin1Char('/') + file; QString fileDestinationPath = destinationPath + QLatin1Char('/') + file;
copyFilePrintStatus(fileSourcePath, fileDestinationPath); copyFilePrintStatus(fileSourcePath, fileDestinationPath);
if(fileDestinationPath.endsWith(".so")){
LogError() << "TODO: Deploy library properly (i.e., set rpath and deploy its dependencies)" << fileDestinationPath;
}
} }
QStringList subdirs = QDir(sourcePath).entryList(QStringList() << QStringLiteral("*"), QDir::Dirs | QDir::NoDotAndDotDot); QStringList subdirs = QDir(sourcePath).entryList(QStringList() << QStringLiteral("*"), QDir::Dirs | QDir::NoDotAndDotDot);
@@ -837,7 +840,7 @@ DeploymentInfo deployQtLibraries(QList<LibraryInfo> libraries,
const QString &bundlePath, const QStringList &binaryPaths, const QString &bundlePath, const QStringList &binaryPaths,
bool useLoaderPath) bool useLoaderPath)
{ {
LogNormal() << "Deploying libraries found inside:" << binaryPaths; LogNormal() << "Deploying the following libraries:" << binaryPaths;
QStringList copiedLibraries; QStringList copiedLibraries;
DeploymentInfo deploymentInfo; DeploymentInfo deploymentInfo;
deploymentInfo.useLoaderPath = useLoaderPath; deploymentInfo.useLoaderPath = useLoaderPath;
@@ -853,7 +856,6 @@ DeploymentInfo deployQtLibraries(QList<LibraryInfo> libraries,
deploymentInfo.qtPath = library.libraryDirectory; deploymentInfo.qtPath = library.libraryDirectory;
} }
if (library.libraryDirectory.startsWith(bundlePath)) { if (library.libraryDirectory.startsWith(bundlePath)) {
LogNormal() << library.libraryName << "already deployed, skipping."; LogNormal() << library.libraryName << "already deployed, skipping.";
continue; continue;
@@ -1125,9 +1127,10 @@ void deployPlugins(const AppDirInfo &appDirInfo, const QString &pluginSourcePath
deploymentInfo.deployedLibraries += findAppLibraries(destinationPath); deploymentInfo.deployedLibraries += findAppLibraries(destinationPath);
deploymentInfo.deployedLibraries = deploymentInfo.deployedLibraries.toSet().toList(); deploymentInfo.deployedLibraries = deploymentInfo.deployedLibraries.toSet().toList();
QList<LibraryInfo> libraries = getQtLibraries(sourcePath, appDirInfo.path, deploymentInfo.rpathsUsed);
LogDebug() << "Deploying plugin" << sourcePath;
if (copyFilePrintStatus(sourcePath, destinationPath)) { if (copyFilePrintStatus(sourcePath, destinationPath)) {
runStrip(destinationPath); runStrip(destinationPath);
QList<LibraryInfo> libraries = getQtLibraries(sourcePath, appDirInfo.path, deploymentInfo.rpathsUsed);
deployQtLibraries(libraries, appDirInfo.path, QStringList() << destinationPath, deploymentInfo.useLoaderPath); deployQtLibraries(libraries, appDirInfo.path, QStringList() << destinationPath, deploymentInfo.useLoaderPath);
} }
} }