Changeset 886

Timestamp:

Jul 13, 2011, 1:59:46 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

qmake: os2/gnumake: Removed unnecessary shortening the import library name for the DLL target when TARGET_SHORT is present. Import libraries are often referenced through the LIBS variable in .pro files and this change makes such referencing work w/o the need to change them to shortened ones for the OS/2 platform. Closes #225. Note: this changeset depends on r885.

Location:

trunk/qmake/generators

Files:

• makefile.cpp (modified) (1 diff)
• os2/gnumake.cpp (modified) (2 diffs)
• os2/gnumake.h (modified) (1 diff)
• win32/winmakefile.cpp (modified) (1 diff)

trunk/qmake/generators/makefile.cpp

@@ -974 +974 @@
     if(!project->isEmpty("QMAKE_ABSOLUTE_SOURCE_PATH"))
         t << "QMAKE_PRL_SOURCE_DIR = " << project->first("QMAKE_ABSOLUTE_SOURCE_PATH") << endl;
+
+
     if(!project->isEmpty("TARGET_SHORT"))
-        t << "QMAKE_PRL_TARGET = " << project->first("TARGET_SHORT") << endl;
-    else
-        t << "QMAKE_PRL_TARGET = " << target << endl;
+        t << "QMAKE_PRL_TARGET_SHORT = " << project->first("TARGET_SHORT") << endl;
+
     if(!project->isEmpty("PRL_EXPORT_DEFINES"))
         t << "QMAKE_PRL_DEFINES = " << project->values("PRL_EXPORT_DEFINES").join(" ") << endl;

trunk/qmake/generators/os2/gnumake.cpp

@@ -615 +615 @@
 
     if (mode == DLL) {
-        /* we neeed $(TARGET_IMPLIB) to be in sync with getLibTarget() */
-        t << "TARGET_IMPLIB = $(basename $(DESTDIR_TARGET)).lib" << endl;
+        // Note: $(TARGET) may be shortened here due to TARGET_SHORT, use
+        // the original TARGET value (shortening does not affect implib names)
+        t << "TARGET_IMPLIB = $(DESTDIR)\\" << var("TARGET") << ".lib" << endl;
     }
 }
@@ -666 +667 @@
     // GNUMakefileGenerator::findLibraries()
     return;
-}
-
-QString GNUMakefileGenerator::getLibTarget()
-{
-    if (mode == DLL)
-        return QString("$(notdir $(TARGET_IMPLIB))");
-    return Win32MakefileGenerator::getLibTarget();
 }
 

trunk/qmake/generators/os2/gnumake.h

@@ -72 +72 @@
     void processPrlVariable(const QString &var, const QStringList &l);
     void processPrlFiles();
-    QString getLibTarget();
 
     QStringList &findDependencies(const QString &file);

trunk/qmake/generators/win32/winmakefile.cpp

@@ -785 +785 @@
 QString Win32MakefileGenerator::getLibTarget()
 {
-    QString target = project->first("TARGET_SHORT");
-    if (target.isEmpty())
-        target = project->first("TARGET");
-    return QString(target + project->first("TARGET_VERSION_EXT") + ".lib");
+    return QString(project->first("TARGET") + project->first("TARGET_VERSION_EXT") + ".lib");
 }