Changeset 384

Timestamp:

Dec 5, 2009, 2:23:41 AM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

general: Embed information provided by DEF_FILE_VERSION, DEF_FILE_DESCRIPTION and DEF_FILE_VENDOR qmake variables to the generated EXE files too.

File:

• trunk/mkspecs/features/os2/default_post.prf (modified) (2 diffs)

trunk/mkspecs/features/os2/default_post.prf

@@ -13 +13 @@
 build_pass {
     isEmpty(DEF_FILE_VERSION) {
-        !isEmpty(VERSION):DEF_FILE_VERSION = $$VERSION
-            !isEmpty(QT_BUILD_VERSION):DEF_FILE_VERSION = $${DEF_FILE_VERSION}-$${QT_BUILD_VERSION}
-            !isEmpty(QMAKESPEC):DEF_FILE_VERSION = $${DEF_FILE_VERSION}_$$basename(QMAKESPEC)
+        DEF_FILE_VERSION = $$VERSION
         }
         isEmpty(DEF_FILE_DESCRIPTION) {
@@ -31 +29 @@
 }
 
-wlink:build_pass {
-    # Neither WLINK nor EMXOMFLD allows us to specify the application type of
-    # the .EXE on the command line. For this reason, we need an implicit .DEF
-    # file which we create unless an explicit .DEF file is provided in .pro.
-    contains(TEMPLATE, ".*app") {
-        isEmpty(DEF_FILE) {
+build_pass {
+    contains(TEMPLATE, ".*app"):isEmpty(DEF_FILE) {
+        DEF_FILE_DESCR =
+        !isEmpty(DEF_FILE_VERSION)|!isEmpty(DEF_FILE_DESCRIPTION)|!isEmpty(DEF_FILE_VENDOR) {
+            DEF_FILE_DESCR = "@$${LITERAL_HASH}vendor:version$${LITERAL_HASH}@ description"
+            DEF_FILE_DESCR = $$replace(DEF_FILE_DESCR, vendor, $$DEF_FILE_VENDOR)
+            DEF_FILE_DESCR = $$replace(DEF_FILE_DESCR, version, $$DEF_FILE_VERSION)
+            DEF_FILE_DESCR = $$replace(DEF_FILE_DESCR, description, $$DEF_FILE_DESCRIPTION)
+        }
+        !isEmpty(DEF_FILE_DESCR)|wlink {
+            # Note: neither WLINK nor EMXOMFLD allows to specify the app type of
+            # the .EXE on the command line. For this reason, we need an implicit
+            # .DEF which we create if no explicit .DEF file is provided in .pro,
+            # even if DEF_FILE_DESCR is actually empty.
+
             DEF_FILE = $(OBJECTS_DIR)/$(TARGET).def
 
-            make_apptype_def.target = $(DEF_FILE)
-            make_apptype_def.depends = $(call q,$(MAKEFILE))
-            windows {
-                make_apptype_def.commands = @echo NAME $(QMAKE_TARGET) WINDOWAPI > $(DEF_FILE)
-            } else {
-                make_apptype_def.commands = @echo NAME $(QMAKE_TARGET) WINDOWCOMPAT > $(DEF_FILE)
-            }
-            QMAKE_EXTRA_TARGETS += make_apptype_def
+            windows:DEF_FILE_APPTYPE = WINDOWAPI
+            else::DEF_FILE_APPTYPE = WINDOWCOMPAT
+
+            make_exe_def.target = $(DEF_FILE)
+            make_exe_def.depends = $(call q,$(MAKEFILE))
+            make_exe_def.commands = \
+                @echo NAME $(QMAKE_TARGET) $$DEF_FILE_APPTYPE > $(DEF_FILE)
+            !isEmpty(DEF_FILE_DESCR):make_exe_def.commands += $$escape_expand(\n\t) \
+                @echo DESCRIPTION \'$${DEF_FILE_DESCR}\' >> $(DEF_FILE)
+            QMAKE_EXTRA_TARGETS += make_exe_def
             QMAKE_CLEAN += $(DEF_FILE)
         }