Changeset 382 for trunk/mkspecs

Timestamp:

Dec 5, 2009, 12:28:54 AM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

general: Added recognition of DEF_FILE_VERSION, DEF_FILE_DESCRIPTION and DEF_FILE_VENDOR qmake variables used to generate the DLL description string. If not set explicitly, they are initialized from the corresponding QMAKE_TARGET_ variables recognized on Win32, for compatibility.

Location:

trunk/mkspecs

Files:

• features/os2/default_post.prf (modified) (2 diffs)
• os2-g++/qmake.conf (modified) (1 diff)

trunk/mkspecs/features/os2/default_post.prf

@@ -9 +9 @@
 # load the global default_post
 load(default_post)
+
+# convert QMAKE_TARGET_ variables to DEF_FILE_ ones
+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)
+        }
+        isEmpty(DEF_FILE_DESCRIPTION) {
+                !isEmpty(QMAKE_TARGET_PRODUCT):DEF_FILE_DESCRIPTION = $$QMAKE_TARGET_PRODUCT
+                !isEmpty(QMAKE_TARGET_DESCRIPTION) {
+                        !isEmpty(DEF_FILE_DESCRIPTION):DEF_FILE_DESCRIPTION = $${DEF_FILE_DESCRIPTION}: $$QMAKE_TARGET_DESCRIPTION
+                        else:DEF_FILE_DESCRIPTION = $$QMAKE_TARGET_DESCRIPTION
+                }
+                !isEmpty(QMAKE_TARGET_COPYRIGHT) {
+                        !isEmpty(DEF_FILE_DESCRIPTION):DEF_FILE_DESCRIPTION = $${DEF_FILE_DESCRIPTION} $$QMAKE_TARGET_COPYRIGHT
+                        else:DEF_FILE_DESCRIPTION = $$QMAKE_TARGET_COPYRIGHT
+                }
+        }
+        isEmpty(DEF_FILE_VENDOR):!isEmpty(QMAKE_TARGET_COMPANY):DEF_FILE_VENDOR = $$QMAKE_TARGET_COMPANY
+}
 
 wlink:build_pass {
@@ -30 +51 @@
     }
 }
-

trunk/mkspecs/os2-g++/qmake.conf

@@ -106 +106 @@
         @echo Warning: .DEF file generation is disabled! \
             (QT_DEV_NO_DEF_GENERATION=$(QT_DEV_NO_DEF_GENERATION)),\
-        "$(QMAKESPECDIR)\emxexpw.cmd" -name $(basename $(TARGET)) \
-            $(if $(VERSION),-version $(VERSION)) \
+        $(QMAKESPECDIR)\emxexpw.cmd -name $(basename $(TARGET)) \
+            $(if $(DEF_FILE_VERSION),-version \"$(DEF_FILE_VERSION)\") \
+            $(if $(DEF_FILE_DESCRIPTION),-desc \"$(DEF_FILE_DESCRIPTION)\") \
+            $(if $(DEF_FILE_VENDOR),-vendor \"$(DEF_FILE_VENDOR)\") \
             -def $(DEF_FILE) $(if $(DEF_FILE_MAP),-map $(DEF_FILE_MAP)) \
             $(if $(DEF_FILE_TEMPLATE),-template $(DEF_FILE_TEMPLATE)) \
             $$QMAKE_OBJECTS_REF)
 
-QMAKE_GENDEF_DEPS       = $(OBJECTS) $$_PRO_FILE_
+QMAKE_GENDEF_DEPS       = $(OBJECTS) $(MAKEFILE)
 
 QMAKE_LIBS              =