diff options
author | Liang Qi <liang.qi@qt.io> | 2018-02-02 09:58:28 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2018-02-02 13:21:18 +0100 |
commit | fb16802edcbf8feeecd6a4f760888852aafd117e (patch) | |
tree | 910eebd355106840d6bfa24a8b73365b06272ba0 /src/macdeployqt/shared | |
parent | 3c7675d9609a15bea81884560920bded736f79a6 (diff) | |
parent | f1233878fef715c0746dcb6af7164acfb46fd418 (diff) |
Merge remote-tracking branch 'origin/5.9' into 5.105.10
Conflicts:
src/qtattributionsscanner/main.cpp
Change-Id: Ic509d457547ec64122b17511563de5ea3e1b1b44
Diffstat (limited to 'src/macdeployqt/shared')
-rw-r--r-- | src/macdeployqt/shared/shared.cpp | 8 | ||||
-rw-r--r-- | src/macdeployqt/shared/shared.h | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/src/macdeployqt/shared/shared.cpp b/src/macdeployqt/shared/shared.cpp index a2284a192..9ce06e597 100644 --- a/src/macdeployqt/shared/shared.cpp +++ b/src/macdeployqt/shared/shared.cpp @@ -1495,7 +1495,7 @@ void codesign(const QString &identity, const QString &appBundlePath) { codesignBundle(identity, appBundlePath, QList<QString>()); } -void createDiskImage(const QString &appBundlePath) +void createDiskImage(const QString &appBundlePath, const QString &filesystemType) { QString appBaseName = appBundlePath; appBaseName.chop(4); // remove ".app" from end @@ -1513,16 +1513,22 @@ void createDiskImage(const QString &appBundlePath) LogNormal() << "Creating disk image (.dmg) for" << appBundlePath; } + LogNormal() << "Image will use" << filesystemType; + // More dmg options can be found in the hdiutil man page. QStringList options = QStringList() << "create" << dmgName << "-srcfolder" << appBundlePath << "-format" << "UDZO" + << "-fs" << filesystemType << "-volname" << appBaseName; QProcess hdutil; hdutil.start("hdiutil", options); hdutil.waitForFinished(-1); + if (hdutil.exitCode() != 0) { + LogError() << "Bundle creation error:" << hdutil.readAllStandardError(); + } } void fixupFramework(const QString &frameworkName) diff --git a/src/macdeployqt/shared/shared.h b/src/macdeployqt/shared/shared.h index c173846c8..c4d60ea0a 100644 --- a/src/macdeployqt/shared/shared.h +++ b/src/macdeployqt/shared/shared.h @@ -129,7 +129,7 @@ QSet<QString> codesignBundle(const QString &identity, const QString &appBundlePath, QList<QString> additionalBinariesContainingRpaths); void codesign(const QString &identity, const QString &appBundlePath); -void createDiskImage(const QString &appBundlePath); +void createDiskImage(const QString &appBundlePath, const QString &filesystemType); void fixupFramework(const QString &appBundlePath); |