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

remove pointless fixPathToTargetOS() calls

Browse Source 
it makes no sense to call it on paths that are fixified right before or
after, as fileFixify() calls it itself.

and verifyExtraCompiler() calls normalizePath() on its file argument.

Change-Id: I8fb21e129fd29428d1855de73483087842bc1bdd
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
This commit is contained in:
Oswald Buddenhagen 2014-11-24 19:51:32 +01:00
parent e0962270d7
commit 5527411437
5 changed files with 13 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
qmake/generators/makefile.cpp
View File

@ -725,8 +725,7 @@ MakefileGenerator::init()
if((*input).isEmpty()) if((*input).isEmpty())
continue; continue;
QString inpf = (*input).toQString(); QString inpf = (*input).toQString();
QString in = Option::fixPathToTargetOS(inpf, false); if (!verifyExtraCompiler((*it).toQString(), inpf)) //verify
if (!verifyExtraCompiler((*it).toQString(), in)) //verify
continue; continue;
QString out = replaceExtraCompilerVariables(tmp_out.toQString(), inpf, QString(), NoShell); QString out = replaceExtraCompilerVariables(tmp_out.toQString(), inpf, QString(), NoShell);
out = fileFixify(out, Option::output_dir, Option::output_dir); out = fileFixify(out, Option::output_dir, Option::output_dir);
@ -1052,7 +1051,7 @@ MakefileGenerator::writeProjectMakefile()
writeSubTargets(t, targets, SubTargetsNoFlags); writeSubTargets(t, targets, SubTargetsNoFlags);
if(!project->isActiveConfig("no_autoqmake")) { if(!project->isActiveConfig("no_autoqmake")) {
QString mkf = escapeDependencyPath(Option::fixPathToTargetOS(fileFixify(Option::output.fileName()))); QString mkf = escapeDependencyPath(fileFixify(Option::output.fileName()));
for(QList<SubTarget*>::Iterator it = targets.begin(); it != targets.end(); ++it) for(QList<SubTarget*>::Iterator it = targets.begin(); it != targets.end(); ++it)
t << escapeDependencyPath((*it)->makefile) << ": " << mkf << endl; t << escapeDependencyPath((*it)->makefile) << ": " << mkf << endl;
} }
@ -1509,7 +1508,6 @@ MakefileGenerator::createObjectList(const ProStringList &sources)
if (project->isActiveConfig("object_parallel_to_source")) { if (project->isActiveConfig("object_parallel_to_source")) {
// The source paths are relative to the output dir, but we need source-relative paths // The source paths are relative to the output dir, but we need source-relative paths
QString sourceRelativePath = fileFixify(sfn, qmake_getpwd(), Option::output_dir); QString sourceRelativePath = fileFixify(sfn, qmake_getpwd(), Option::output_dir);
sourceRelativePath = Option::fixPathToTargetOS(sourceRelativePath, false);
if (sourceRelativePath.startsWith(".." + Option::dir_sep)) if (sourceRelativePath.startsWith(".." + Option::dir_sep))
sourceRelativePath = fileFixify(sourceRelativePath, FileFixifyAbsolute); sourceRelativePath = fileFixify(sourceRelativePath, FileFixifyAbsolute);
@ -1732,7 +1730,7 @@ MakefileGenerator::verifyExtraCompiler(const ProString &comp, const QString &fil
if((*input).isEmpty()) if((*input).isEmpty())
continue; continue;
QString inpf = (*input).toQString(); QString inpf = (*input).toQString();
QString in = fileFixify(Option::fixPathToTargetOS(inpf, false)); QString in = fileFixify(inpf);
if(in == file) { if(in == file) {
bool pass = project->test(verify.toKey(), bool pass = project->test(verify.toKey(),
QList<ProStringList>() << ProStringList(replaceExtraCompilerVariables(tmp_out.toQString(), inpf, QString(), NoShell)) << QList<ProStringList>() << ProStringList(replaceExtraCompilerVariables(tmp_out.toQString(), inpf, QString(), NoShell)) <<
@ -1764,7 +1762,7 @@ MakefileGenerator::verifyExtraCompiler(const ProString &comp, const QString &fil
if((*input).isEmpty()) if((*input).isEmpty())
continue; continue;
QString inpf = (*input).toQString(); QString inpf = (*input).toQString();
QString in = fileFixify(Option::fixPathToTargetOS(inpf, false)); QString in = fileFixify(inpf);
if(in == file) { if(in == file) {
QString out = replaceExtraCompilerVariables(tmp_out, inpf, QString(), NoShell); QString out = replaceExtraCompilerVariables(tmp_out, inpf, QString(), NoShell);
QString cmd = replaceExtraCompilerVariables(tmp_cmd, in, out, LocalShell); QString cmd = replaceExtraCompilerVariables(tmp_cmd, in, out, LocalShell);
@ -1832,8 +1830,7 @@ MakefileGenerator::writeExtraCompilerTargets(QTextStream &t)
for (ProStringList::ConstIterator it2 = comp_inputs.begin(); it2 != comp_inputs.end(); ++it2) { for (ProStringList::ConstIterator it2 = comp_inputs.begin(); it2 != comp_inputs.end(); ++it2) {
const ProStringList &tmp = project->values((*it2).toKey()); const ProStringList &tmp = project->values((*it2).toKey());
for (ProStringList::ConstIterator input = tmp.begin(); input != tmp.end(); ++input) { for (ProStringList::ConstIterator input = tmp.begin(); input != tmp.end(); ++input) {
QString in = Option::fixPathToTargetOS((*input).toQString(), false); if (verifyExtraCompiler((*it), (*input).toQString()))
if(verifyExtraCompiler((*it), in))
tmp_inputs.append((*input)); tmp_inputs.append((*input));
} }
} }
@ -2250,7 +2247,7 @@ QString MakefileGenerator::build_args(const QString &outdir)
ret += buildArgs(); ret += buildArgs();
//output //output
QString ofile = Option::fixPathToTargetOS(fileFixify(Option::output.fileName())); QString ofile = fileFixify(Option::output.fileName());
if(!ofile.isEmpty() && ofile != project->first("QMAKE_MAKEFILE")) if(!ofile.isEmpty() && ofile != project->first("QMAKE_MAKEFILE"))
ret += " -o " + escapeFilePath(ofile); ret += " -o " + escapeFilePath(ofile);
@ -2579,7 +2576,7 @@ MakefileGenerator::writeSubTargets(QTextStream &t, QList<MakefileGenerator::SubT
if(suffix == "clean") { if(suffix == "clean") {
t << fixFileVarGlue("QMAKE_CLEAN", "\t-$(DEL_FILE) ", "\n\t-$(DEL_FILE) ", "\n"); t << fixFileVarGlue("QMAKE_CLEAN", "\t-$(DEL_FILE) ", "\n\t-$(DEL_FILE) ", "\n");
} else if(suffix == "distclean") { } else if(suffix == "distclean") {
QString ofile = Option::fixPathToTargetOS(fileFixify(Option::output.fileName())); QString ofile = fileFixify(Option::output.fileName());
if(!ofile.isEmpty()) if(!ofile.isEmpty())
t << "\t-$(DEL_FILE) " << escapeFilePath(ofile) << endl; t << "\t-$(DEL_FILE) " << escapeFilePath(ofile) << endl;
t << fixFileVarGlue("QMAKE_DISTCLEAN", "\t-$(DEL_FILE) ", " ", "\n"); t << fixFileVarGlue("QMAKE_DISTCLEAN", "\t-$(DEL_FILE) ", " ", "\n");
@ -2683,7 +2680,7 @@ MakefileGenerator::writeSubTargets(QTextStream &t, QList<MakefileGenerator::SubT
void void
MakefileGenerator::writeMakeQmake(QTextStream &t, bool noDummyQmakeAll) MakefileGenerator::writeMakeQmake(QTextStream &t, bool noDummyQmakeAll)
{ {
QString ofile = Option::fixPathToTargetOS(fileFixify(Option::output.fileName())); QString ofile = fileFixify(Option::output.fileName());
if(project->isEmpty("QMAKE_FAILED_REQUIREMENTS") && !project->isEmpty("QMAKE_INTERNAL_PRL_FILE")) { if(project->isEmpty("QMAKE_FAILED_REQUIREMENTS") && !project->isEmpty("QMAKE_INTERNAL_PRL_FILE")) {
QStringList files = escapeFilePaths(fileFixify(Option::mkfile::project_files)); QStringList files = escapeFilePaths(fileFixify(Option::mkfile::project_files));
t << escapeDependencyPath(project->first("QMAKE_INTERNAL_PRL_FILE").toQString()) << ": \n\t" t << escapeDependencyPath(project->first("QMAKE_INTERNAL_PRL_FILE").toQString()) << ": \n\t"

3
qmake/generators/unix/unixmake.cpp
View File

@ -716,10 +716,9 @@ UnixMakefileGenerator::defaultInstall(const QString &t)
const QString root = "$(INSTALL_ROOT)"; const QString root = "$(INSTALL_ROOT)";
ProStringList &uninst = project->values(ProKey(t + ".uninstall")); ProStringList &uninst = project->values(ProKey(t + ".uninstall"));
QString ret, destdir = project->first("DESTDIR").toQString(); QString ret, destdir = project->first("DESTDIR").toQString();
QString targetdir = Option::fixPathToTargetOS(project->first("target.path").toQString(), false);
if(!destdir.isEmpty() && destdir.right(1) != Option::dir_sep) if(!destdir.isEmpty() && destdir.right(1) != Option::dir_sep)
destdir += Option::dir_sep; destdir += Option::dir_sep;
targetdir = fileFixify(targetdir, FileFixifyAbsolute); QString targetdir = fileFixify(project->first("target.path").toQString(), FileFixifyAbsolute);
if(targetdir.right(1) != Option::dir_sep) if(targetdir.right(1) != Option::dir_sep)
targetdir += Option::dir_sep; targetdir += Option::dir_sep;

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

@ -1056,7 +1056,7 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
} }
t << fileVarGlue("QMAKE_DISTCLEAN","\t-$(DEL_FILE) "," ","\n"); t << fileVarGlue("QMAKE_DISTCLEAN","\t-$(DEL_FILE) "," ","\n");
{ {
QString ofile = Option::fixPathToTargetOS(fileFixify(Option::output.fileName())); QString ofile = fileFixify(Option::output.fileName());
if(!ofile.isEmpty()) if(!ofile.isEmpty())
t << "\t-$(DEL_FILE) " << escapeFilePath(ofile) << endl; t << "\t-$(DEL_FILE) " << escapeFilePath(ofile) << endl;
} }

3
qmake/generators/win32/msvc_nmake.cpp
View File

@ -252,8 +252,7 @@ QString NmakeMakefileGenerator::defaultInstall(const QString &t)
const QString root = "$(INSTALL_ROOT)"; const QString root = "$(INSTALL_ROOT)";
ProStringList &uninst = project->values(ProKey(t + ".uninstall")); ProStringList &uninst = project->values(ProKey(t + ".uninstall"));
QString targetdir = Option::fixPathToTargetOS(project->first(ProKey(t + ".path")).toQString(), false); QString targetdir = fileFixify(project->first(ProKey(t + ".path")).toQString(), FileFixifyAbsolute);
targetdir = fileFixify(targetdir, FileFixifyAbsolute);
if(targetdir.right(1) != Option::dir_sep) if(targetdir.right(1) != Option::dir_sep)
targetdir += Option::dir_sep; targetdir += Option::dir_sep;

5
qmake/generators/win32/winmakefile.cpp
View File

@ -581,7 +581,7 @@ void Win32MakefileGenerator::writeCleanParts(QTextStream &t)
} }
t << "\n\t-$(DEL_FILE) $(DESTDIR_TARGET)\n"; t << "\n\t-$(DEL_FILE) $(DESTDIR_TARGET)\n";
{ {
QString ofile = Option::fixPathToTargetOS(fileFixify(Option::output.fileName())); QString ofile = fileFixify(Option::output.fileName());
if(!ofile.isEmpty()) if(!ofile.isEmpty())
t << "\t-$(DEL_FILE) " << escapeFilePath(ofile) << endl; t << "\t-$(DEL_FILE) " << escapeFilePath(ofile) << endl;
} }
@ -803,8 +803,7 @@ QString Win32MakefileGenerator::defaultInstall(const QString &t)
const QString root = "$(INSTALL_ROOT)"; const QString root = "$(INSTALL_ROOT)";
ProStringList &uninst = project->values(ProKey(t + ".uninstall")); ProStringList &uninst = project->values(ProKey(t + ".uninstall"));
QString ret; QString ret;
QString targetdir = Option::fixPathToTargetOS(project->first(ProKey(t + ".path")).toQString(), false); QString targetdir = fileFixify(project->first(ProKey(t + ".path")).toQString(), FileFixifyAbsolute);
targetdir = fileFixify(targetdir, FileFixifyAbsolute);
if(targetdir.right(1) != Option::dir_sep) if(targetdir.right(1) != Option::dir_sep)
targetdir += Option::dir_sep; targetdir += Option::dir_sep;