1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

centralize bundle_dir calculation

Browse Source 
Change-Id: I353fb4eafc014bccdec71af42f8625b33488ae0d
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
This commit is contained in:
Oswald Buddenhagen 2014-09-25 16:48:44 +02:00
parent 4849037851
commit 59e8d430e9
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
qmake/generators/unix/unixmake2.cpp
View File

@ -703,9 +703,10 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
} }
if (!project->isEmpty("QMAKE_BUNDLE")) { if (!project->isEmpty("QMAKE_BUNDLE")) {
QString bundle_dir = project->first("DESTDIR") + project->first("QMAKE_BUNDLE") + "/";
if (!project->first("QMAKE_PKGINFO").isEmpty()) { if (!project->first("QMAKE_PKGINFO").isEmpty()) {
ProString pkginfo = escapeFilePath(project->first("QMAKE_PKGINFO")); ProString pkginfo = escapeFilePath(project->first("QMAKE_PKGINFO"));
QString destdir = project->first("DESTDIR") + project->first("QMAKE_BUNDLE") + "/Contents"; QString destdir = bundle_dir + "Contents";
t << pkginfo << ": \n\t"; t << pkginfo << ": \n\t";
if (!destdir.isEmpty()) if (!destdir.isEmpty())
t << mkdir_p_asstring(destdir) << "\n\t"; t << mkdir_p_asstring(destdir) << "\n\t";
@ -718,7 +719,7 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
if (!project->first("QMAKE_BUNDLE_RESOURCE_FILE").isEmpty()) { if (!project->first("QMAKE_BUNDLE_RESOURCE_FILE").isEmpty()) {
ProString resources = escapeFilePath(project->first("QMAKE_BUNDLE_RESOURCE_FILE")); ProString resources = escapeFilePath(project->first("QMAKE_BUNDLE_RESOURCE_FILE"));
bundledFiles << resources; bundledFiles << resources;
QString destdir = project->first("DESTDIR") + project->first("QMAKE_BUNDLE") + "/Contents/Resources"; QString destdir = bundle_dir + "Contents/Resources";
t << resources << ": \n\t"; t << resources << ": \n\t";
t << mkdir_p_asstring(destdir) << "\n\t"; t << mkdir_p_asstring(destdir) << "\n\t";
t << "@touch " << resources << "\n\t\n"; t << "@touch " << resources << "\n\t\n";
@ -760,7 +761,7 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
<< "" << info_plist << " >" << info_plist_out << endl; << "" << info_plist << " >" << info_plist_out << endl;
//copy the icon //copy the icon
if(!project->isEmpty("ICON")) { if(!project->isEmpty("ICON")) {
QString dir = project->first("DESTDIR") + project->first("QMAKE_BUNDLE") + "/Contents/Resources/"; QString dir = bundle_dir + "Contents/Resources/";
const QString icon_path = escapeFilePath(dir + icon.section(Option::dir_sep, -1)); const QString icon_path = escapeFilePath(dir + icon.section(Option::dir_sep, -1));
bundledFiles << icon_path; bundledFiles << icon_path;
t << icon_path << ": " << icon << "\n\t" t << icon_path << ": " << icon << "\n\t"
@ -781,7 +782,6 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
} }
//copy other data //copy other data
if(!project->isEmpty("QMAKE_BUNDLE_DATA")) { if(!project->isEmpty("QMAKE_BUNDLE_DATA")) {
QString bundle_dir = project->first("DESTDIR") + project->first("QMAKE_BUNDLE") + "/";
const ProStringList &bundle_data = project->values("QMAKE_BUNDLE_DATA"); const ProStringList &bundle_data = project->values("QMAKE_BUNDLE_DATA");
for(int i = 0; i < bundle_data.count(); i++) { for(int i = 0; i < bundle_data.count(); i++) {
const ProStringList &files = project->values(ProKey(bundle_data[i] + ".files")); const ProStringList &files = project->values(ProKey(bundle_data[i] + ".files"));