Changeset 673 for trunk/qmake

Timestamp:

Mar 11, 2010, 3:04:05 AM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

qmake: os2/gnumake: Replaced hard-coded DEF_FILE generation target with more flexible and consistent code in default_post.prf.

File:

• trunk/qmake/generators/os2/gnumake.cpp (modified) (2 diffs)

trunk/qmake/generators/os2/gnumake.cpp

@@ -558 +558 @@
     }
 
-    if (project->isEmpty("DEF_FILE")) {
-        /* no DEF file supplied, we will generate one */
-        if (mode == DLL) {
-            t << "DEF_FILE      = $(basename $(DESTDIR_TARGET)).def" << endl;
-            project->values("QMAKE_CLEAN").append("$(DEF_FILE)");
-            project->values("POST_TARGETDEPS") += escapeFileVars("$(DEF_FILE)");
-            if (!project->isEmpty("DEF_FILE_VERSION"))
-                t << "DEF_FILE_VERSION = " << var("DEF_FILE_VERSION") << endl;
-            if (!project->isEmpty("DEF_FILE_DESCRIPTION"))
-                t << "DEF_FILE_DESCRIPTION = " << var("DEF_FILE_DESCRIPTION") << endl;
-            if (!project->isEmpty("DEF_FILE_VENDOR"))
-                t << "DEF_FILE_VENDOR = " << var("DEF_FILE_VENDOR") << endl;
+    if (mode != StaticLib) {
+        if (project->isEmpty("DEF_FILE")) {
+            /* no DEF file supplied, emit handy variable definitions to simplify
+             * DEF generation rules defined somewhere in default_post.prf */
+            bool haveSomething = false;
+            if (!project->isEmpty("DEF_FILE_VERSION")) {
+                t << "DEF_FILE_VERSION        = " << var("DEF_FILE_VERSION") << endl;
+                haveSomething = true;
+            }
+            if (!project->isEmpty("DEF_FILE_DESCRIPTION")) {
+                t << "DEF_FILE_DESCRIPTION    = " << var("DEF_FILE_DESCRIPTION") << endl;
+                haveSomething = true;
+            }
+            if (!project->isEmpty("DEF_FILE_VENDOR")) {
+                t << "DEF_FILE_VENDOR         = " << var("DEF_FILE_VENDOR") << endl;
+                haveSomething = true;
+            }
             if (!project->isEmpty("DEF_FILE_TEMPLATE")) {
-                t << "DEF_FILE_TEMPLATE = " << escapeFilePath(var("DEF_FILE_TEMPLATE")) << endl;
-                project->values("QMAKE_GENDEF_DEPS") += "$(DEF_FILE_TEMPLATE)";
+                t << "DEF_FILE_TEMPLATE = " << escapeFilePath(var("DEF_FILE_TEMPLATE")) << endl;
+                ;
             }
             if (!project->isEmpty("DEF_FILE_MAP")) {
-                t << "DEF_FILE_MAP  = " << escapeFilePath(var("DEF_FILE_MAP")) << endl;
-                project->values("QMAKE_GENDEF_DEPS") += "$(DEF_FILE_MAP)";
-            }
-        }
-    } else {
-        if (!project->isEmpty("DEF_FILE_TEMPLATE")) {
-            fprintf(stderr, "Both DEF_FILE and DEF_FILE_TEMPLATE are specified.\n");
-            fprintf(stderr, "Please specify one of them, not both.");
-            exit(1);
-        }
-        t << "DEF_FILE      = " << escapeFilePath(var("DEF_FILE")) << endl;
-        project->values("POST_TARGETDEPS") += "$(DEF_FILE)";
+                t << "DEF_FILE_MAP            = " << escapeFilePath(var("DEF_FILE_MAP")) << endl;
+                haveSomething = true;
+            }
+            if (mode == DLL) {
+                // the DLL needs a file in any case
+                t << "DEF_FILE      = $(basename $(DESTDIR_TARGET)).def" << endl;
+            } else if (haveSomething) {
+                // the EXE needs it only if there's a description info
+                t << "DEF_FILE_EXETYPE        = " << escapeFilePath(var("DEF_FILE_EXETYPE")) << endl;
+                t << "DEF_FILE      = $(OBJECTS_DIR)\\$(TARGET).def" << endl;
+            }
+        } else {
+            if (!project->isEmpty("DEF_FILE_TEMPLATE")) {
+                fprintf(stderr, "Both DEF_FILE and DEF_FILE_TEMPLATE are specified.\n");
+                fprintf(stderr, "Please specify one of them, not both.");
+                exit(1);
+            }
+            t << "DEF_FILE      = " << escapeFilePath(var("DEF_FILE")) << endl;
+        }
     }
 
@@ -601 +613 @@
         t << escapeFileVars("$(RES_FILE): $(RC_FILE)\n\t");
         t << var("QMAKE_RUN_RC2RES") << endl;
-    }
-
-    if (mode == DLL) {
-        if (project->isEmpty("DEF_FILE")) {
-            /* generate a DEF file for the DLL when not supplied */
-            t << escapeFileVars("$(DEF_FILE): ") << escapeFileVars(var("QMAKE_GENDEF_DEPS"));
-            t << valGlue(var("QMAKE_RUN_GENDEF").split(";;"), "\n\t", "\n\t", "") << endl;
-        }
     }
 }