Add flag to disable copyright files deployment
Should speed up linuxdeployqt runs on less powerful devices. Also makes sense to use while developing build scripts etc.
This commit is contained in:
@@ -79,6 +79,7 @@ int main(int argc, char **argv)
|
|||||||
qInfo() << " -always-overwrite : Copy files even if the target file exists";
|
qInfo() << " -always-overwrite : Copy files even if the target file exists";
|
||||||
qInfo() << " -qmake=<path> : The qmake executable to use";
|
qInfo() << " -qmake=<path> : The qmake executable to use";
|
||||||
qInfo() << " -no-translations : Skip deployment of translations.";
|
qInfo() << " -no-translations : Skip deployment of translations.";
|
||||||
|
qInfo() << " -no-copy-copyright-files : Skip deployment of copyright files.";
|
||||||
qInfo() << " -extra-plugins=<list> : List of extra plugins which should be deployed,";
|
qInfo() << " -extra-plugins=<list> : List of extra plugins which should be deployed,";
|
||||||
qInfo() << " separated by comma.";
|
qInfo() << " separated by comma.";
|
||||||
qInfo() << " -version : Print version statement and exit.";
|
qInfo() << " -version : Print version statement and exit.";
|
||||||
@@ -206,6 +207,7 @@ int main(int argc, char **argv)
|
|||||||
QStringList qmlDirs;
|
QStringList qmlDirs;
|
||||||
QString qmakeExecutable;
|
QString qmakeExecutable;
|
||||||
extern QStringList extraQtPlugins;
|
extern QStringList extraQtPlugins;
|
||||||
|
extern bool copyCopyrightFiles;
|
||||||
|
|
||||||
/* FHS-like mode is for an application that has been installed to a $PREFIX which is otherwise empty, e.g., /path/to/usr.
|
/* FHS-like mode is for an application that has been installed to a $PREFIX which is otherwise empty, e.g., /path/to/usr.
|
||||||
* In this case, we want to construct an AppDir in /path/to. */
|
* In this case, we want to construct an AppDir in /path/to. */
|
||||||
@@ -397,6 +399,9 @@ int main(int argc, char **argv)
|
|||||||
LogError() << "Missing qml directory path";
|
LogError() << "Missing qml directory path";
|
||||||
else
|
else
|
||||||
qmlDirs << argument.mid(index+1);
|
qmlDirs << argument.mid(index+1);
|
||||||
|
} else if (argument.startsWith("-no-copy-copyright-files")) {
|
||||||
|
LogDebug() << "Argument found:" << argument;
|
||||||
|
copyCopyrightFiles = false;
|
||||||
} else if (argument == QByteArray("-always-overwrite")) {
|
} else if (argument == QByteArray("-always-overwrite")) {
|
||||||
LogDebug() << "Argument found:" << argument;
|
LogDebug() << "Argument found:" << argument;
|
||||||
alwaysOwerwriteEnabled = true;
|
alwaysOwerwriteEnabled = true;
|
||||||
|
|||||||
@@ -58,6 +58,7 @@ int qtDetected = 0;
|
|||||||
bool qtDetectionComplete = 0; // As long as Qt is not detected yet, ldd may encounter "not found" messages, continue anyway
|
bool qtDetectionComplete = 0; // As long as Qt is not detected yet, ldd may encounter "not found" messages, continue anyway
|
||||||
bool deployLibrary = false;
|
bool deployLibrary = false;
|
||||||
QStringList extraQtPlugins;
|
QStringList extraQtPlugins;
|
||||||
|
bool copyCopyrightFiles = true;
|
||||||
|
|
||||||
using std::cout;
|
using std::cout;
|
||||||
using std::endl;
|
using std::endl;
|
||||||
@@ -284,6 +285,11 @@ bool copyCopyrightFile(QString libPath){
|
|||||||
* Debian-like systems. Pull requests welcome for other
|
* Debian-like systems. Pull requests welcome for other
|
||||||
* systems. */
|
* systems. */
|
||||||
|
|
||||||
|
if (!copyCopyrightFiles) {
|
||||||
|
LogNormal() << "Skipping copyright files deployment as requested by the user";
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
QString dpkgPath;
|
QString dpkgPath;
|
||||||
dpkgPath = QStandardPaths::findExecutable("dpkg");
|
dpkgPath = QStandardPaths::findExecutable("dpkg");
|
||||||
if(dpkgPath == ""){
|
if(dpkgPath == ""){
|
||||||
|
|||||||
Reference in New Issue
Block a user