Changeset 119

Timestamp:

Aug 17, 2009, 8:58:38 PM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

qmake/GNUMAKE: Improved PRL file processing (could sometimes lose parts of the library that was split using splitDll* functions so that client applications would miss symbols from the lost parts when linking).

Location:

trunk

Files:

• mkspecs/features/os2/default_pre.prf (modified) (2 diffs)
• qmake/generators/makefile.cpp (modified) (1 diff)
• qmake/generators/os2/gnumake.cpp (modified) (3 diffs)

trunk/mkspecs/features/os2/default_pre.prf

@@ -54 +54 @@
     !build_pass: return(true)
 
-    # this is necessary to store LIBS as QMAKE_PRL_LIBS in the generated .prl
-    CONFIG += explicitlib
-
     # define _VERSION_OVERRIDE statements if needed
     for(a, 1) {
@@ -79 +76 @@
 
         CONFIG($$SPLIT_CONFIG):CONFIG($$scope) {
-            # add the other parts to LIBS of this part
+            # add the other parts to LIBS of this part
             for(b, 1) {
                 !equals(b, $${a}) {
                     equals(b, "."):b =
                     eval(LIBS += -l$${TARGET}$${b})
+
                 }
             }
             !isEmpty(LIBS):export(LIBS)
-            QMAKE_LIBDIR += $(DESTDIR)
+            !isEmpty(PRL_EXPORT_LIBS):export(PRL_EXPORT_LIBS)
+            
+            QMAKE_LIBDIR *= $(DESTDIR)
             export(QMAKE_LIBDIR)
 

trunk/qmake/generators/makefile.cpp

@@ -963 +963 @@
     else if(!project->isEmpty("VERSION"))
         t << "QMAKE_PRL_VERSION = " << project->first("VERSION") << endl;
-    if(project->isActiveConfig("staticlib") || project->isActiveConfig("explicitlib")) {
-        QStringList libs;
-        if(!project->isEmpty("QMAKE_INTERNAL_PRL_LIBS"))
-            libs = project->values("QMAKE_INTERNAL_PRL_LIBS");
-        else
-            libs << "QMAKE_LIBS"; //obvious one
+    if(project->isActiveConfig("staticlib") || project->isActiveConfig("explicitlib") ||
+       !project->isEmpty("PRL_EXPORT_LIBS")) {
         t << "QMAKE_PRL_LIBS = ";
-        for(QStringList::Iterator it = libs.begin(); it != libs.end(); ++it)
-            t << project->values((*it)).join(" ") << " ";
+        if (!project->isEmpty("PRL_EXPORT_LIBS")) {
+            // PRL_EXPORT_LIBS overrides anything else
+            t << project->values("PRL_EXPORT_LIBS").join(" ");
+        } else {
+            QStringList libs;
+            if(!project->isEmpty("QMAKE_INTERNAL_PRL_LIBS"))
+                libs = project->values("QMAKE_INTERNAL_PRL_LIBS");
+            else
+                libs << "QMAKE_LIBS"; //obvious one
+            for(QStringList::Iterator it = libs.begin(); it != libs.end(); ++it)
+                t << project->values((*it)).join(" ") << " ";
+        }
         t << endl;
     }

trunk/qmake/generators/os2/gnumake.cpp

@@ -110 +110 @@
     if (project->isActiveConfig("link_prl")) {
         QMakeMetaInfo libinfo;
-        if (libinfo.readLib(bd + Option::dir_sep + dllStem)) {
+        QString libfile = QMakeMetaInfo::findLib(bd + Option::dir_sep + dllStem);
+        if (project->values("QMAKE_PRL_INTERNAL_FILES").contains(libfile)) {
+            // already processed, return emtpy string to discard this lib
+            return QString("");
+        }
+        if (libinfo.readLib(libfile)) {
+            project->values("QMAKE_PRL_INTERNAL_FILES") += libfile;
             QString target = libinfo.first("QMAKE_PRL_TARGET");
+
+
+
+
             if (target.isEmpty())
-                target = stem;
+                target = tem;
             if (!versionOverride.isEmpty())
                 target += versionOverride;
@@ -120 +130 @@
 
             const QStringList &in = libinfo.values("QMAKE_PRL_LIBS");
-            QStringList &out = project->values("QMAKE_INTERNAL_PRL_LIBS");
+            QStringList &out = project->values("QMAKE_PRL_LIBS");
             for (QStringList::ConstIterator it = in.begin(); it != in.end(); ++it) {
                 if (!out.contains(*it))
@@ -165 +175 @@
     }
 
-    for (QStringList::Iterator it = l.begin(); it != l.end(); ++it) {
-        if((*it).startsWith("-L")) {
-            dirs.append(QMakeLocalFileName((*it).mid(2)));
-        } else {
-            QString stem = *it, out;
-
-            if (stem.startsWith("-l"))
-                stem = stem.mid(2);
-
-            QString suffix;
-            if (!project->isEmpty("QMAKE_" + stem.toUpper() + "_SUFFIX"))
-                suffix = project->first("QMAKE_" + stem.toUpper() + "_SUFFIX");
-            for (QList<QMakeLocalFileName>::Iterator dir_it = dirs.begin(); dir_it != dirs.end(); ++dir_it) {
-                QString best = findBestVersion((*dir_it).local(), stem,
-                                               QString("%1.lib").arg(suffix));
-                if (!best.isEmpty()) {
-                    out = best.prepend("-l");
-                    break;
+    QStringList::Iterator it = l.begin();
+
+    do {
+        project->values("QMAKE_PRL_LIBS").clear();
+        bool erase = false;
+        for (; it != l.end(); erase ? (erase = false, it = l.erase(it)) : ++it) {
+            if((*it).startsWith("-L")) {
+                dirs.append(QMakeLocalFileName((*it).mid(2)));
+            } else {
+                QString stem = *it, out;
+
+                if (stem.startsWith("-l"))
+                    stem = stem.mid(2);
+
+                QString suffix;
+                if (!project->isEmpty("QMAKE_" + stem.toUpper() + "_SUFFIX"))
+                    suffix = project->first("QMAKE_" + stem.toUpper() + "_SUFFIX");
+                for (QList<QMakeLocalFileName>::Iterator dir_it = dirs.begin(); dir_it != dirs.end(); ++dir_it) {
+                    QString best = findBestVersion((*dir_it).local(), stem,
+                                                   QString("%1.lib").arg(suffix));
+                    if (!best.isNull()) {
+                        if (best.isEmpty()) {
+                            // we are asked to discard this lib, do it
+                            erase = true;
+                            break;
+                        }
+                        out = best.prepend("-l");
+                        break;
+                    }
                 }
+
+
+
             }
-            if (!out.isEmpty()) // We assume if it never finds it that its correct
-                if (!project->values("QMAKE_LIBS").contains(out))
-                    (*it) = out;
-        }
-    }
-
-    QStringList l2 = project->values("QMAKE_INTERNAL_PRL_LIBS");
-    for (QStringList::ConstIterator it = l2.begin(); it != l2.end(); ++it) {
-        if (!l.contains(*it))
-            l.append((*it));
-    }
+        }
+
+        // add the libraries from PRL and process them normally
+        QStringList l2 = project->values("QMAKE_PRL_LIBS");
+        int oldSize = l.size();
+        for (QStringList::ConstIterator it2 = l2.begin(); it2 != l2.end(); ++it2) {
+            if (!l.contains(*it2))
+                l.append(*it2);
+        }
+        it = l.begin() + oldSize;
+
+    } while(it != l.end());
 
     return true;