Changeset 382

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

Files:

• configure.cmd (modified) (3 diffs)
• mkspecs/features/os2/default_post.prf (modified) (2 diffs)
• mkspecs/os2-g++/qmake.conf (modified) (1 diff)
• qmake/generators/os2/gnumake.cpp (modified) (1 diff)

trunk/configure.cmd

@@ -121 +121 @@
     G.QT_MINOR_VERSION = 0
     G.QT_PATCH_VERSION = 0
+    G.QT_BUILD_VERSION = ""
 
     G.QT_PACKAGEDATE = ""
@@ -165 +166 @@
        call Done 1
     end
+
+    /* read the build number if any */
+    build = linein(G.RelPath"\official_build")
+    if (build \== "") then do
+        G.QT_CONFIG = "official_build"
+        call SaySay
+        call SaySay "WARNING:"
+        call SaySay "You are going to configure an official build of Qt4 for OS/2!"
+        call SaySay "Full version number is: "G.QT_VERSION"-"G.QT_BUILD_VERSION
+        call SaySay
+        call SaySay "If you understand what it means and want to continue,"
+        call SaySay "then type YES below. Otherwise, press Enter or Ctrl-C."
+        call SaySay
+        call SaySay "Continue? ", 1
+        str = linein()
+        if (str \== "YES") then
+            call Done 255
+    end
+    else
+        build = linein(G.RelPath"\build")
+    if (build \== "") then
+        G.QT_BUILD_VERSION = build
 
     /*--------------------------------------------------------------------------
@@ -1436 +1459 @@
 'QT_MINOR_VERSION = 'G.QT_MINOR_VERSION||G.EOL||,
 'QT_PATCH_VERSION = 'G.QT_PATCH_VERSION||G.EOL||,
+'QT_BUILD_VERSION = 'G.QT_BUILD_VERSION||G.EOL||,
 ''G.EOL||,
 '# namespaces'G.EOL||,

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              =

trunk/qmake/generators/os2/gnumake.cpp

@@ -546 +546 @@
             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 (!project->isEmpty("DEF_FILE_TEMPLATE")) {
                 t << "DEF_FILE_TEMPLATE = " << escapeFilePath(var("DEF_FILE_TEMPLATE")) << endl;