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

Make #5 verbose (help wanted)

Browse Source
This commit is contained in:
probonopd
2016-09-06 20:39:47 +02:00
parent da700386f4
commit e947ff4941
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
linuxdeployqt/main.cpp
-2
View File
@@ -173,10 +173,8 @@ int main(int argc, char **argv)
bool ok = deployQmlImports(appDirPath, deploymentInfo, qmlDirs); bool ok = deployQmlImports(appDirPath, deploymentInfo, qmlDirs);
if (!ok && qmldirArgumentUsed) if (!ok && qmldirArgumentUsed)
return 1; // exit if the user explicitly asked for qml import deployment return 1; // exit if the user explicitly asked for qml import deployment
// Update deploymentInfo.deployedLibraries - the QML imports // Update deploymentInfo.deployedLibraries - the QML imports
// may have brought in extra libraries as dependencies. // may have brought in extra libraries as dependencies.
// deploymentInfo.deployedLibraries += findAppLibraryNames(appDirPath);
deploymentInfo.deployedLibraries += findAppLibraries(appDirPath); deploymentInfo.deployedLibraries += findAppLibraries(appDirPath);
deploymentInfo.deployedLibraries = deploymentInfo.deployedLibraries.toSet().toList(); deploymentInfo.deployedLibraries = deploymentInfo.deployedLibraries.toSet().toList();
} }
shared/shared.cpp
+5
View File
@@ -743,6 +743,11 @@ void deployPlugins(const AppDirInfo &appDirInfo, const QString &pluginSourcePath
const QString destinationPath = pluginDestinationPath + "/" + plugin; const QString destinationPath = pluginDestinationPath + "/" + plugin;
QDir dir; QDir dir;
dir.mkpath(QFileInfo(destinationPath).path()); dir.mkpath(QFileInfo(destinationPath).path());
LogError() << "FIXME: Need to scan" << destinationPath << "for additional dependencies (this is not yorking yet)";
LogError() << "FIXME: Update deploymentInfo.deployedLibraries - the plugins";
LogError() << "FIXME: will have brought in extra libraries as dependencies (e.g., plugins/platforms/libqxcb.so needs libQt5XcbQpa.so.5)";
deploymentInfo.deployedLibraries += findAppLibraries(destinationPath);
deploymentInfo.deployedLibraries = deploymentInfo.deployedLibraries.toSet().toList();
if (copyFilePrintStatus(sourcePath, destinationPath)) { if (copyFilePrintStatus(sourcePath, destinationPath)) {
runStrip(destinationPath); runStrip(destinationPath);