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

reshuffle assembly of uninstall commands

Browse Source 
make a proper stringlist of commands, and join it in reverse order
only at the end. the reversal ensures that we can cleanly fold up
directory hierarchies we may build.

Change-Id: I9a241361588a6965283aec5258e1d622b35514e0
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
This commit is contained in:
Oswald Buddenhagen 2012-08-07 16:35:11 +02:00 committed by Qt by Nokia
parent 14d0dc1dca
commit 350d5ff3dd
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
qmake/generators/makefile.cpp
View File

@ -1202,7 +1202,7 @@ MakefileGenerator::writeInstalls(QTextStream &t, const QString &installs, bool n
dst += Option::dir_sep; dst += Option::dir_sep;
} }
QStringList tmp, uninst = project->values((*it) + ".uninstall"); QStringList tmp, uninst;
//other //other
tmp = project->values((*it) + ".extra"); tmp = project->values((*it) + ".extra");
if(tmp.isEmpty()) if(tmp.isEmpty())
@ -1255,8 +1255,6 @@ MakefileGenerator::writeInstalls(QTextStream &t, const QString &installs, bool n
!fi.isDir() && fi.isExecutable() && !project->isEmpty("QMAKE_STRIP")) !fi.isDir() && fi.isExecutable() && !project->isEmpty("QMAKE_STRIP"))
target += QString("\t-") + var("QMAKE_STRIP") + " " + target += QString("\t-") + var("QMAKE_STRIP") + " " +
escapeFilePath(filePrefixRoot(root, fileFixify(dst + filestr, FileFixifyAbsolute, false))) + "\n"; escapeFilePath(filePrefixRoot(root, fileFixify(dst + filestr, FileFixifyAbsolute, false))) + "\n";
if(!uninst.isEmpty())
uninst.append("\n\t");
uninst.append(rm_dir_contents + " " + escapeFilePath(filePrefixRoot(root, fileFixify(dst + filestr, FileFixifyAbsolute, false)))); uninst.append(rm_dir_contents + " " + escapeFilePath(filePrefixRoot(root, fileFixify(dst + filestr, FileFixifyAbsolute, false))));
continue; continue;
} }
@ -1282,16 +1280,12 @@ MakefileGenerator::writeInstalls(QTextStream &t, const QString &installs, bool n
} }
cmd += " " + escapeFilePath(wild) + " " + escapeFilePath(dst_file) + "\n"; cmd += " " + escapeFilePath(wild) + " " + escapeFilePath(dst_file) + "\n";
target += cmd; target += cmd;
if(!uninst.isEmpty())
uninst.append("\n\t");
uninst.append(rm_dir_contents + " " + escapeFilePath(filePrefixRoot(root, fileFixify(dst + filestr, FileFixifyAbsolute, false)))); uninst.append(rm_dir_contents + " " + escapeFilePath(filePrefixRoot(root, fileFixify(dst + filestr, FileFixifyAbsolute, false))));
} }
for(int x = 0; x < files.count(); x++) { for(int x = 0; x < files.count(); x++) {
QString file = files[x]; QString file = files[x];
if(file == "." || file == "..") //blah if(file == "." || file == "..") //blah
continue; continue;
if(!uninst.isEmpty())
uninst.append("\n\t");
uninst.append(rm_dir_contents + " " + escapeFilePath(filePrefixRoot(root, fileFixify(dst + file, FileFixifyAbsolute, false)))); uninst.append(rm_dir_contents + " " + escapeFilePath(filePrefixRoot(root, fileFixify(dst + file, FileFixifyAbsolute, false))));
QFileInfo fi(fileInfo(dirstr + file)); QFileInfo fi(fileInfo(dirstr + file));
if(!target.isEmpty()) if(!target.isEmpty())
@ -1314,10 +1308,11 @@ MakefileGenerator::writeInstalls(QTextStream &t, const QString &installs, bool n
} }
} }
//default? //default?
if(do_default) { if (do_default)
target = defaultInstall((*it)); target = defaultInstall((*it));
uninst = project->values((*it) + ".uninstall"); QString puninst = project->values((*it) + ".uninstall").join(" ");
} if (!puninst.isEmpty())
uninst << puninst;
if(!target.isEmpty() || project->values((*it) + ".CONFIG").indexOf("dummy_install") != -1) { if(!target.isEmpty() || project->values((*it) + ".CONFIG").indexOf("dummy_install") != -1) {
if(noBuild || project->values((*it) + ".CONFIG").indexOf("no_build") != -1) if(noBuild || project->values((*it) + ".CONFIG").indexOf("no_build") != -1)
@ -1343,8 +1338,10 @@ MakefileGenerator::writeInstalls(QTextStream &t, const QString &installs, bool n
} }
t << target << endl << endl; t << target << endl << endl;
if(!uninst.isEmpty()) { if(!uninst.isEmpty()) {
t << "uninstall_" << (*it) << ": FORCE\n\t" << uninst.join(" ") t << "uninstall_" << (*it) << ": FORCE";
<< "\n\t-$(DEL_DIR) " << filePrefixRoot(root, dst) << " " << endl << endl; for (int i = uninst.size(); --i >= 0; )
t << "\n\t" << uninst.at(i);
t << "\n\t-$(DEL_DIR) " << filePrefixRoot(root, dst) << " " << endl << endl;
} }
t << endl; t << endl;