Changeset 962 for trunk/qmake/generators/makefile.cpp

Timestamp:

Aug 11, 2011, 2:11:32 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

qmake: Recognize 'no_vpath' and 'no_fixify' in install target's .CONFIG.

This is used to prevent qmake from searching for files listed in .files in
VPATH directories ('no_vpath') and from fixifying these files (in particular
by assuming they are relative to the source dir) ('no_fixify'). This allows
to speficy arbitrary names in .files (e.g. make variable references) and
make sure they appear in the install command unchanged.

File:

• trunk/qmake/generators/makefile.cpp (modified) (6 diffs)

trunk/qmake/generators/makefile.cpp

@@ -1252 +1252 @@
     QStringList &l = project->values(installs);
     for(QStringList::Iterator it = l.begin(); it != l.end(); ++it) {
+
         QString pvar = (*it) + ".path";
-        if(project->values((*it) + ".CONFIG").indexOf("no_path") == -1 &&
-           project->values((*it) + ".CONFIG").indexOf("dummy_install") == -1 &&
+        if(.indexOf("no_path") == -1 &&
+           .indexOf("dummy_install") == -1 &&
            project->values(pvar).isEmpty()) {
             warn_msg(WarnLogic, "%s is not defined: install target not created\n", pvar.toLatin1().constData());
@@ -1263 +1264 @@
         const QString root = "$(INSTALL_ROOT)";
         QString target, dst;
-        if(project->values((*it) + ".CONFIG").indexOf("no_path") == -1 &&
-           project->values((*it) + ".CONFIG").indexOf("dummy_install") == -1) {
+        if(.indexOf("no_path") == -1 &&
+           .indexOf("dummy_install") == -1) {
             dst = fileFixify(unescapeFilePath(project->values(pvar).first()), FileFixifyAbsolute, false);
         }
@@ -1283 +1284 @@
         }
         //masks
-        tmp = findFilesInVPATH(project->values((*it) + ".files"), VPATH_NoFixify);
-        tmp = fileFixify(tmp, FileFixifyAbsolute);
+        tmp = project->values((*it) + ".files");
+        if(!installConfigValues.contains("no_vpath"))
+            tmp = findFilesInVPATH(tmp, VPATH_NoFixify);
+        if(!installConfigValues.contains("no_fixify"))
+            tmp = fileFixify(tmp, FileFixifyAbsolute);
         if(!tmp.isEmpty()) {
             if(!target.isEmpty())
@@ -1333 +1337 @@
                 QString local_dirstr = Option::fixPathToLocalOS(dirstr, true);
                 QStringList files = QDir(local_dirstr).entryList(QStringList(filestr));
-                const QStringList &installConfigValues = project->values((*it) + ".CONFIG");
                 if (installConfigValues.contains("no_check_exist") && files.isEmpty()) {
                     if(!target.isEmpty())
@@ -1391 +1394 @@
         }
 
-        if(!target.isEmpty() || project->values((*it) + ".CONFIG").indexOf("dummy_install") != -1) {
-            if(noBuild || project->values((*it) + ".CONFIG").indexOf("no_build") != -1)
+        if(!target.isEmpty() || .indexOf("dummy_install") != -1) {
+            if(noBuild || .indexOf("no_build") != -1)
                 t << "install_" << (*it) << ":";
             else if(project->isActiveConfig("build_all"))
@@ -1428 +1431 @@
             t << endl;
 
-            if(project->values((*it) + ".CONFIG").indexOf("no_default_install") == -1) {
+            if(.indexOf("no_default_install") == -1) {
                 all_installs += QString("install_") + (*it) + " ";
                 if(!uninst.isEmpty())