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

Deploy libraries in QML imports

Browse Source
This commit is contained in:
probonopd
2017-04-03 18:23:07 +02:00
committed by GitHub
parent 57799ed9d3
commit b71bd4d587
1 changed files with 34 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
shared/shared.cpp
+34 -11
View File
@@ -120,7 +120,7 @@ bool copyFilePrintStatus(const QString &from, const QString &to)
if (alwaysOwerwriteEnabled) { if (alwaysOwerwriteEnabled) {
QFile(to).remove(); QFile(to).remove();
} else { } else {
LogNormal() << QFileInfo(to).fileName() << "already deployed, skipping."; LogDebug() << QFileInfo(to).fileName() << "already deployed, skipping.";
return false; return false;
} }
} }
@@ -179,7 +179,7 @@ LddInfo findDependencyInfo(const QString &binaryPath)
} }
foreach (QString outputLine, outputLines) { foreach (QString outputLine, outputLines) {
LogDebug() << "ldd outputLine:" << outputLine; // LogDebug() << "ldd outputLine:" << outputLine;
if (outputLine.contains("not found")){ if (outputLine.contains("not found")){
LogError() << "ldd outputLine:" << outputLine; LogError() << "ldd outputLine:" << outputLine;
} }
@@ -540,7 +540,26 @@ void recursiveCopyAndDeploy(const QString &appDirPath, const QSet<QString> &rpat
copyFilePrintStatus(fileSourcePath, fileDestinationPath); copyFilePrintStatus(fileSourcePath, fileDestinationPath);
if(fileDestinationPath.endsWith(".so")){ if(fileDestinationPath.endsWith(".so")){
LogError() << "TODO: Deploy library properly (i.e., set rpath and deploy its dependencies)" << fileDestinationPath;
LogDebug() << "Deploying .so in QML import" << fileSourcePath;
runStrip(fileDestinationPath);
// Find out the relative path to the lib/ directory and set it as the rpath
// FIXME: remove code duplication - the next few lines exist elsewhere already
if(fhsLikeMode == false){
bundleLibraryDirectory= "lib"; // relative to bundle
} else {
QString relativePrefix = fhsPrefix.replace(appDirPath+"/", "");
bundleLibraryDirectory = relativePrefix + "/lib/";
}
QDir dir(QFileInfo(fileDestinationPath).canonicalFilePath());
QString relativePath = dir.relativeFilePath(appDirPath + "/" + bundleLibraryDirectory);
relativePath.remove(0, 3); // remove initial '../'
changeIdentification("$ORIGIN:$ORIGIN/" + relativePath, QFileInfo(fileDestinationPath).canonicalFilePath());
QList<LibraryInfo> libraries = getQtLibraries(fileSourcePath, appDirPath, QSet<QString>());
deployQtLibraries(libraries, appDirPath, QStringList() << destinationPath, false);
} }
} }
@@ -648,9 +667,7 @@ bool patchQtCore(const QString &path, const QString &variable, const QString &va
void changeIdentification(const QString &id, const QString &binaryPath) void changeIdentification(const QString &id, const QString &binaryPath)
{ {
LogDebug() << "Using patchelf:"; LogNormal() << "Changing rpath in" << binaryPath << "to" << id;
LogDebug() << " change rpath in" << binaryPath;
LogDebug() << " to" << id;
runPatchelf(QStringList() << "--set-rpath" << id << binaryPath); runPatchelf(QStringList() << "--set-rpath" << id << binaryPath);
// qt_prfxpath: // qt_prfxpath:
@@ -1064,19 +1081,25 @@ void deployPlugins(const AppDirInfo &appDirInfo, const QString &pluginSourcePath
recursiveCopy(sourcePath, destinationPath); recursiveCopy(sourcePath, destinationPath);
} }
LogDebug() << "pluginList after having detected hopefully all required plugins:" << pluginList; LogNormal() << "pluginList after having detected hopefully all required plugins:" << pluginList;
foreach (const QString &plugin, pluginList) { foreach (const QString &plugin, pluginList) {
sourcePath = pluginSourcePath + "/" + plugin; sourcePath = pluginSourcePath + "/" + plugin;
destinationPath = pluginDestinationPath + "/" + plugin; destinationPath = pluginDestinationPath + "/" + plugin;
QDir dir; QDir dir;
dir.mkpath(QFileInfo(destinationPath).path()); dir.mkpath(QFileInfo(destinationPath).path());
deploymentInfo.deployedLibraries += findAppLibraries(destinationPath); QList<LibraryInfo> libraries = getQtLibraries(sourcePath, appDirInfo.path, deploymentInfo.rpathsUsed);
deploymentInfo.deployedLibraries = deploymentInfo.deployedLibraries.toSet().toList(); 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);
/*
// Find out the relative path to the lib/ directory and set it as the rpath
QDir dir(destinationPath);
QString relativePath = dir.relativeFilePath(appDirInfo.path + "/" + libraries[0].libraryDestinationDirectory);
relativePath.remove(0, 3); // remove initial '../'
changeIdentification("$ORIGIN/" + relativePath, QFileInfo(destinationPath).canonicalFilePath());
*/
} }
} }
} }